From a4aa4120ded208a13a4a67cf3fbf37f3bc0a100b Mon Sep 17 00:00:00 2001
From: MM20 <15646950+MM2-0@users.noreply.github.com>
Date: Mon, 18 Dec 2023 16:59:58 +0100
Subject: [PATCH] Remove plugins permission

---
 app/app/src/main/AndroidManifest.xml                  |  2 --
 app/app/src/release/AndroidManifest.xml               | 11 -----------
 .../ui/settings/plugins/PluginsSettingsScreen.kt      |  2 --
 .../ui/settings/plugins/PluginsSettingsScreenVM.kt    |  5 -----
 .../java/de/mm20/launcher2/plugins/PluginScanner.kt   |  1 +
 .../java/de/mm20/launcher2/plugins/PluginService.kt   |  1 +
 6 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/app/app/src/main/AndroidManifest.xml b/app/app/src/main/AndroidManifest.xml
index 612007b6..6b6a4433 100644
--- a/app/app/src/main/AndroidManifest.xml
+++ b/app/app/src/main/AndroidManifest.xml
@@ -27,8 +27,6 @@
 
     <uses-permission android:name="android.permission.VIBRATE" />
 
-    <uses-permission android:name="de.mm20.launcher2.permission.USE_PLUGINS" />
-
     <application
         android:name=".LauncherApplication"
         android:allowBackup="true"
diff --git a/app/app/src/release/AndroidManifest.xml b/app/app/src/release/AndroidManifest.xml
index c50fdf00..8bdb7e14 100644
--- a/app/app/src/release/AndroidManifest.xml
+++ b/app/app/src/release/AndroidManifest.xml
@@ -1,15 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <permission-group
-        android:name="de.mm20.launcher2.permission-group.PLUGINS"
-        android:label="Kvaesitso plugins" />
-    <permission
-        android:name="de.mm20.launcher2.permission.USE_PLUGINS"
-        android:label="@string/app_name"
-        android:description="@string/app_name"
-        android:icon="@drawable/ic_launcher_monochrome"
-        android:permissionGroup="de.mm20.launcher2.permission-group.PLUGINS"
-        android:protectionLevel="dangerous" />
-
 </manifest>
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/plugins/PluginsSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/plugins/PluginsSettingsScreen.kt
index 32d2b863..78d0036d 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/plugins/PluginsSettingsScreen.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/plugins/PluginsSettingsScreen.kt
@@ -27,7 +27,6 @@ import coil.compose.AsyncImage
 import de.mm20.launcher2.plugin.PluginPackage
 import de.mm20.launcher2.ui.R
 import de.mm20.launcher2.ui.component.LargeMessage
-import de.mm20.launcher2.ui.component.MissingPermissionBanner
 import de.mm20.launcher2.ui.component.preferences.Preference
 import de.mm20.launcher2.ui.component.preferences.PreferenceCategory
 import de.mm20.launcher2.ui.component.preferences.PreferenceScreen
@@ -36,7 +35,6 @@ import de.mm20.launcher2.ui.locals.LocalNavController
 @Composable
 fun PluginsSettingsScreen() {
     val viewModel: PluginsSettingsScreenVM = viewModel()
-    val context = LocalContext.current
     val pluginPackages by viewModel.pluginPackages.collectAsState(null)
     val enabledPackages by viewModel.enabledPluginPackages.collectAsState(emptyList())
     val disabledPackages by viewModel.disabledPluginPackages.collectAsState(emptyList())
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/plugins/PluginsSettingsScreenVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/plugins/PluginsSettingsScreenVM.kt
index c5cd4a25..8d9b9ba3 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/plugins/PluginsSettingsScreenVM.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/plugins/PluginsSettingsScreenVM.kt
@@ -1,12 +1,7 @@
 package de.mm20.launcher2.ui.settings.plugins
 
-import android.content.Context
-import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import de.mm20.launcher2.ktx.normalize
-import de.mm20.launcher2.permissions.PermissionGroup
-import de.mm20.launcher2.permissions.PermissionsManager
 import de.mm20.launcher2.plugin.PluginPackage
 import de.mm20.launcher2.plugins.PluginService
 import kotlinx.coroutines.flow.SharingStarted
diff --git a/services/plugins/src/main/java/de/mm20/launcher2/plugins/PluginScanner.kt b/services/plugins/src/main/java/de/mm20/launcher2/plugins/PluginScanner.kt
index ce61ffc2..be1f6ed6 100644
--- a/services/plugins/src/main/java/de/mm20/launcher2/plugins/PluginScanner.kt
+++ b/services/plugins/src/main/java/de/mm20/launcher2/plugins/PluginScanner.kt
@@ -50,6 +50,7 @@ class PluginScanner(
                     )
                 )
             } catch (e: SecurityException) {
+                CrashReporter.logException(e)
                 continue
             } catch (e: Exception) {
                 CrashReporter.logException(e)
diff --git a/services/plugins/src/main/java/de/mm20/launcher2/plugins/PluginService.kt b/services/plugins/src/main/java/de/mm20/launcher2/plugins/PluginService.kt
index 5115bbbc..43b210f4 100644
--- a/services/plugins/src/main/java/de/mm20/launcher2/plugins/PluginService.kt
+++ b/services/plugins/src/main/java/de/mm20/launcher2/plugins/PluginService.kt
@@ -109,6 +109,7 @@ internal class PluginServiceImpl(
                 }
                 repository.deleteMany().join()
                 repository.insertMany(plugins).join()
+                Log.d("PluginService", "${plugins.size} plugins found.")
             }
             Log.d("PluginService", "done.")
         }