From 2c75c43315aad24d87f215ead9211dab35f8be3f Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 26 Oct 2024 07:58:50 +0200 Subject: [PATCH] Block restore if Google backup is disabled --- .../java/eu/faircode/email/FairEmailBackupAgent.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FairEmailBackupAgent.java b/app/src/main/java/eu/faircode/email/FairEmailBackupAgent.java index ea2b1ce062..1cb91b414f 100644 --- a/app/src/main/java/eu/faircode/email/FairEmailBackupAgent.java +++ b/app/src/main/java/eu/faircode/email/FairEmailBackupAgent.java @@ -153,7 +153,13 @@ public class FairEmailBackupAgent extends BackupAgent { @Override public void onRestore(BackupDataInput data, int appVersionCode, ParcelFileDescriptor newState) { try { - EntityLog.log(this, "Restore start version=" + appVersionCode); + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); + boolean enabled = prefs.getBoolean("google_backup", BuildConfig.PLAY_STORE_RELEASE); + + EntityLog.log(this, "Restore start enabled=" + enabled + " version=" + appVersionCode); + + if (!enabled) + return; while (data.readNextHeader()) { String dataKey = data.getKey(); @@ -175,7 +181,6 @@ public class FairEmailBackupAgent extends BackupAgent { JSONObject jroot = new JSONObject(new String(dataBuf, StandardCharsets.UTF_8)); EntityLog.log(this, "Restore version=" + jroot.optInt("version", 0)); - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); SharedPreferences.Editor editor = prefs.edit(); JSONObject jsettings = jroot.getJSONObject("settings"); editor.putBoolean("enabled", jsettings.optBoolean("enabled"));