Improve uninstallers

app/src/main/java/com/aurora/store/data/installer/RootInstaller.kt

@@ -51,17 +51,40 @@ class RootInstaller(context: Context) : InstallerBase(context) {
                         xInstallLegacy(packageName, it)
                 }
             } else {
-                val event = InstallerEvent.Failed(
+                postError(
                     packageName,
                     context.getString(R.string.installer_status_failure),
                     context.getString(R.string.installer_root_unavailable)
                 )
-                EventBus.getDefault().post(event)
                 Log.e(" >>>>>>>>>>>>>>>>>>>>>>>>>> NO ROOT ACCESS <<<<<<<<<<<<<<<<<<<<<<<<<<<<<")
             }
         }
     }
 
+    override fun uninstall(packageName: String) {
+        if (Shell.getShell().isRoot) {
+            val result: Shell.Result =
+                Shell.su("pm uninstall --user 0 $packageName")
+                    .exec()
+            val response = result.out
+
+            if (response[0] != "Success") {
+                postError(
+                    packageName,
+                    context.getString(R.string.installer_status_failure),
+                    parseError(result)
+                )
+            }
+        } else {
+            postError(
+                packageName,
+                context.getString(R.string.installer_status_failure),
+                context.getString(R.string.installer_root_unavailable)
+            )
+            Log.e(" >>>>>>>>>>>>>>>>>>>>>>>>>> NO ROOT ACCESS <<<<<<<<<<<<<<<<<<<<<<<<<<<<<")
+        }
+    }
+
     private fun xInstall(packageName: String, files: List<File>) {
         var totalSize = 0
 
@@ -99,21 +122,19 @@ class RootInstaller(context: Context) : InstallerBase(context) {
                 }
             } else {
                 removeFromInstallQueue(packageName)
-                val event = InstallerEvent.Failed(
+                postError(
                     packageName,
                     context.getString(R.string.installer_status_failure),
                     context.getString(R.string.installer_root_unavailable)
                 )
-                EventBus.getDefault().post(event)
             }
         } else {
             removeFromInstallQueue(packageName)
-            val event = InstallerEvent.Failed(
+            postError(
                 packageName,
                 context.getString(R.string.installer_status_failure),
                 context.getString(R.string.installer_status_failure_session)
             )
-            EventBus.getDefault().post(event)
         }
     }
 

app/src/main/java/com/aurora/store/view/ui/details/AppDetailsActivity.kt

@@ -272,9 +272,11 @@ class AppDetailsActivity : BaseDetailsActivity() {
 
     @Synchronized
     private fun uninstallApp() {
-        AppInstaller(this)
+        task {
-            .getPreferredInstaller()
+            AppInstaller(this)
-            .uninstall(app.packageName)
+                .getPreferredInstaller()
+                .uninstall(app.packageName)
+        }
     }
 
     private fun attachWhiteListStatus() {

app/src/main/java/com/aurora/store/view/ui/sheets/AppMenuSheet.kt

@@ -107,8 +107,10 @@ class AppMenuSheet : BaseBottomSheet() {
                     }
 
                     R.id.action_uninstall -> {
-                        AppInstaller(requireContext())
+                        task {
-                            .getPreferredInstaller().uninstall(app.packageName)
+                            AppInstaller(requireContext())
+                                .getPreferredInstaller().uninstall(app.packageName)
+                        }
                     }
 
                     R.id.action_info -> {

app/src/main/res/xml/preferences_main.xml

@@ -46,7 +46,7 @@
         android:fragment="com.aurora.store.view.ui.preferences.DownloadPreference"
         app:icon="@drawable/ic_download_manager"
         app:iconSpaceReserved="false"
-        app:key="pref_ui"
+        app:key="pref_download"
         app:layout="@layout/item_preference"
         app:title="@string/pref_app_download" />
 </PreferenceScreen>