Hesham/wireguard-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2020-09-16 16:08:15 +02:00
parent b877593d55
commit 746ab00794
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ui/src/main/java/com/wireguard/android/preference/ZipExporterPreference.kt
View File

@ -82,11 +82,16 @@ class ZipExporterPreference(context: Context, attrs: AttributeSet?) : Preference
when (it) { when (it) {
// When we have successful authentication, or when there is no biometric hardware available. // When we have successful authentication, or when there is no biometric hardware available.
is BiometricAuthenticator.Result.Success, is BiometricAuthenticator.Result.HardwareUnavailableOrDisabled -> { is BiometricAuthenticator.Result.Success, is BiometricAuthenticator.Result.HardwareUnavailableOrDisabled -> {
activity.ensurePermissions(arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE)) { _, grantResults -> if (DownloadsFileSaver.needsWriteExternalStoragePermission) {
if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) { activity.ensurePermissions(arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE)) { _, grantResults ->
isEnabled = false if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
exportZip() isEnabled = false
exportZip()
}
} }
} else {
isEnabled = false
exportZip()
} }
} }
is BiometricAuthenticator.Result.Failure -> { is BiometricAuthenticator.Result.Failure -> {

2
ui/src/main/java/com/wireguard/android/util/DownloadsFileSaver.kt
View File

@ -18,6 +18,8 @@ import java.io.IOException
import java.io.OutputStream import java.io.OutputStream
object DownloadsFileSaver { object DownloadsFileSaver {
val needsWriteExternalStoragePermission = Build.VERSION.SDK_INT < Build.VERSION_CODES.Q
@Throws(Exception::class) @Throws(Exception::class)
fun save(context: Context, name: String, mimeType: String?, overwriteExisting: Boolean) = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { fun save(context: Context, name: String, mimeType: String?, overwriteExisting: Boolean) = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
val contentResolver = context.contentResolver val contentResolver = context.contentResolver