BackupAndRestore: actual restore path on Android 10+

Author: yuliskov

common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/settings/BackupSettingsPresenter.java

@@ -176,6 +176,7 @@ private void appendLocalBackupRestoreOptions(List<OptionItem> options) {
         BackupAndRestoreManager backupManager = new BackupAndRestoreManager(getContext());
 
         String backupPath = backupManager.getBackupRootPath();
+        String restorePath = backupManager.getRestoreRootPath();
 
         options.add(UiOptionItem.from(
                 backupPath == null ? getContext().getString(R.string.app_backup) :
@@ -190,7 +191,7 @@ private void appendLocalBackupRestoreOptions(List<OptionItem> options) {
 
         options.add(UiOptionItem.from(
                 backupPath == null ? getContext().getString(R.string.app_restore) :
-                    String.format("%s:\n%s", getContext().getString(R.string.app_restore), backupPath),
+                    String.format("%s:\n%s", getContext().getString(R.string.app_restore), restorePath),
                 option -> {
                     backupManager.getBackupNames(names -> showLocalRestoreDialog(backupManager, names));
                 }));

common/src/main/java/com/liskovsoft/smartyoutubetv2/common/misc/BackupAndRestoreManager.java

@@ -276,26 +276,18 @@ public void onPermissions(int requestCode, String[] permissions, int[] grantResu
         }
     }
 
-    public String getBackupPath() {
-        File currentBackup = getBackup();
-
-        return currentBackup != null ? currentBackup.toString() : null;
-    }
-
     public String getBackupRootPath() {
         // NOTE: Android 11+ only backup through the file manager (no shared dir)
         if (hasAccessOnlyToAppFolders() && VERSION.SDK_INT > 29) {
             return Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOCUMENTS).getAbsolutePath()
                     + "/" + BackupAndRestoreHelper.BACKUP_FOLDER_NAME;
         }
 
-        return String.format("%s/data", getExternalStorageDirectory());
+        return getRestoreRootPath();
     }
 
-    public String getBackupPathCheck() {
-        File currentBackup = getBackupCheck();
-
-        return currentBackup != null ? currentBackup.toString() : null;
+    public String getRestoreRootPath() {
+        return String.format("%s/data", getExternalStorageDirectory());
     }
 
     public void getBackupNames(OnBackupNames callback) {