Feature/sync upstream

.github/workflows/flutter.yml

@@ -6,37 +6,42 @@ jobs:
   analysis:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '11'
       # Use the community Action to install Flutter
-      - uses: subosito/flutter-action@v2.10.0
+      - uses: subosito/flutter-action@v2
       - name: Version
         run: flutter doctor -v
-      - name: Install dependencies
-        run: flutter pub get
-        working-directory: ./flutter_secure_storage
-      - name: Linter - Android & iOS
-        run: flutter analyze
-        working-directory: ./flutter_secure_storage
-      - name: Linter - Platform Interface
-        run: flutter analyze
-        working-directory: ./flutter_secure_storage_platform_interface
+      - name: Install melos
+        run: |
+          flutter pub global activate melos
+          echo "$HOME/.pub-cache/bin" >> $GITHUB_PATH
+          echo "$HOME/AppData/Local/Pub/Cache/bin" >> $GITHUB_PATH
+      - name: Initialize workspace through melos
+        run: melos bootstrap
+      - name: Linter
+        run: melos analyze
   formatting:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '11'
       # Use the community Action to install Flutter
-      - uses: subosito/[email protected]
-      - name: Format - Android & iOS
-        run: dart format --set-exit-if-changed .
-        working-directory: ./flutter_secure_storage
-      - name: Format - Platform Interface
-        run: dart format --set-exit-if-changed .
-        working-directory: ./flutter_secure_storage_platform_interface
+      - uses: subosito/flutter-action@v2
+      - name: Version
+        run: flutter doctor -v
+      - name: Install melos
+        run: |
+          flutter pub global activate melos
+          echo "$HOME/.pub-cache/bin" >> $GITHUB_PATH
+          echo "$HOME/AppData/Local/Pub/Cache/bin" >> $GITHUB_PATH
+      - name: Initialize workspace through melos
+        run: melos bootstrap
+      - name: Format
+        run: melos format --output none --set-exit-if-changed

.github/workflows/flutter_drive.yml

@@ -2,27 +2,39 @@ name: integration test
 on: [pull_request]
 jobs:
   drive_android:
-      runs-on: macos-latest
+      runs-on: ubuntu-latest
       steps:
-        - uses: actions/checkout@v3
-        - uses: subosito/flutter-action@v2.10.0
-        - uses: actions/setup-java@v3
+        - uses: actions/checkout@v4
+        - uses: subosito/flutter-action@v2
+        - uses: actions/setup-java@v4
           with:
             distribution: 'temurin'
-            java-version: '11'
-        - name: "Run Flutter Driver tests API 18"
+            java-version: '17'
+        - name: Enable KVM
+          run: |
+            echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+            sudo udevadm control --reload-rules
+            sudo udevadm trigger --name-match=kvm
+        - name: Install melos
+          run: |
+            flutter pub global activate melos
+            echo "$HOME/.pub-cache/bin" >> $GITHUB_PATH
+            echo "$HOME/AppData/Local/Pub/Cache/bin" >> $GITHUB_PATH
+        - name: Initialize workspace through melos
+          run: melos bootstrap
+        - name: "Run Flutter Driver tests API 21"
           uses: reactivecircus/android-emulator-runner@v2
           with:
-            api-level: 18
+            api-level: 21
             target: default
             arch: x86
             script: "cd example && flutter drive --target=test_driver/app.dart"
             working-directory: ./flutter_secure_storage
-        - name: "Run Flutter Driver tests API 33"
+        - name: "Run Flutter Driver tests API 34"
           uses: reactivecircus/android-emulator-runner@v2
           with:
-            api-level: 33
+            api-level: 34
             target: google_apis
             arch: x86_64
             script: "cd example && flutter drive --target=test_driver/app.dart"
-            working-directory: ./flutter_secure_storage
+            working-directory: ./flutter_secure_storage

.gitignore

@@ -24,7 +24,8 @@ migrate_working_dir/
 
 # Flutter/Dart/Pub related
 # Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock.
-/pubspec.lock
+pubspec.lock
+pubspec_overrides.yaml
 **/doc/api/
 .dart_tool/
 .packages

README.md

@@ -1,19 +1,4 @@
 # flutter_secure_storage
-
-### Breaking change for v5.1.0
-IOSAccessibility has been renamed to KeychainAccessibility. This however hasn't been properly documented in the changelog.
-
-### Important notice for Android and v5.0.0
-When upgrading from 4.2.1 to 5.0.0 you can migrate to EncryptedSharedPreferences by
-setting the encryptedSharedPreference parameter to true as explained below. This will automatically
-migrate all preferences. This however can't be undone. If you try to disable encryptedSharedPreference
-after this, you won't be able to read the values. You can only read those with encryptedSharedPreference
-enabled.
-
-### Important notice for Web
-flutter_secure_storage only works on HTTPS or localhost environments. [Please see this issue for more information.](https://github.com/mogol/flutter_secure_storage/issues/320#issuecomment-976308930)
-
-
 A Flutter plugin to store data in secure storage:
 
 - [Keychain](https://developer.apple.com/library/content/documentation/Security/Conceptual/keychainServConcepts/01introduction/introduction.html#//apple_ref/doc/uid/TP30000897-CH203-TP1) is used for iOS
@@ -40,18 +25,28 @@ For more information see the example app.
 - [`libsecret`](https://wiki.gnome.org/Projects/Libsecret) is used for Linux.
 
 _Note_ KeyStore was introduced in Android 4.3 (API level 18). The plugin wouldn't work for earlier versions.
+## Important notice for Web
+flutter_secure_storage only works on HTTPS or localhost environments. [Please see this issue for more information.](https://github.com/mogol/flutter_secure_storage/issues/320#issuecomment-976308930)
+
+### WASM support
+You can opt-in into the new WASM compatible version of flutter_secure_storage_web by adding the following override in your pubspec.yaml:
+
+```yaml
+dependency_overrides:
+  flutter_secure_storage_web: ^2.0.0-beta.1
+```
 
 ## Platform Implementation
 Please note that this table represents the functions implemented in this repository and it is possible that changes haven't yet been released on pub.dev
 
-|         | read               | write              | delete             | containsKey        | readAll            | deleteAll          |
-|---------|--------------------|--------------------|--------------------|--------------------|--------------------|--------------------|
-| Android | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
-| iOS     | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
-| Windows | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
-| Linux   | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
-| macOS   | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
-| Web     | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+|         | read               | write              | delete             | containsKey        | readAll            | deleteAll          | isCupertinoProtectedDataAvailable | onCupertinoProtectedDataAvailabilityChanged |
+|---------|--------------------|--------------------|--------------------|--------------------|--------------------|--------------------|-----------------------------------|---------------------------------------------|
+| Android | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |                                   |
+| iOS     | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark:                | :white_check_mark:                          |
+| Windows | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |                                   |
+| Linux   | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |                                   |
+| macOS   | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark:                | :white_check_mark: (on macOS 12 and newer)  |
+| Web     | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |                                   |
 
 ## Getting Started
 
@@ -173,3 +168,12 @@ Run the following command from `example` directory
 ```
 flutter drive --target=test_driver/app.dart
 ```
+
+## Contributing
+
+If you want to contribute, you need to initialise the workspace after cloning the repo with `melos` like this:
+```
+flutter pub get
+melos bootstrap
+```
+After that, everything should be set up and working!

flutter_secure_storage/CHANGELOG.md

@@ -1,3 +1,45 @@
+## 9.2.1
+* Fix async race condition bug in storage operations.
+* [macOS] Return nil on macOS if key is not found
+
+## 9.2.0
+New Features:
+* [iOS, macOS] Reintroduced isProtectedDataAvailable.
+* Listener functionality via `FlutterSecureStorage().registerListener()`
+
+Bugs Fixed:
+* [iOS] Return nil on iOS read if key is not found
+* [macOS] Also set kSecUseDataProtectionKeychain on read for macos.
+
+## 9.1.1
+Reverts new feature because of breaking changes.
+* [iOS, macOS] Added isProtectedDataAvailable, A boolean value that indicates whether content protection is active.
+
+## 9.1.0
+New Features:
+* [iOS, macOS] Added isProtectedDataAvailable, A boolean value that indicates whether content protection is active.
+
+Improvements:
+* [iOS, macOS] Use accessibility option for all operations
+* [iOS, macOS] Added privacy manifest
+* [iOS] Fixes error when no item exists
+* [Linux] Fixed search with schemas fails in cold keyrings
+* [Linux] Fixed erase called on null
+* [Android] Fixed native Android stacktraces in PlatformExceptions
+* [Android] Fixed exception when reading data after boot
+
+## 9.0.0
+Breaking changes:
+* [Windows] Migrated to FFI with win32 package.
+
+## 8.1.0
+* [Android] Upgraded to Gradle 8.
+* [Android] Fixed resetOnError not working.
+* [Windows] Changed PathNotFoundException to FileSystemException to be backwards compatible with Flutter SDK 2.12.0.
+* [Windows] Applied lint suggestions.
+* [Linux] Remove and replace libjsoncpp1 dependency.
+* [Linux, macOS, Windows, Web] Update Dart SDK Constraint to support <4.0.0 instead of <3.0.0.
+
 ## 9.0.0
 Breaking changes:
 * [Windows] Migrated to FFI with win32 package.
@@ -72,7 +114,7 @@ These changes will become available in version 6.0.0
 First stable release of flutter_secure_storage for multi-platform!
 Please see all beta release notes for changes.
 
-This first release also fixes several stability issues on Android regarding encrypted shared 
+This first release also fixes several stability issues on Android regarding encrypted shared
 preferences.
 
 ## [5.0.0-beta.5]
@@ -106,7 +148,7 @@ Please read the readme.md for information about every platform.
 
 ## [4.2.0]
 * Remove Strongbox for Android [225](https://github.com/mogol/flutter_secure_storage/pull/225). Thanks [JordyLangen](https://github.com/JordyLangen).
-	
+
 ## [4.1.0]
 * Add support for Linux [185](https://github.com/mogol/flutter_secure_storage/pull/185). Thanks [talhabalaj](https://github.com/talhabalaj)
 * Improve first-time read speed on Android by not creating cipher when key is not present. Thanks [PieterAelse](https://github.com/PieterAelse)
@@ -124,8 +166,8 @@ Please read the readme.md for information about every platform.
 * Fix crash when generating keys in android with RTL locales [#132](https://github.com/mogol/flutter_secure_storage/pull/132) by [iassal](https://github.com/iassal)
 * Fix returning the error as String rather than Exception [#134](https://github.com/mogol/flutter_secure_storage/issues/134) by [wytesk133](https://github.com/wytesk133)s
 * Fix Android crash onDetachedFromEngine when init fails [#144](https://github.com/mogol/flutter_secure_storage/issues/144) by [iassal](https://github.com/iassal)
-* Handle null value at write function [#95](https://github.com/mogol/flutter_secure_storage/issues/95) by [ewertonrp](https://github.com/ewertonrp)    
-*  Add support for containsKey [#139](https://github.com/mogol/flutter_secure_storage/issues/139) by [iassal](https://github.com/iassal)    
+* Handle null value at write function [#95](https://github.com/mogol/flutter_secure_storage/issues/95) by [ewertonrp](https://github.com/ewertonrp)
+*  Add support for containsKey [#139](https://github.com/mogol/flutter_secure_storage/issues/139) by [iassal](https://github.com/iassal)
 
 ## [3.3.3]
 * Fix compatibility with non-AndroidX project. [AndroidX Migration](https://flutter.dev/docs/development/androidx-migration) is recommended.
@@ -144,12 +186,12 @@ Please read the readme.md for information about every platform.
 * Fix crash without [iOSOptions](https://github.com/mogol/flutter_secure_storage/issues/73).
 
 ## [3.3.0]
-* Added groupId for iOS keychain sharing. Thanks [Maleandr](https://github.com/Maleandr). 
-* Fix Gradle version in `gradle-wrapper.properties`. Thanks [blasten](https://github.com/blasten). 
-* Added minimum sdk requirement on AndroidManifest. Thanks [lidongze91](https://github.com/lidongze91). 
+* Added groupId for iOS keychain sharing. Thanks [Maleandr](https://github.com/Maleandr).
+* Fix Gradle version in `gradle-wrapper.properties`. Thanks [blasten](https://github.com/blasten).
+* Added minimum sdk requirement on AndroidManifest. Thanks [lidongze91](https://github.com/lidongze91).
 
 ## [3.2.1]
-* Fix Android 9.0 Pie [KeyStore exception](https://github.com/mogol/flutter_secure_storage/issues/46). 
+* Fix Android 9.0 Pie [KeyStore exception](https://github.com/mogol/flutter_secure_storage/issues/46).
 
 ## [3.2.0]
 * **Breaking change**. Migrate from the deprecated original Android Support Library to AndroidX. This shouldn't result in any functional changes, but it requires any Android apps using this plugin to [also migrate](https://developer.android.com/jetpack/androidx/migrate) if they're using the original support library. Thanks [I-am-original](https://github.com/I-am-original).
@@ -168,10 +210,10 @@ Please read the readme.md for information about every platform.
 * Added `readAll` and `deleteAll`.
 
 ## [3.0.0]
-* **Breaking change**. Changed payloads encryption for Android from RSA to AES, AES secret key is encrypted with RSA. 
+* **Breaking change**. Changed payloads encryption for Android from RSA to AES, AES secret key is encrypted with RSA.
 
 ## [2.0.0]````
-* **Breaking change**. Changed key alias to fix Android 4.4.2 issue. The plugin isn't able to get previous stored data. 
+* **Breaking change**. Changed key alias to fix Android 4.4.2 issue. The plugin isn't able to get previous stored data.
 
 ## [1.0.0]
 * Bump version

flutter_secure_storage/README.md

@@ -57,7 +57,7 @@ This allows us to be able to fetch secure values while the app is backgrounded,
 An example:
 
 ```dart
-final options = IOSOptions(accessibility: IOSAccessibility.first_unlock);
+final options = IOSOptions(accessibility: KeychainAccessibility.first_unlock);
 await storage.write(key: key, value: value, iOptions: options);
 ```
 

flutter_secure_storage/android/build.gradle

@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.1'
+        classpath 'com.android.tools.build:gradle:8.3.2'
     }
 }
 
@@ -30,15 +30,15 @@ android {
         buildConfig = true
     }
 
-    compileSdkVersion 33
+    compileSdk 34
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
     defaultConfig {
-        minSdkVersion 18
+        minSdkVersion 19
     }
 
 }