From 93ca40cd6f8c7fcec9b9a204178ab65d1472d26e Mon Sep 17 00:00:00 2001
From: Bnyro <yannick.fehler@web.de>
Date: Fri, 9 Sep 2022 17:04:49 +0200
Subject: [PATCH] remove storage permissions

---
 app/src/main/AndroidManifest.xml              |  5 --
 .../libretube/dialogs/DownloadDialog.kt       |  3 -
 .../github/libretube/dialogs/UpdateDialog.kt  |  2 -
 .../libretube/preferences/InstanceSettings.kt | 11 +--
 .../github/libretube/util/PermissionHelper.kt | 70 -------------------
 5 files changed, 1 insertion(+), 90 deletions(-)
 delete mode 100644 app/src/main/java/com/github/libretube/util/PermissionHelper.kt

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2375541e1..77fd1d9b4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -5,12 +5,7 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission
-        android:name="android.permission.MANAGE_EXTERNAL_STORAGE"
-        tools:ignore="ScopedStorage" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
     <application
diff --git a/app/src/main/java/com/github/libretube/dialogs/DownloadDialog.kt b/app/src/main/java/com/github/libretube/dialogs/DownloadDialog.kt
index 099f2557d..186ad60bb 100644
--- a/app/src/main/java/com/github/libretube/dialogs/DownloadDialog.kt
+++ b/app/src/main/java/com/github/libretube/dialogs/DownloadDialog.kt
@@ -16,7 +16,6 @@ import com.github.libretube.databinding.DialogDownloadBinding
 import com.github.libretube.extensions.TAG
 import com.github.libretube.obj.Streams
 import com.github.libretube.services.DownloadService
-import com.github.libretube.util.PermissionHelper
 import com.github.libretube.util.ThemeHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import retrofit2.HttpException
@@ -32,8 +31,6 @@ class DownloadDialog(
 
         fetchAvailableSources()
 
-        PermissionHelper.requestReadWrite(requireActivity())
-
         binding.title.text = ThemeHelper.getStyledAppName(requireContext())
 
         binding.audioRadio.setOnClickListener {
diff --git a/app/src/main/java/com/github/libretube/dialogs/UpdateDialog.kt b/app/src/main/java/com/github/libretube/dialogs/UpdateDialog.kt
index 4b3ed8d6c..d55ef37f9 100644
--- a/app/src/main/java/com/github/libretube/dialogs/UpdateDialog.kt
+++ b/app/src/main/java/com/github/libretube/dialogs/UpdateDialog.kt
@@ -10,7 +10,6 @@ import androidx.fragment.app.DialogFragment
 import com.github.libretube.R
 import com.github.libretube.services.UpdateService
 import com.github.libretube.update.UpdateInfo
-import com.github.libretube.util.PermissionHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 class UpdateDialog(
@@ -26,7 +25,6 @@ class UpdateDialog(
                 val downloadUrl = getDownloadUrl(updateInfo)
                 Log.i("downloadUrl", downloadUrl.toString())
                 if (downloadUrl != null) {
-                    PermissionHelper.requestReadWrite(requireActivity())
                     val intent = Intent(context, UpdateService::class.java)
                     intent.putExtra("downloadUrl", downloadUrl)
                     context?.startService(intent)
diff --git a/app/src/main/java/com/github/libretube/preferences/InstanceSettings.kt b/app/src/main/java/com/github/libretube/preferences/InstanceSettings.kt
index 8b92b8f97..a35b5f6b0 100644
--- a/app/src/main/java/com/github/libretube/preferences/InstanceSettings.kt
+++ b/app/src/main/java/com/github/libretube/preferences/InstanceSettings.kt
@@ -23,7 +23,6 @@ import com.github.libretube.dialogs.LoginDialog
 import com.github.libretube.dialogs.LogoutDialog
 import com.github.libretube.extensions.await
 import com.github.libretube.util.ImportHelper
-import com.github.libretube.util.PermissionHelper
 import com.github.libretube.util.PreferenceHelper
 import com.github.libretube.views.MaterialPreferenceFragment
 
@@ -147,15 +146,7 @@ class InstanceSettings : MaterialPreferenceFragment() {
         val importSubscriptions = findPreference<Preference>(PreferenceKeys.IMPORT_SUBS)
         importSubscriptions?.setOnPreferenceClickListener {
             // check StorageAccess
-            val accessGranted =
-                PermissionHelper.isStoragePermissionGranted(requireActivity())
-            // import subscriptions
-            if (accessGranted) {
-                getContent.launch("*/*")
-            } // request permissions if not granted
-            else {
-                PermissionHelper.requestReadWrite(requireActivity())
-            }
+            getContent.launch("*/*")
             true
         }
 
diff --git a/app/src/main/java/com/github/libretube/util/PermissionHelper.kt b/app/src/main/java/com/github/libretube/util/PermissionHelper.kt
deleted file mode 100644
index 1df60a152..000000000
--- a/app/src/main/java/com/github/libretube/util/PermissionHelper.kt
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.github.libretube.util
-
-import android.Manifest
-import android.app.Activity
-import android.content.pm.PackageManager
-import android.os.Build
-import android.os.Environment
-import androidx.core.app.ActivityCompat
-
-object PermissionHelper {
-    /**
-     * request storage permissions if not granted yet
-     */
-    fun requestReadWrite(activity: Activity): Boolean {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            if (!Environment.isExternalStorageManager()) {
-                ActivityCompat.requestPermissions(
-                    activity,
-                    arrayOf(
-                        Manifest.permission.READ_EXTERNAL_STORAGE,
-                        Manifest.permission.MANAGE_EXTERNAL_STORAGE
-                    ),
-                    1
-                ) // permission request code is just an int
-                return false
-            }
-        } else {
-            if (ActivityCompat.checkSelfPermission(
-                    activity,
-                    Manifest.permission.READ_EXTERNAL_STORAGE
-                ) != PackageManager.PERMISSION_GRANTED ||
-                ActivityCompat.checkSelfPermission(
-                        activity,
-                        Manifest.permission.WRITE_EXTERNAL_STORAGE
-                    ) != PackageManager.PERMISSION_GRANTED
-            ) {
-                ActivityCompat.requestPermissions(
-                    activity,
-                    arrayOf(
-                        Manifest.permission.READ_EXTERNAL_STORAGE,
-                        Manifest.permission.WRITE_EXTERNAL_STORAGE
-                    ),
-                    1
-                )
-                return false
-            }
-        }
-        return true
-    }
-
-    fun isStoragePermissionGranted(activity: Activity): Boolean {
-        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            if (activity.checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE)
-                == PackageManager.PERMISSION_GRANTED
-            ) {
-                true
-            } else {
-                ActivityCompat.requestPermissions(
-                    activity,
-                    arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE),
-                    1
-                )
-                false
-            }
-        } else {
-            // permission is automatically granted on sdk < 23 upon installation
-            true
-        }
-    }
-}