Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,10 @@ dependencies {
// Ackpine
implementation(libs.ackpine.core)
implementation(libs.ackpine.ktx)

// Shizuku
implementation(libs.shizuku.api)
implementation(libs.shizuku.provider)
}

buildscript {
Expand Down
8 changes: 8 additions & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -84,5 +84,13 @@
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/file_provider_paths" />
</provider>

<provider
android:name="rikka.shizuku.ShizukuProvider"
android:authorities="${applicationId}.shizuku"
android:exported="true"
android:enabled="true"
android:multiprocess="false"
android:permission="android.permission.INTERACT_ACROSS_USERS_FULL" />
</application>
</manifest>
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ import app.revanced.manager.R

enum class InstallType(val stringResource: Int) {
DEFAULT(R.string.default_install),
MOUNT(R.string.mount_install)
MOUNT(R.string.mount_install),
SHIZUKU(R.string.shizuku_install),
ADB(R.string.adb_install)
}

@Entity(tableName = "installed_app")
Expand Down
52 changes: 52 additions & 0 deletions app/src/main/java/app/revanced/manager/di/RootModule.kt
Original file line number Diff line number Diff line change
@@ -1,9 +1,61 @@
package app.revanced.manager.di

import app.revanced.library.installation.installer.ShizukuAdbInstaller
import app.revanced.manager.R
import app.revanced.manager.domain.installer.RootInstaller
import app.revanced.manager.domain.installer.ShizukuInstaller
import app.revanced.shizukulibrary.adb.AdbConnectionManager
import org.koin.android.ext.koin.androidContext
import org.koin.core.module.dsl.singleOf
import org.koin.dsl.module

val rootModule = module {
singleOf(::RootInstaller)
singleOf(::ShizukuInstaller)
single { AdbConnectionManager.getInstance(androidContext()) }
single {
val app = androidContext()
ShizukuAdbInstaller(
context = app,
adbConnectionManager = get(),
mapErrorMessage = { output ->
when {
output.contains("INSTALL_FAILED_UPDATE_INCOMPATIBLE") ||
output.contains("INSTALL_PARSE_FAILED_INCONSISTENT_CERTIFICATES") ||
output.contains("INSTALL_FAILED_VERSION_DOWNGRADE") ->
app.getString(R.string.installation_conflict_description)

output.contains("INSTALL_FAILED_INSUFFICIENT_STORAGE") ->
app.getString(R.string.installation_storage_issue_description)

output.contains("INSTALL_FAILED_INVALID_APK") ||
output.contains("INSTALL_PARSE_FAILED_NOT_APK") ||
output.contains("INSTALL_FAILED_INVALID_URI") ->
app.getString(R.string.installation_invalid_description)

output.contains("INSTALL_FAILED_INCOMPATIBLE_ABI") ||
output.contains("INSTALL_FAILED_OLDER_SDK") ->
app.getString(R.string.installation_incompatible_description)

output.contains("INSTALL_FAILED_ABORTED") ->
app.getString(R.string.installation_aborted_description)

output.contains("INSTALL_FAILED_VERIFICATION_TIMEOUT") ->
app.getString(R.string.installation_timeout_description)

output.contains("INSTALL_FAILED_VERIFICATION_FAILURE") ||
output.contains("INSTALL_FAILED_REJECTED_BY_BUILDER") ->
app.getString(R.string.installation_blocked_description)

output.contains("INSTALL_FAILED_USER_RESTRICTED") ->
app.getString(R.string.installation_restricted_description)

else -> app.getString(R.string.installation_failed_description) + " ($output)"
}
},
mapUninstallErrorMessage = { output ->
app.getString(R.string.uninstall_app_fail, output)
}
)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,11 @@ class RootInstaller(
unmount(packageName)

stockAPK?.let { stockApp ->
// TODO: get user id programmatically
execute("pm uninstall -k --user 0 $packageName")
// removed the "--user 0" so it uninstalls the stock app globally on all users
execute("pm uninstall -k $packageName")

execute("pm install -r -d --user 0 \"${stockApp.absolutePath}\"")
// programmably gets the current user
execute("pm install -r -d --user ${android.os.Process.myUid() / 100000} \"${stockApp.absolutePath}\"")
.assertSuccess("Failed to install stock app")

stockApp.delete()
Expand Down
Loading
Loading