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

Fix empty token list after changing encryption

Browse source 
Don't recreate the SettingsActivity when changing the encryption since that will also reset the values it returns to the MainActivity.
This commit is contained in:
Jakob Nixdorf 2018-03-15 14:40:33 +01:00
parent 76edcb900a
commit ca210558da
No known key found for this signature in database
GPG key ID: BE99BF86574A7DBC
1 changed files with 15 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -22,9 +22,7 @@
package org.shadowice.flocke.andotp.Activities; package org.shadowice.flocke.andotp.Activities;
import android.app.KeyguardManager;
import android.app.backup.BackupManager; import android.app.backup.BackupManager;
import android.app.backup.RestoreObserver;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
@ -36,12 +34,8 @@ import android.preference.Preference;
import android.preference.PreferenceCategory; import android.preference.PreferenceCategory;
import android.preference.PreferenceFragment; import android.preference.PreferenceFragment;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.design.widget.Snackbar;
import android.support.v7.widget.Toolbar; import android.support.v7.widget.Toolbar;
import android.util.Log;
import android.view.View;
import android.view.ViewStub; import android.view.ViewStub;
import android.widget.CheckBox;
import android.widget.Toast; import android.widget.Toast;
import org.openintents.openpgp.util.OpenPgpAppPreference; import org.openintents.openpgp.util.OpenPgpAppPreference;
@ -131,22 +125,19 @@ public class SettingsActivity extends BaseActivity
recreate(); recreate();
} else if(key.equals(getString(R.string.settings_key_encryption))) { } else if(key.equals(getString(R.string.settings_key_encryption))) {
if (settings.getEncryption() != EncryptionType.PASSWORD) { if (settings.getEncryption() != EncryptionType.PASSWORD) {
boolean wasSyncEnabled = settings.getAndroidBackupServiceEnabled(); if (settings.getAndroidBackupServiceEnabled()) {
settings.setAndroidBackupServiceEnabled(false);
if (wasSyncEnabled) {
UIHelper.showGenericDialog(this, UIHelper.showGenericDialog(this,
R.string.settings_dialog_title_android_sync, R.string.settings_dialog_title_android_sync,
R.string.settings_dialog_msg_android_sync_disabled_encryption, R.string.settings_dialog_msg_android_sync_disabled_encryption
new Runnable() {
@Override
public void run() {
recreate();
}
}
); );
} else recreate(); }
}else recreate();
settings.setAndroidBackupServiceEnabled(false);
fragment.useAndroidSync.setEnabled(false);
fragment.useAndroidSync.setChecked(false);
} else {
fragment.useAndroidSync.setEnabled(true);
}
} }
} }
@ -241,6 +232,7 @@ public class SettingsActivity extends BaseActivity
Settings settings; Settings settings;
ListPreference encryption; ListPreference encryption;
CheckBoxPreference useAndroidSync;
OpenPgpAppPreference pgpProvider; OpenPgpAppPreference pgpProvider;
OpenPgpKeyPreference pgpKey; OpenPgpKeyPreference pgpKey;
@ -333,11 +325,10 @@ public class SettingsActivity extends BaseActivity
}); });
pgpKey.setDefaultUserId("Alice <alice@example.com>"); pgpKey.setDefaultUserId("Alice <alice@example.com>");
CheckBoxPreference useAndroidSync = (CheckBoxPreference) findPreference(getString(R.string.settings_key_enable_android_backup_service)); useAndroidSync = (CheckBoxPreference) findPreference(getString(R.string.settings_key_enable_android_backup_service));
useAndroidSync.setEnabled(settings.getEncryption() == EncryptionType.PASSWORD); useAndroidSync.setEnabled(settings.getEncryption() == EncryptionType.PASSWORD);
if(!useAndroidSync.isEnabled()) { if(!useAndroidSync.isEnabled())
useAndroidSync.setChecked(false); useAndroidSync.setChecked(false);
}
if (sharedPref.contains(getString(R.string.settings_key_special_features)) && if (sharedPref.contains(getString(R.string.settings_key_special_features)) &&
sharedPref.getBoolean(getString(R.string.settings_key_special_features), false)) { sharedPref.getBoolean(getString(R.string.settings_key_special_features), false)) {