From bf666f0296076988bb8e8e10b099233db7b6df59 Mon Sep 17 00:00:00 2001
From: Anton Chekulaev <metaphore@bk.ru>
Date: Wed, 16 Sep 2020 19:16:47 +1000
Subject: [PATCH] Backup pref related fixes.

---
 res/xml/preferences_chats.xml                     | 4 ++--
 src/org/thoughtcrime/securesms/util/BackupUtil.kt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/res/xml/preferences_chats.xml b/res/xml/preferences_chats.xml
index 9d0cac23f9..4b1d69e8f0 100644
--- a/res/xml/preferences_chats.xml
+++ b/res/xml/preferences_chats.xml
@@ -94,7 +94,7 @@
 
         <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
             android:defaultValue="false"
-            android:key="pref_backup_enabled"
+            android:key="pref_backup_enabled_v2"
             android:title="@string/preferences_chats__chat_backups"
             android:summary="@string/preferences_chats__backup_chats_to_external_storage" />
 
@@ -102,7 +102,7 @@
             android:key="pref_backup_create"
             android:title="@string/preferences_chats__create_backup"
             android:persistent="false"
-            android:dependency="pref_backup_enabled"
+            android:dependency="pref_backup_enabled_v2"
             tools:summary="Last backup: 3 days ago" />
 
     </PreferenceCategory>
diff --git a/src/org/thoughtcrime/securesms/util/BackupUtil.kt b/src/org/thoughtcrime/securesms/util/BackupUtil.kt
index c23dbc772c..894a70087d 100644
--- a/src/org/thoughtcrime/securesms/util/BackupUtil.kt
+++ b/src/org/thoughtcrime/securesms/util/BackupUtil.kt
@@ -40,7 +40,7 @@ object BackupUtil {
     @Throws(IOException::class)
     fun enableBackups(context: Context, password: String) {
         val backupDir = getBackupDirUri(context)
-        if (backupDir == null || validateDirAccess(context, backupDir)) {
+        if (backupDir == null || !validateDirAccess(context, backupDir)) {
             throw IOException("Backup dir is not set or invalid.")
         }