luckyimnotanigger/Aegis
1
0
Fork 0
mirror of https://github.com/beemdevelopment/Aegis.git synced 2025-05-14 22:12:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Rename some things related to plaintext backup warning

Browse source
This commit is contained in:
Alexander Bakker 2022-10-25 18:38:07 +02:00
parent 681326839c
commit c58b773878
3 changed files with 11 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

22
app/src/main/java/com/beemdevelopment/aegis/Preferences.java
View file

@ -7,8 +7,6 @@ import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import com.beemdevelopment.aegis.ui.views.EntryHolder;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.beemdevelopment.aegis.util.JsonUtils; import com.beemdevelopment.aegis.util.JsonUtils;
@ -376,26 +374,20 @@ public class Preferences {
} }
public void setIsPlaintextBackupWarningNeeded(boolean needed) { public void setIsPlaintextBackupWarningNeeded(boolean needed) {
if (isPlaintextBackupWarningNeeded() != needed) { _prefs.edit().putBoolean("pref_plaintext_backup_warning_needed", needed).apply();
_prefs.edit().putBoolean("pref_plaintext_backup_warning_needed", needed).apply();
}
} }
public boolean isPlaintextBackupWarningNeeded() { public boolean isPlaintextBackupWarningNeeded() {
if (canShowPlaintextBackupWarning()) { return !isPlaintextBackupWarningDisabled()
return _prefs.getBoolean("pref_plaintext_backup_warning_needed", false); && _prefs.getBoolean("pref_plaintext_backup_warning_needed", false);
}
return false;
} }
public void setCanShowPlaintextBackupWarning(boolean canShow) { public void setIsPlaintextBackupWarningDisabled(boolean disabled) {
if (canShowPlaintextBackupWarning() != canShow) { _prefs.edit().putBoolean("pref_plaintext_backup_warning_disabled", disabled).apply();
_prefs.edit().putBoolean("pref_can_show_plaintext_backup_warning", canShow).apply();
}
} }
public boolean canShowPlaintextBackupWarning() { public boolean isPlaintextBackupWarningDisabled() {
return _prefs.getBoolean("pref_can_show_plaintext_backup_warning", true); return _prefs.getBoolean("pref_plaintext_backup_warning_disabled", false);
} }
public boolean isPinKeyboardEnabled() { public boolean isPinKeyboardEnabled() {

6
app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java
View file

@ -825,7 +825,7 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
} }
private void showPlaintextExportWarningOptions() { private void showPlaintextExportWarningOptions() {
View view = LayoutInflater.from(this).inflate(R.layout.dialog_plaintext_warning_options, null); View view = LayoutInflater.from(this).inflate(R.layout.dialog_plaintext_warning, null);
AlertDialog dialog = new AlertDialog.Builder(this) AlertDialog dialog = new AlertDialog.Builder(this)
.setTitle(R.string.backup_plaintext_export_warning) .setTitle(R.string.backup_plaintext_export_warning)
@ -834,7 +834,7 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
.setNegativeButton(android.R.string.cancel, null) .setNegativeButton(android.R.string.cancel, null)
.create(); .create();
CheckBox checkBox = view.findViewById(R.id.checkbox_dont_show_plaintext_warning_again); CheckBox checkBox = view.findViewById(R.id.checkbox_plaintext_warning);
checkBox.setChecked(false); checkBox.setChecked(false);
dialog.setOnShowListener(d -> { dialog.setOnShowListener(d -> {
@ -843,7 +843,7 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
btnPos.setOnClickListener(l -> { btnPos.setOnClickListener(l -> {
dialog.dismiss(); dialog.dismiss();
_prefs.setCanShowPlaintextBackupWarning(!checkBox.isChecked()); _prefs.setIsPlaintextBackupWarningDisabled(checkBox.isChecked());
_prefs.setIsPlaintextBackupWarningNeeded(false); _prefs.setIsPlaintextBackupWarningNeeded(false);
updateErrorBar(); updateErrorBar();

2
app/src/main/res/layout/dialog_plaintext_warning_options.xml → app/src/main/res/layout/dialog_plaintext_warning.xml
View file

@ -14,7 +14,7 @@
android:text="@string/backup_plaintext_warning_explanation" /> android:text="@string/backup_plaintext_warning_explanation" />
<CheckBox <CheckBox
android:id="@+id/checkbox_dont_show_plaintext_warning_again" android:id="@+id/checkbox_plaintext_warning"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="20dp" android:layout_marginStart="20dp"