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

Remove new backup format warning

Browse source 
It's been there for a while, should not be needed anymore.
This commit is contained in:
Jakob Nixdorf 2020-06-10 07:00:04 +02:00
parent 41e398d100
commit 9d370f43b4
No known key found for this signature in database
GPG key ID: BE99BF86574A7DBC
4 changed files with 1 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/src/main/java/org/shadowice/flocke/andotp/Activities/BackupActivity.java
View file

@ -188,24 +188,6 @@ public class BackupActivity extends BaseActivity {
}
replace = v.findViewById(R.id.backup_replace);
if (! settings.getNewBackupFormatDialogShown()) {
showNewBackupInfo();
}
}
private void showNewBackupInfo() {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle(R.string.backup_new_format_dialog_title)
.setMessage(R.string.backup_new_format_dialog_msg)
.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
settings.setNewBackupFormatDialogShown(true);
}
})
.create()
.show();
}
// End with a result

12
app/src/main/java/org/shadowice/flocke/andotp/Utilities/Settings.java
View file

@ -409,10 +409,6 @@ public class Settings {
return getBoolean(R.string.settings_key_backup_ask, true);
}
public String getBackupDir() {
return getString(R.string.settings_key_backup_directory, Constants.BACKUP_FOLDER);
}
public String getBackupPassword() {
return getString(R.string.settings_key_backup_password, "");
}
@ -531,14 +527,6 @@ public class Settings {
setBoolean(R.string.settings_key_last_used_dialog_shown, value);
}
public boolean getNewBackupFormatDialogShown() {
return getBoolean(R.string.settings_key_new_backup_format_dialog_shown, false);
}
public void setNewBackupFormatDialogShown(boolean value) {
setBoolean(R.string.settings_key_new_backup_format_dialog_shown, value);
}
public boolean getAndroidBackupServiceEnabled() {
return getBoolean(R.string.settings_key_enable_android_backup_service, true);
}

2
app/src/main/res/values/settings.xml
View file

@ -50,7 +50,7 @@
<string name="settings_key_openpgp_key_encrypt" translatable="false">pref_openpgp_key_encrypt</string>
<string name="settings_key_openpgp_key_sign" translatable="false">pref_openpgp_key_sign</string>
<string name="settings_key_openpgp_verify" translatable="false">pref_openpgp_verify</string>
<string name="settings_key_new_backup_format_dialog_shown" translatable="false">pref_new_backup_dialog_shown</string>
<string name="settings_key_new_backup_format_dialog_shown" translatable="false">pref_new_backup_dialog_shown</string> <!--Deprecated -->
<string name="settings_key_security_backup_warning" translatable="false">pref_security_backup_warning_shown</string>
<string name="settings_key_sort_mode" translatable="false">pref_sort_mode</string>

6
app/src/main/res/values/strings_backup.xml
View file

@ -64,12 +64,6 @@
<string name="backup_receiver_custom_encryption_failed">Password/PIN based encryption not
supported with broadcast backup</string>
<string name="backup_new_format_dialog_title">New encryption method</string>
<string name="backup_new_format_dialog_msg">Since version 0.6.3 of andOTP, a <b>new and improved
encryption method</b> is used for password-protected backups. The old backups can still be
imported, but it is <b>highly recommended to create new backups with the improved
encryption</b>.\n\nThis message will not be shown again.</string>
<!-- Notification channels -->
<string name="notification_channel_name_backup_failed">Automatic backup failed</string>
<string name="notification_channel_name_backup_success">Automatic backup successful</string>