ZipExporterPreference: don't ask for storage permissions on newer android

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2020-09-16 18:01:06 +02:00
parent b877593d55
commit 746ab00794
2 changed files with 11 additions and 4 deletions
@@ -82,11 +82,16 @@ class ZipExporterPreference(context: Context, attrs: AttributeSet?) : Preference
            when (it) {
                // When we have successful authentication, or when there is no biometric hardware available.
                is BiometricAuthenticator.Result.Success, is BiometricAuthenticator.Result.HardwareUnavailableOrDisabled -> {
-                    activity.ensurePermissions(arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE)) { _, grantResults ->
-                        if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                            isEnabled = false
-                            exportZip()
+                    if (DownloadsFileSaver.needsWriteExternalStoragePermission) {
+                        activity.ensurePermissions(arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE)) { _, grantResults ->
+                            if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                                isEnabled = false
+                                exportZip()
+                            }
                        }
+                    } else {
+                        isEnabled = false
+                        exportZip()
                    }
                }
                is BiometricAuthenticator.Result.Failure -> {