Merge branch 'develop'3.13.2

1 files changed, 10 insertions, 1 deletions

diff --git a/app/src/main/java/app/fedilab/android/ui/fragment/settings/FragmentSettingsCategories.java b/app/src/main/java/app/fedilab/android/ui/fragment/settings/FragmentSettingsCategories.java
index 36d5b60e1..eb11a00ba 100644
--- a/app/src/main/java/app/fedilab/android/ui/fragment/settings/FragmentSettingsCategories.java
+++ b/app/src/main/java/app/fedilab/android/ui/fragment/settings/FragmentSettingsCategories.java
@@ -18,6 +18,7 @@ import android.Manifest;
 import android.app.Activity;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.os.Build;
 import android.os.Bundle;
 import android.webkit.URLUtil;
 import android.widget.Toast;
@@ -135,7 +136,15 @@ public class FragmentSettingsCategories extends PreferenceFragmentCompat {
         Preference pref_export_settings = findPreference(getString(R.string.pref_export_settings));
         if (pref_export_settings != null) {
             pref_export_settings.setOnPreferenceClickListener(preference -> {
-                permissionLauncher.launch(Manifest.permission.WRITE_EXTERNAL_STORAGE);
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+                    permissionLauncher.launch(Manifest.permission.WRITE_EXTERNAL_STORAGE);
+                } else {
+                    try {
+                        ZipHelper.exportData(requireActivity());
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                }
                 return false;
             });
         }