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

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

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

21
app/src/main/java/org/shadowice/flocke/andotp/Activities/MainActivity.java
View file

@ -106,6 +106,9 @@ public class MainActivity extends BaseActivity
private EncryptionType encryptionType = EncryptionType.KEYSTORE; private EncryptionType encryptionType = EncryptionType.KEYSTORE;
private boolean requireAuthentication = false; private boolean requireAuthentication = false;
private boolean recreateActivity = false;
private boolean cacheEncKey = false;
private Handler handler; private Handler handler;
private Runnable handlerTask; private Runnable handlerTask;
@ -260,6 +263,14 @@ public class MainActivity extends BaseActivity
tagsDrawerAdapter = new TagsAdapter(this, new HashMap<String, Boolean>()); tagsDrawerAdapter = new TagsAdapter(this, new HashMap<String, Boolean>());
adapter = new EntriesCardAdapter(this, tagsDrawerAdapter); adapter = new EntriesCardAdapter(this, tagsDrawerAdapter);
if (savedInstanceState != null) {
byte[] encKey = savedInstanceState.getByteArray("encKey");
if (encKey != null) {
adapter.setEncryptionKey(EncryptionHelper.generateSymmetricKey(encKey));
requireAuthentication = false;
}
}
recList.setAdapter(adapter); recList.setAdapter(adapter);
touchHelperCallback = new SimpleItemTouchHelperCallback(adapter); touchHelperCallback = new SimpleItemTouchHelperCallback(adapter);
@ -412,6 +423,9 @@ public class MainActivity extends BaseActivity
protected void onSaveInstanceState(Bundle outState) { protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState); super.onSaveInstanceState(outState);
outState.putString("filterString", filterString); outState.putString("filterString", filterString);
if (cacheEncKey)
outState.putByteArray("encKey", adapter.getEncryptionKey().getEncoded());
} }
public void onSharedPreferenceChanged(SharedPreferences prefs, String key) { public void onSharedPreferenceChanged(SharedPreferences prefs, String key) {
@ -431,7 +445,7 @@ public class MainActivity extends BaseActivity
key.equals(getString(R.string.settings_key_label_highlight_token)) || key.equals(getString(R.string.settings_key_label_highlight_token)) ||
key.equals(getString(R.string.settings_key_card_layout)) || key.equals(getString(R.string.settings_key_card_layout)) ||
key.equals(getString(R.string.settings_key_hide_global_timeout))) { key.equals(getString(R.string.settings_key_hide_global_timeout))) {
recreate(); recreateActivity = true;
} }
} }
@ -462,6 +476,11 @@ public class MainActivity extends BaseActivity
if (encryptionChanged) if (encryptionChanged)
updateEncryption(newKey); updateEncryption(newKey);
if (recreateActivity) {
cacheEncKey = true;
recreate();
}
} else if (requestCode == Constants.INTENT_MAIN_AUTHENTICATE) { } else if (requestCode == Constants.INTENT_MAIN_AUTHENTICATE) {
if (resultCode != RESULT_OK) { if (resultCode != RESULT_OK) {
Toast.makeText(getBaseContext(), R.string.toast_auth_failed_fatal, Toast.LENGTH_LONG).show(); Toast.makeText(getBaseContext(), R.string.toast_auth_failed_fatal, Toast.LENGTH_LONG).show();