Don't pass libsu and shizuku to :app

Droid-ify · Sep 20, 2023 · 859270f · 859270f
1 parent 933aeda
commit 859270f
Show file tree

Hide file tree

Showing 19 changed files with 57 additions and 25 deletions.
diff --git a/app/src/main/kotlin/com/looker/droidify/MainApplication.kt b/app/src/main/kotlin/com/looker/droidify/MainApplication.kt
@@ -32,9 +32,9 @@ import com.looker.droidify.sync.toJobNetworkType
 import com.looker.droidify.utility.extension.toInstalledItem
 import com.looker.droidify.work.CleanUpWorker
 import com.looker.installer.InstallManager
+import com.looker.installer.installers.root.RootPermissionHandler
 import com.looker.installer.installers.shizuku.ShizukuPermissionHandler
 import com.looker.network.Downloader
-import com.topjohnwu.superuser.Shell
 import dagger.hilt.android.HiltAndroidApp
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.*
@@ -63,6 +63,9 @@ class MainApplication : Application(), ImageLoaderFactory, Configuration.Provide
 	@Inject
 	lateinit var shizukuPermissionHandler: ShizukuPermissionHandler
 
+	@Inject
+	lateinit var rootPermissionHandler: RootPermissionHandler
+
 	@Inject
 	lateinit var workerFactory: HiltWorkerFactory
 
@@ -92,9 +95,7 @@ class MainApplication : Application(), ImageLoaderFactory, Configuration.Provide
 				settingsRepository.get { installerType }.collect {
 					if (it == InstallerType.SHIZUKU) handleShizukuInstaller()
 					if (it == InstallerType.ROOT) {
-						Shell.getCachedShell() ?: Shell.getShell()
-						val isRooted = Shell.isAppGrantedRoot() ?: false
-						if (!isRooted) {
+						if (!rootPermissionHandler.isGranted) {
 							settingsRepository.setInstallerType(InstallerType.Default)
 						}
 					}

diff --git a/app/src/main/kotlin/com/looker/droidify/ui/app_detail/AppDetailViewModel.kt b/app/src/main/kotlin/com/looker/droidify/ui/app_detail/AppDetailViewModel.kt
@@ -7,17 +7,15 @@ import com.looker.core.datastore.SettingsRepository
 import com.looker.core.model.InstalledItem
 import com.looker.core.model.Product
 import com.looker.core.model.Repository
-import com.looker.core.model.newer.toPackageName
+import com.looker.core.common.toPackageName
 import com.looker.droidify.BuildConfig
 import com.looker.droidify.database.Database
 import com.looker.installer.InstallManager
 import com.looker.installer.model.InstallerQueueState
 import com.looker.installer.model.installFrom
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 

diff --git a/build-logic/structure/src/main/kotlin/Libs.kt b/build-logic/structure/src/main/kotlin/Libs.kt
@@ -98,9 +98,6 @@ private object Lifecycle {
 object Others {
 	const val libsu = "com.github.topjohnwu.libsu:core:5.2.1"
 	const val zoomage = "com.jsibbold:zoomage:1.3.1"
-	private const val shizukuVersion = "13.0.0"
-	const val shizukuApi = "dev.rikka.shizuku:api:$shizukuVersion"
-	const val shizukuProvider = "dev.rikka.shizuku:provider:$shizukuVersion"
 }
 
 private object Room {
@@ -110,6 +107,12 @@ private object Room {
 	const val ktx = "androidx.room:room-ktx:$roomVersion"
 }
 
+object Shizuku {
+	private const val version = "13.0.0"
+	const val api = "dev.rikka.shizuku:api:$version"
+	const val provider = "dev.rikka.shizuku:provider:$version"
+}
+
 object SQLite {
 	private const val version = "2.3.1"
 	const val ktx = "androidx.sqlite:sqlite-ktx:$version"

diff --git a/...om/looker/core/model/newer/PackageName.kt → ...ava/com/looker/core/common/PackageName.kt b/...om/looker/core/model/newer/PackageName.kt → ...ava/com/looker/core/common/PackageName.kt
@@ -1,4 +1,4 @@
-package com.looker.core.model.newer
+package com.looker.core.common
 
 @JvmInline
 value class PackageName(val name: String)

diff --git a/core/data/src/main/java/com/looker/core/data/fdroid/repository/AppRepository.kt b/core/data/src/main/java/com/looker/core/data/fdroid/repository/AppRepository.kt
@@ -3,7 +3,7 @@ package com.looker.core.data.fdroid.repository
 import com.looker.core.model.newer.App
 import com.looker.core.model.newer.Author
 import com.looker.core.model.newer.Package
-import com.looker.core.model.newer.PackageName
+import com.looker.core.common.PackageName
 import kotlinx.coroutines.flow.Flow
 
 interface AppRepository {

diff --git a/...src/main/java/com/looker/core/data/fdroid/repository/offline/OfflineFirstAppRepository.kt b/...src/main/java/com/looker/core/data/fdroid/repository/offline/OfflineFirstAppRepository.kt
@@ -1,5 +1,6 @@
 package com.looker.core.data.fdroid.repository.offline
 
+import com.looker.core.common.PackageName
 import com.looker.core.data.fdroid.repository.AppRepository
 import com.looker.core.database.dao.AppDao
 import com.looker.core.database.dao.InstalledDao

diff --git a/core/database/src/main/java/com/looker/core/database/model/AppEntity.kt b/core/database/src/main/java/com/looker/core/database/model/AppEntity.kt
@@ -3,6 +3,7 @@ package com.looker.core.database.model
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import com.looker.core.common.nullIfEmpty
+import com.looker.core.common.toPackageName
 import com.looker.core.database.utils.localizedValue
 import com.looker.core.model.newer.*
 

diff --git a/core/model/build.gradle.kts b/core/model/build.gradle.kts
@@ -15,4 +15,8 @@ android {
 			isMinifyEnabled = true
 		}
 	}
+}
+
+dependencies {
+	modules(Modules.coreCommon)
 }
diff --git a/core/model/src/main/java/com/looker/core/model/newer/App.kt b/core/model/src/main/java/com/looker/core/model/newer/App.kt
@@ -1,5 +1,7 @@
 package com.looker.core.model.newer
 
+import com.looker.core.common.PackageName
+
 data class App(
 	val repoId: Long,
 	val categories: List<String>,

diff --git a/installer/build.gradle.kts b/installer/build.gradle.kts
@@ -19,12 +19,13 @@ android {
 }
 
 dependencies {
-	modules(Modules.coreCommon, Modules.coreDatastore, Modules.coreModel)
+	modules(Modules.coreCommon, Modules.coreDatastore)
 
+	implementation(AndroidX.appCompat)
 	coroutines()
 
-	api(Others.libsu)
+	implementation(Others.libsu)
 
-	api(Others.shizukuApi)
-	api(Others.shizukuProvider)
+	implementation(Shizuku.api)
+	api(Shizuku.provider)
 }
diff --git a/installer/src/main/java/com/looker/installer/InstallManager.kt b/installer/src/main/java/com/looker/installer/InstallManager.kt
@@ -7,8 +7,9 @@ import com.looker.core.common.extension.notificationManager
 import com.looker.core.common.extension.updateAsMutable
 import com.looker.core.datastore.SettingsRepository
 import com.looker.core.datastore.model.InstallerType
-import com.looker.core.model.newer.PackageName
+import com.looker.core.common.PackageName
 import com.looker.installer.installers.*
+import com.looker.installer.installers.root.RootInstaller
 import com.looker.installer.installers.shizuku.ShizukuInstaller
 import com.looker.installer.model.*
 import kotlinx.coroutines.CoroutineScope

diff --git a/installer/src/main/java/com/looker/installer/InstallModule.kt b/installer/src/main/java/com/looker/installer/InstallModule.kt
@@ -2,6 +2,7 @@ package com.looker.installer
 
 import android.content.Context
 import com.looker.core.datastore.SettingsRepository
+import com.looker.installer.installers.root.RootPermissionHandler
 import com.looker.installer.installers.shizuku.ShizukuPermissionHandler
 import dagger.Module
 import dagger.Provides
@@ -26,4 +27,8 @@ object InstallModule {
 	fun provideShizukuPermissionHandler(
 		@ApplicationContext context: Context
 	): ShizukuPermissionHandler = ShizukuPermissionHandler(context)
+
+	@Singleton
+	@Provides
+	fun provideRootPermissionHandler(): RootPermissionHandler = RootPermissionHandler()
 }
diff --git a/installer/src/main/java/com/looker/installer/installers/Installer.kt b/installer/src/main/java/com/looker/installer/installers/Installer.kt
@@ -1,6 +1,6 @@
 package com.looker.installer.installers
 
-import com.looker.core.model.newer.PackageName
+import com.looker.core.common.PackageName
 import com.looker.installer.model.InstallItem
 import com.looker.installer.model.InstallState
 

diff --git a/installer/src/main/java/com/looker/installer/installers/LegacyInstaller.kt b/installer/src/main/java/com/looker/installer/installers/LegacyInstaller.kt
@@ -6,7 +6,7 @@ import android.util.AndroidRuntimeException
 import androidx.core.net.toUri
 import com.looker.core.common.SdkCheck
 import com.looker.core.common.cache.Cache
-import com.looker.core.model.newer.PackageName
+import com.looker.core.common.PackageName
 import com.looker.installer.model.InstallItem
 import com.looker.installer.model.InstallState
 import kotlinx.coroutines.suspendCancellableCoroutine

diff --git a/installer/src/main/java/com/looker/installer/installers/SessionInstaller.kt b/installer/src/main/java/com/looker/installer/installers/SessionInstaller.kt
@@ -11,7 +11,7 @@ import android.os.Looper
 import com.looker.core.common.SdkCheck
 import com.looker.core.common.cache.Cache
 import com.looker.core.common.sdkAbove
-import com.looker.core.model.newer.PackageName
+import com.looker.core.common.PackageName
 import com.looker.installer.model.InstallItem
 import com.looker.installer.model.InstallState
 import kotlinx.coroutines.suspendCancellableCoroutine

diff --git a/...ker/installer/installers/RootInstaller.kt → ...nstaller/installers/root/RootInstaller.kt b/...ker/installer/installers/RootInstaller.kt → ...nstaller/installers/root/RootInstaller.kt
@@ -1,9 +1,11 @@
-package com.looker.installer.installers
+package com.looker.installer.installers.root
 
 import android.content.Context
 import com.looker.core.common.SdkCheck
 import com.looker.core.common.cache.Cache
-import com.looker.core.model.newer.PackageName
+import com.looker.core.common.PackageName
+import com.looker.installer.installers.Installer
+import com.looker.installer.installers.uninstallPackage
 import com.looker.installer.model.InstallItem
 import com.looker.installer.model.InstallState
 import com.topjohnwu.superuser.Shell

diff --git a/installer/src/main/java/com/looker/installer/installers/root/RootPermissionHandler.kt b/installer/src/main/java/com/looker/installer/installers/root/RootPermissionHandler.kt
@@ -0,0 +1,13 @@
+package com.looker.installer.installers.root
+
+import com.topjohnwu.superuser.Shell
+
+class RootPermissionHandler {
+
+	val isGranted: Boolean
+		get() {
+			Shell.getCachedShell() ?: Shell.getShell()
+			return Shell.isAppGrantedRoot() ?: false
+		}
+
+}
diff --git a/installer/src/main/java/com/looker/installer/installers/shizuku/ShizukuInstaller.kt b/installer/src/main/java/com/looker/installer/installers/shizuku/ShizukuInstaller.kt
@@ -3,7 +3,7 @@ package com.looker.installer.installers.shizuku
 import android.content.Context
 import com.looker.core.common.SdkCheck
 import com.looker.core.common.cache.Cache
-import com.looker.core.model.newer.PackageName
+import com.looker.core.common.PackageName
 import com.looker.installer.installers.Installer
 import com.looker.installer.installers.uninstallPackage
 import com.looker.installer.model.InstallItem

diff --git a/installer/src/main/java/com/looker/installer/model/InstallItem.kt b/installer/src/main/java/com/looker/installer/model/InstallItem.kt
@@ -1,7 +1,7 @@
 package com.looker.installer.model
 
-import com.looker.core.model.newer.PackageName
-import com.looker.core.model.newer.toPackageName
+import com.looker.core.common.PackageName
+import com.looker.core.common.toPackageName
 
 data class InstallItem(
 	val packageName: PackageName,