[CHERRY-PICK] fix(backup): set backup path to empty string by default on Android and update backup popup

src/app/global/local_account_sensitive_settings.nim

@@ -595,6 +595,9 @@ QtObject:
   proc getLocalBackupChosenPath*(self: LocalAccountSensitiveSettings): string {.slot.} =
     let setting = self.getLocalBackupChosenPathSetting()
     if setting == "":
+      when defined(android):
+        # Return an empty string to make it clear to users that without permissisons we cannot access any path
+        return ""
       return DEFAULT_BACKUP_DIR
 
     return setting

src/app_service/service/devices/service.nim

@@ -124,7 +124,6 @@ QtObject:
 
           let backupPath = singletonInstance.localAccountSensitiveSettings.getLocalBackupChosenPath()
 
-
           if backupPath.len == 0 or not backupPath.startsWith("content://"):
             raise newException(CatchableError, "invalid backup path for SAF copy")
 

src/app_service/service/settings/service.nim

@@ -159,6 +159,9 @@ QtObject:
   # New local setting needs to be initialized from old setting value
   # TODO remove this migration in 2.37 (one release cycle interval)
   proc migrateBackupPath*(self: Service) =
+    when defined(android):
+      # On Android we cannot use arbitrary paths without requesting storage permissions
+      return
     if singletonInstance.localAccountSensitiveSettings.getLocalBackupChosenPathSetting().len == 0 and self.settings.backupPath.len > 0:
       singletonInstance.localAccountSensitiveSettings.setLocalBackupChosenPath(self.settings.backupPath)
 

ui/StatusQ/src/assets/png/png.qrc

@@ -1,5 +1,6 @@
 <RCC>
     <qresource prefix="/assets/png">
+        <file>backup-popup.png</file>
         <file>browser/[email protected]</file>
         <file>browser/pepehand.png</file>
         <file>community/airdrops8_1.png</file>

ui/app/AppLayouts/Profile/stores/DevicesStore.qml

@@ -27,7 +27,12 @@ QtObject {
     readonly property int backupDataState: syncModule ? syncModule.backupDataState : 0
     readonly property string backupImportError: syncModule ? syncModule.backupImportError : ""
     readonly property string backupDataError: syncModule ? syncModule.backupDataError : ""
-    readonly property url backupPath: toFileUri(d.localAccountSensitiveSettingsInst.localBackupChosenPath)
+    readonly property url backupPath: {
+        if (!d.localAccountSensitiveSettingsInst.localBackupChosenPath) {
+            return ""
+        }
+        return toFileUri(d.localAccountSensitiveSettingsInst.localBackupChosenPath)
+    }
     readonly property bool messagesBackupEnabled: d.appSettingsInst.messagesBackupEnabled
 
     readonly property QtObject _d: StatusQUtils.QObject {

ui/app/AppLayouts/Profile/views/BackupView.qml

@@ -3,9 +3,10 @@ import QtQuick.Controls
 import QtQuick.Layouts
 
 import StatusQ
-import StatusQ.Core
 import StatusQ.Controls
+import StatusQ.Core
 import StatusQ.Core.Theme
+import StatusQ.Core.Utils as SQUtils
 import StatusQ.Popups.Dialog
 
 import utils
@@ -132,7 +133,13 @@ SettingsContentBase {
             Layout.fillWidth: true
             Layout.leftMargin: Theme.padding
             wrapMode: Text.Wrap
-            text: qsTr("Choose a folder to store your backup files or use the default one.")
+            text: {
+                if (SQUtils.Utils.isAndroid) {
+                    // We cannot use arbitrary paths on Android without requesting storage permissions
+                    return qsTr("Choose a folder to store your backup files in.")
+                }
+                return qsTr("Choose a folder to store your backup files or use the default one.")
+            }
             color: Theme.palette.baseColor1
         }
 

ui/i18n/qml_base_en.ts

@@ -2475,6 +2475,10 @@ To backup you recovery phrase, write it down and store it securely in a safe pla
         <source>Backups are automatic (every 30 mins), secure (encrypted with your profile private key), and private (your data is stored &lt;b&gt;only&lt;/b&gt; on your device).</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Choose a folder to store your backup files in.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BalanceExceeded</name>
@@ -6753,11 +6757,23 @@ Remember your password and don&apos;t share it with anyone.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>On-device backups are:&lt;br&gt;Automatic – every 30 minutes&lt;br&gt;Secure – encrypted with your profile private key&lt;br&gt;Private – stored only on your device</source>
+        <source>Backups let you restore your 1-on-1, group, and community messages if you need to reinstall the app or switch devices. You can skip this step now and enable it anytime under: &lt;i&gt;Settings &gt; On-device backup &gt; Backup data&lt;/i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Backups let you restore your 1-on-1, group, and community messages if you need to reinstall the app or switch devices. You can skip this step now and enable it anytime under: &lt;i&gt;Settings &gt; On-device backup &gt; Backup data&lt;/i&gt;</source>
+        <source>Enable on-device backup?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>On-device backups are:&lt;br&gt;&lt;b&gt;Automatic&lt;/b&gt; –  created every 30 minutes&lt;br&gt;&lt;b&gt;Secure&lt;/b&gt; – encrypted with your profile’s private key&lt;br&gt;&lt;b&gt;Private&lt;/b&gt; – stored only on your device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To enable backups, choose a folder to store your backup files under the &lt;b&gt;Backup location&lt;/b&gt; setting.&lt;br&gt;&lt;br&gt;You can also &lt;b&gt;optionally&lt;/b&gt; back up your &lt;b&gt;1-on-1, group, and community messages&lt;/b&gt; by turning on the &lt;b&gt;Backup your messages&lt;/b&gt; toggle under the &lt;b&gt;Backup data&lt;/b&gt; setting.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Go to settings</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

ui/i18n/qml_base_lokalise_en.ts

@@ -3035,6 +3035,11 @@
       <comment>BackupView</comment>
       <translation>Backups are automatic (every 30 mins), secure (encrypted with your profile private key), and private (your data is stored &lt;b&gt;only&lt;/b&gt; on your device).</translation>
     </message>
+    <message>
+      <source>Choose a folder to store your backup files in.</source>
+      <comment>BackupView</comment>
+      <translation>Choose a folder to store your backup files in.</translation>
+    </message>
   </context>
   <context>
     <name>BalanceExceeded</name>
@@ -8246,14 +8251,29 @@
       <translation>Enable on-device message backup?</translation>
     </message>
     <message>
-      <source>On-device backups are:&lt;br&gt;Automatic – every 30 minutes&lt;br&gt;Secure – encrypted with your profile private key&lt;br&gt;Private – stored only on your device</source>
+      <source>Backups let you restore your 1-on-1, group, and community messages if you need to reinstall the app or switch devices. You can skip this step now and enable it anytime under: &lt;i&gt;Settings &gt; On-device backup &gt; Backup data&lt;/i&gt;</source>
       <comment>EnableMessageBackupPopup</comment>
-      <translation>On-device backups are:&lt;br&gt;Automatic – every 30 minutes&lt;br&gt;Secure – encrypted with your profile private key&lt;br&gt;Private – stored only on your device</translation>
+      <translation>Backups let you restore your 1-on-1, group, and community messages if you need to reinstall the app or switch devices. You can skip this step now and enable it anytime under: &lt;i&gt;Settings &gt; On-device backup &gt; Backup data&lt;/i&gt;</translation>
     </message>
     <message>
-      <source>Backups let you restore your 1-on-1, group, and community messages if you need to reinstall the app or switch devices. You can skip this step now and enable it anytime under: &lt;i&gt;Settings &gt; On-device backup &gt; Backup data&lt;/i&gt;</source>
+      <source>Enable on-device backup?</source>
       <comment>EnableMessageBackupPopup</comment>
-      <translation>Backups let you restore your 1-on-1, group, and community messages if you need to reinstall the app or switch devices. You can skip this step now and enable it anytime under: &lt;i&gt;Settings &gt; On-device backup &gt; Backup data&lt;/i&gt;</translation>
+      <translation>Enable on-device backup?</translation>
+    </message>
+    <message>
+      <source>On-device backups are:&lt;br&gt;&lt;b&gt;Automatic&lt;/b&gt; –  created every 30 minutes&lt;br&gt;&lt;b&gt;Secure&lt;/b&gt; – encrypted with your profile’s private key&lt;br&gt;&lt;b&gt;Private&lt;/b&gt; – stored only on your device</source>
+      <comment>EnableMessageBackupPopup</comment>
+      <translation>On-device backups are:&lt;br&gt;&lt;b&gt;Automatic&lt;/b&gt; –  created every 30 minutes&lt;br&gt;&lt;b&gt;Secure&lt;/b&gt; – encrypted with your profile’s private key&lt;br&gt;&lt;b&gt;Private&lt;/b&gt; – stored only on your device</translation>
+    </message>
+    <message>
+      <source>To enable backups, choose a folder to store your backup files under the &lt;b&gt;Backup location&lt;/b&gt; setting.&lt;br&gt;&lt;br&gt;You can also &lt;b&gt;optionally&lt;/b&gt; back up your &lt;b&gt;1-on-1, group, and community messages&lt;/b&gt; by turning on the &lt;b&gt;Backup your messages&lt;/b&gt; toggle under the &lt;b&gt;Backup data&lt;/b&gt; setting.</source>
+      <comment>EnableMessageBackupPopup</comment>
+      <translation>To enable backups, choose a folder to store your backup files under the &lt;b&gt;Backup location&lt;/b&gt; setting.&lt;br&gt;&lt;br&gt;You can also &lt;b&gt;optionally&lt;/b&gt; back up your &lt;b&gt;1-on-1, group, and community messages&lt;/b&gt; by turning on the &lt;b&gt;Backup your messages&lt;/b&gt; toggle under the &lt;b&gt;Backup data&lt;/b&gt; setting.</translation>
+    </message>
+    <message>
+      <source>Go to settings</source>
+      <comment>EnableMessageBackupPopup</comment>
+      <translation>Go to settings</translation>
     </message>
   </context>
   <context>

ui/i18n/qml_cs.ts

@@ -2482,6 +2482,10 @@ To backup you recovery phrase, write it down and store it securely in a safe pla
         <source>Backups are automatic (every 30 mins), secure (encrypted with your profile private key), and private (your data is stored &lt;b&gt;only&lt;/b&gt; on your device).</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Choose a folder to store your backup files in.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BalanceExceeded</name>
@@ -6777,11 +6781,23 @@ Remember your password and don&apos;t share it with anyone.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>On-device backups are:&lt;br&gt;Automatic – every 30 minutes&lt;br&gt;Secure – encrypted with your profile private key&lt;br&gt;Private – stored only on your device</source>
+        <source>Backups let you restore your 1-on-1, group, and community messages if you need to reinstall the app or switch devices. You can skip this step now and enable it anytime under: &lt;i&gt;Settings &gt; On-device backup &gt; Backup data&lt;/i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Backups let you restore your 1-on-1, group, and community messages if you need to reinstall the app or switch devices. You can skip this step now and enable it anytime under: &lt;i&gt;Settings &gt; On-device backup &gt; Backup data&lt;/i&gt;</source>
+        <source>Enable on-device backup?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>On-device backups are:&lt;br&gt;&lt;b&gt;Automatic&lt;/b&gt; –  created every 30 minutes&lt;br&gt;&lt;b&gt;Secure&lt;/b&gt; – encrypted with your profile’s private key&lt;br&gt;&lt;b&gt;Private&lt;/b&gt; – stored only on your device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To enable backups, choose a folder to store your backup files under the &lt;b&gt;Backup location&lt;/b&gt; setting.&lt;br&gt;&lt;br&gt;You can also &lt;b&gt;optionally&lt;/b&gt; back up your &lt;b&gt;1-on-1, group, and community messages&lt;/b&gt; by turning on the &lt;b&gt;Backup your messages&lt;/b&gt; toggle under the &lt;b&gt;Backup data&lt;/b&gt; setting.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Go to settings</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

ui/i18n/qml_es.ts

@@ -2478,6 +2478,10 @@ Para respaldar tu frase de recuperación, escríbela y guárdala de forma segura
         <source>Supported backup formats (%1)</source>
         <translation></translation>
     </message>
+    <message>
+        <source>Choose a folder to store your backup files in.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BalanceExceeded</name>
@@ -6757,10 +6761,6 @@ Recuerda tu contraseña y no la compartas con nadie.</translation>
         <source>Enable on-device message backup?</source>
         <translation>¿Habilitar backup de mensajes en el dispositivo?</translation>
     </message>
-    <message>
-        <source>On-device backups are:&lt;br&gt;Automatic – every 30 minutes&lt;br&gt;Secure – encrypted with your profile private key&lt;br&gt;Private – stored only on your device</source>
-        <translation>Los backups en el dispositivo son:&lt;br&gt;Automáticos: cada 30 minutos&lt;br&gt;Seguros: cifrados con tu clave privada del perfil&lt;br&gt;Privados: almacenados solo en tu dispositivo</translation>
-    </message>
     <message>
         <source>Backups let you restore your 1-on-1, group, and community messages if you need to reinstall the app or switch devices. You can skip this step now and enable it anytime under: &lt;i&gt;Settings &gt; On-device backup &gt; Backup data&lt;/i&gt;</source>
         <translation>Los backups te permiten restaurar tus mensajes 1 a 1, grupales y de comunidad si necesitas reinstalar la app o cambiar de dispositivo. Puedes omitir este paso ahora y habilitarlo en cualquier momento en: &lt;i&gt;Configuración &gt; Respaldo en el dispositivo &gt; Datos de backup&lt;/i&gt;</translation>
@@ -6773,6 +6773,22 @@ Recuerda tu contraseña y no la compartas con nadie.</translation>
         <source>Enable</source>
         <translation>Habilitar</translation>
     </message>
+    <message>
+        <source>Enable on-device backup?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>On-device backups are:&lt;br&gt;&lt;b&gt;Automatic&lt;/b&gt; –  created every 30 minutes&lt;br&gt;&lt;b&gt;Secure&lt;/b&gt; – encrypted with your profile’s private key&lt;br&gt;&lt;b&gt;Private&lt;/b&gt; – stored only on your device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To enable backups, choose a folder to store your backup files under the &lt;b&gt;Backup location&lt;/b&gt; setting.&lt;br&gt;&lt;br&gt;You can also &lt;b&gt;optionally&lt;/b&gt; back up your &lt;b&gt;1-on-1, group, and community messages&lt;/b&gt; by turning on the &lt;b&gt;Backup your messages&lt;/b&gt; toggle under the &lt;b&gt;Backup data&lt;/b&gt; setting.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Go to settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EnsAddedView</name>

ui/imports/shared/popups/EnableMessageBackupPopup.qml

@@ -2,15 +2,25 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 
+import StatusQ.Components
 import StatusQ.Core
 import StatusQ.Core.Theme
+import StatusQ.Core.Utils as SQUtils
 import StatusQ.Controls
 import StatusQ.Popups.Dialog
 
+import utils
+
 StatusDialog {
     id: root
 
-    title: qsTr("Enable on-device message backup?")
+    title: {
+        if (SQUtils.Utils.isAndroid) {
+            // Android needs specific wording because it requires user permission to access storage
+            return qsTr("Enable on-device backup?")
+        }
+        return qsTr("Enable on-device message backup?")
+    }
 
     padding: 20
     width: 480
@@ -19,15 +29,27 @@ StatusDialog {
     contentItem: ColumnLayout {
         spacing: Theme.padding
 
+        StatusImage {
+            Layout.alignment: Qt.AlignHCenter
+            Layout.preferredWidth: Math.min(496, parent.width)
+            source: Theme.png("backup-popup")
+            mipmap: true
+        }
+
         StatusBaseText {
             Layout.fillWidth: true
             wrapMode: Text.Wrap
-            text: qsTr("On-device backups are:<br>Automatic – every 30 minutes<br>Secure – encrypted with your profile private key<br>Private – stored only on your device")
+            text: qsTr("On-device backups are:<br><b>Automatic</b> –  created every 30 minutes<br><b>Secure</b> – encrypted with your profile’s private key<br><b>Private</b> – stored only on your device")
         }
         StatusBaseText {
             Layout.fillWidth: true
             wrapMode: Text.Wrap
-            text: qsTr("Backups let you restore your 1-on-1, group, and community messages if you need to reinstall the app or switch devices. You can skip this step now and enable it anytime under: <i>Settings > On-device backup > Backup data</i>")
+            text: {
+                if (SQUtils.Utils.isAndroid) {
+                    return qsTr("To enable backups, choose a folder to store your backup files under the <b>Backup location</b> setting.<br><br>You can also <b>optionally</b> back up your <b>1-on-1, group, and community messages</b> by turning on the <b>Backup your messages</b> toggle under the <b>Backup data</b> setting.")
+                }
+                return qsTr("Backups let you restore your 1-on-1, group, and community messages if you need to reinstall the app or switch devices. You can skip this step now and enable it anytime under: <i>Settings > On-device backup > Backup data</i>")
+            }
         }
     }
 
@@ -42,8 +64,15 @@ StatusDialog {
         rightButtons: ObjectModel {
             StatusButton {
                 objectName: "backupMessageEnableStatusFlatButton"
-                text: qsTr("Enable")
-                onClicked: root.accept()
+                text: SQUtils.Utils.isAndroid ? qsTr("Go to settings") : qsTr("Enable")
+                onClicked: {
+                    if (SQUtils.Utils.isAndroid) {
+                        Global.changeAppSectionBySectionType(Constants.appSection.profile, Constants.settingsSubsection.backupSettings)
+                        root.close()
+                        return
+                    }
+                    root.accept()
+                }
             }
         }
     }