Skip to content

Delete on failure when sharedprefs fails to initialise #946

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
+16 −4
Open

Delete on failure when sharedprefs fails to initialise #946

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions ...torage/android/src/main/java/com/it_nomads/fluttersecurestorage/FlutterSecureStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ private String addPrefixToKey(String key) {

private SharedPreferences getEncryptedSharedPreferences(boolean deleteOnFailure, Map<String, Object> options, Context context, String sharedPreferencesName) throws GeneralSecurityException, IOException {
try {
final SharedPreferences encryptedPreferences = initializeEncryptedSharedPreferencesManager(context, sharedPreferencesName);
final SharedPreferences encryptedPreferences = initializeEncryptedSharedPreferencesManager(context, sharedPreferencesName, deleteOnFailure);
boolean migrated = encryptedPreferences.getBoolean(PREF_KEY_MIGRATED, false);
if (!migrated) {
migrateToEncryptedPreferences(context, sharedPreferencesName, encryptedPreferences, deleteOnFailure, options);
Expand All @@ -121,15 +121,15 @@ private SharedPreferences getEncryptedSharedPreferences(boolean deleteOnFailure,
context.getSharedPreferences(sharedPreferencesName, Context.MODE_PRIVATE).edit().clear().apply();

try {
return initializeEncryptedSharedPreferencesManager(context, sharedPreferencesName);
return initializeEncryptedSharedPreferencesManager(context, sharedPreferencesName, deleteOnFailure);
} catch (Exception f) {
Log.e(TAG, "initialization after reset failed", f);
throw f;
}
}
}

private SharedPreferences initializeEncryptedSharedPreferencesManager(Context context, String sharedPreferencesName) throws GeneralSecurityException, IOException {
private SharedPreferences initializeEncryptedSharedPreferencesManager(Context context, String sharedPreferencesName, boolean deleteOnFailure) throws GeneralSecurityException, IOException {
MasterKey masterKey = new MasterKey.Builder(context)
.setKeyGenParameterSpec(new KeyGenParameterSpec.Builder(
MasterKey.DEFAULT_MASTER_KEY_ALIAS,
Expand All @@ -140,12 +140,24 @@ private SharedPreferences initializeEncryptedSharedPreferencesManager(Context co
.build())
.build();

return EncryptedSharedPreferences.create(
try {
return EncryptedSharedPreferences.create(
context,
sharedPreferencesName,
masterKey,
EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM
);
} catch (Exception e) {
context.deleteSharedPreferences(sharedPreferencesName);
}

return EncryptedSharedPreferences.create(
context,
sharedPreferencesName,
masterKey,
EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM
);
}

Expand Down