Minor cleanup and improvement

This commit is contained in:
Jakob Nixdorf 2020-05-28 20:37:41 +02:00
parent 82c71bc170
commit a5ca64b336
No known key found for this signature in database
GPG key ID: BE99BF86574A7DBC
2 changed files with 7 additions and 2 deletions

View file

@ -28,6 +28,7 @@ import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.net.Uri; import android.net.Uri;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.preference.CheckBoxPreference; import android.preference.CheckBoxPreference;
import android.preference.EditTextPreference; import android.preference.EditTextPreference;
@ -37,6 +38,8 @@ import android.preference.PreferenceCategory;
import android.preference.PreferenceFragment; import android.preference.PreferenceFragment;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import androidx.appcompat.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import android.provider.DocumentsContract;
import android.view.ViewStub; import android.view.ViewStub;
import android.widget.Toast; import android.widget.Toast;
@ -240,6 +243,10 @@ public class SettingsActivity extends BaseActivity
| Intent.FLAG_GRANT_WRITE_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION
| Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION | Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION
| Intent.FLAG_GRANT_PREFIX_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); startActivityForResult(intent, Constants.INTENT_SETTINGS_BACKUP_LOCATION);
} }

View file

@ -84,7 +84,6 @@
<string name="backup_toast_location_access_failed">Failed to access backup location!</string> <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_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_success">Export to external storage successful</string>
<string name="backup_toast_export_failed">Export to external storage failed</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> <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_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_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_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_error">OpenPGP Error: %s</string>
<string name="backup_toast_openpgp_not_verified">No verified signature detected</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> <string name="backup_toast_crypt_password_not_set">Password not set, check the <b>Settings</b></string>