Skip to content

Commit 75b049f

Browse files
committed
Ensured hive key errors are handeled correctly
(cherry picked from commit 7110e62)
1 parent acd60af commit 75b049f

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

lib/app_setup.dart

+10-2
Original file line numberDiff line numberDiff line change
@@ -137,14 +137,22 @@ Future<Uint8List> _hiveKey() async {
137137
var secureStorage = const FlutterSecureStorage(
138138
aOptions: AndroidOptions(encryptedSharedPreferences: true),
139139
);
140-
const nonEncSharedPrefSecureStorage = FlutterSecureStorage();
140+
const nonEncSharedPrefSecureStorage = FlutterSecureStorage(
141+
aOptions: AndroidOptions(encryptedSharedPreferences: false),
142+
);
141143

142144
Uint8List? encryptionKey;
143145
try {
144146
encryptionKey = await secureStorage.read(key: keyName).then((value) => value?.let(base64Decode));
145147
} on PlatformException catch (e) {
146148
logger.e('Error while reading hive_key from secure storage', e);
147-
encryptionKey = await nonEncSharedPrefSecureStorage.read(key: keyName).then((value) => value?.let(base64Decode));
149+
encryptionKey = await nonEncSharedPrefSecureStorage
150+
.read(key: keyName)
151+
.then((value) => value?.let(base64Decode))
152+
.onError((error, stackTrace) {
153+
logger.e('Error while reading hive_key from non-encryptedSharedPreferences', error, stackTrace);
154+
return null;
155+
});
148156
await nonEncSharedPrefSecureStorage.delete(key: keyName);
149157
await secureStorage.write(
150158
key: keyName,

0 commit comments

Comments
 (0)