kumi/andOTP
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cache the encryption key when recreating the settings activity after settings changes

Browse source
This commit is contained in:
Jakob Nixdorf 2020-05-25 17:01:11 +02:00
parent cdc54028b3
commit c1d6c6b2b8
No known key found for this signature in database
GPG key ID: BE99BF86574A7DBC
1 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/src/main/java/org/shadowice/flocke/andotp/Activities/SettingsActivity.java
View file

@ -85,6 +85,15 @@ public class SettingsActivity extends BaseActivity
if (keyMaterial != null && keyMaterial.length > 0) if (keyMaterial != null && keyMaterial.length > 0)
encryptionKey = EncryptionHelper.generateSymmetricKey(keyMaterial); encryptionKey = EncryptionHelper.generateSymmetricKey(keyMaterial);
if (savedInstanceState != null) {
encryptionChanged = savedInstanceState.getBoolean(Constants.EXTRA_SETTINGS_ENCRYPTION_CHANGED, false);
byte[] encKey = savedInstanceState.getByteArray(Constants.EXTRA_SETTINGS_ENCRYPTION_KEY);
if (encKey != null) {
encryptionKey = EncryptionHelper.generateSymmetricKey(encKey);
}
}
fragment = new SettingsFragment(); fragment = new SettingsFragment();
getFragmentManager().beginTransaction() getFragmentManager().beginTransaction()
@ -95,6 +104,14 @@ public class SettingsActivity extends BaseActivity
sharedPref.registerOnSharedPreferenceChangeListener(this); sharedPref.registerOnSharedPreferenceChangeListener(this);
} }
@Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
outState.putBoolean(Constants.EXTRA_SETTINGS_ENCRYPTION_CHANGED, encryptionChanged);
outState.putByteArray(Constants.EXTRA_SETTINGS_ENCRYPTION_KEY, encryptionKey.getEncoded());
}
public void finishWithResult() { public void finishWithResult() {
Intent data = new Intent(); Intent data = new Intent();