Try to takkle down export dir issues

This commit is contained in:
Peter Storch
2022-01-01 12:10:47 +01:00
parent 07074ad260
commit 1631836327
7 changed files with 34 additions and 19 deletions
@@ -66,7 +66,11 @@ public class ImportExportSettingsFragment extends PreferenceFragmentCompat {
instantExportDirectoryPreference.setSummaryProvider(preference -> {
DocumentFile directory = PreferencesUtils.getDefaultExportDirectoryUri(getContext());
//Use same value for not set as Androidx ListPreference and EditTextPreference
return directory != null ? directory.getName() : getString(R.string.not_set);
if (directory == null) {
return getString(R.string.not_set);
}
return directory.getUri().toString() + (directory.canWrite() ? "" : getString(R.string.export_dir_not_writable));
});
}
}
@@ -531,12 +531,12 @@ public class PreferencesUtils {
}
public static DocumentFile getDefaultExportDirectoryUri(Context context) {
String singleExportDirectorySettingsKey = getString(R.string.settings_default_export_directory_key, null);
if (singleExportDirectorySettingsKey == null) {
String singleExportDirectory = getString(R.string.settings_default_export_directory_key, null);
if (singleExportDirectory == null) {
return null;
}
try {
return DocumentFile.fromTreeUri(context, Uri.parse(singleExportDirectorySettingsKey));
return DocumentFile.fromTreeUri(context, Uri.parse(singleExportDirectory));
} catch (Exception e) {
Log.w(TAG, "Could not decode default export directory: " + e.getMessage());
}