From a5ca64b3365951e8ac0f98160a41f2de9b426d1a Mon Sep 17 00:00:00 2001
From: Jakob Nixdorf <flocke@shadowice.org>
Date: Thu, 28 May 2020 20:37:41 +0200
Subject: [PATCH] Minor cleanup and improvement

---
 .../flocke/andotp/Activities/SettingsActivity.java         | 7 +++++++
 app/src/main/res/values/strings_backup.xml                 | 2 --
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/shadowice/flocke/andotp/Activities/SettingsActivity.java b/app/src/main/java/org/shadowice/flocke/andotp/Activities/SettingsActivity.java
index b3201f70..7693f6be 100644
--- a/app/src/main/java/org/shadowice/flocke/andotp/Activities/SettingsActivity.java
+++ b/app/src/main/java/org/shadowice/flocke/andotp/Activities/SettingsActivity.java
@@ -28,6 +28,7 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.preference.CheckBoxPreference;
 import android.preference.EditTextPreference;
@@ -37,6 +38,8 @@ import android.preference.PreferenceCategory;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
 import androidx.appcompat.widget.Toolbar;
+
+import android.provider.DocumentsContract;
 import android.view.ViewStub;
 import android.widget.Toast;
 
@@ -240,6 +243,10 @@ public class SettingsActivity extends BaseActivity
                 | Intent.FLAG_GRANT_WRITE_URI_PERMISSION
                 | Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION
                 | Intent.FLAG_GRANT_PREFIX_URI_PERMISSION);
+
+        if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && settings.isBackupLocationSet())
+            intent.putExtra(DocumentsContract.EXTRA_INITIAL_URI, settings.getBackupLocation());
+
         startActivityForResult(intent, Constants.INTENT_SETTINGS_BACKUP_LOCATION);
     }
 
diff --git a/app/src/main/res/values/strings_backup.xml b/app/src/main/res/values/strings_backup.xml
index 82119c89..dada8222 100644
--- a/app/src/main/res/values/strings_backup.xml
+++ b/app/src/main/res/values/strings_backup.xml
@@ -84,7 +84,6 @@
     <string name="backup_toast_location_access_failed">Failed to access backup location!</string>
     <string name="backup_toast_file_creation_failed">Failed to create backup file!</string>
 
-    <string name="backup_toast_mkdir_failed">Failed to create backup directory</string>
     <string name="backup_toast_export_success">Export to external storage successful</string>
     <string name="backup_toast_export_failed">Export to external storage failed</string>%
     <string name="backup_toast_import_success">Import from external storage successful</string>
@@ -92,7 +91,6 @@
     <string name="backup_toast_import_decryption_failed">Decryption of the backup failed</string>
     <string name="backup_toast_import_no_entries">No entries found in imported data</string>
     <string name="backup_toast_storage_not_accessible">External storage currently not accessible</string>
-    <string name="backup_toast_storage_permissions">Storage permissions not granted</string>
     <string name="backup_toast_openpgp_error">OpenPGP Error: %s</string>
     <string name="backup_toast_openpgp_not_verified">No verified signature detected</string>
     <string name="backup_toast_crypt_password_not_set">Password not set, check the <b>Settings</b></string>