Skip to content

refactor: improve Intent redirection logic and constant management #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Chimioo merged 1 commit into from
Mar 22, 2026
Merged

refactor: improve Intent redirection logic and constant management #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 12 additions & 7 deletions app/src/main/java/io/github/chimio/inxlocker/util/IntentAnalyzer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,16 @@ import android.content.Intent
import com.highcapable.yukihookapi.hook.log.YLog

object IntentAnalyzer {
private const val TAG = "IntentAnalyzer"
private const val INTENT_ACTION_CONFIRM_INSTALL = "android.content.pm.action.CONFIRM_INSTALL"
private const val INTENT_ACTION_CONFIRM_PERMISSIONS = "android.content.pm.action.CONFIRM_PERMISSIONS"

sealed class Result {
object ShouldRedirect : Result()
object ShouldNotRedirect : Result()
}

fun analyze(intent: Intent): Result = runCatching {
val TAG = "IntentAnalyzer"
val original = IntentSnapshot.capture(intent)

YLog.d(TAG, "Intent action: ${original.action}")
Expand Down Expand Up @@ -42,14 +45,16 @@ object IntentAnalyzer {
Result.ShouldNotRedirect
}
}
"android.content.pm.action.CONFIRM_INSTALL",
"android.content.pm.action.CONFIRM_PERMISSIONS" -> {

INTENT_ACTION_CONFIRM_INSTALL,
INTENT_ACTION_CONFIRM_PERMISSIONS -> {
if (PrefsProvider.getBoolean("intercept_session_install", false)) {
Result.ShouldRedirect
} else {
Result.ShouldNotRedirect
}
}

else -> Result.ShouldRedirect
}
} ?: Result.ShouldNotRedirect
Expand All @@ -69,8 +74,8 @@ object IntentAnalyzer {
private fun hasValidAction(intent: Intent): Boolean {
return intent.action in listOf(
Intent.ACTION_INSTALL_PACKAGE,
"android.content.pm.action.CONFIRM_INSTALL",
"android.content.pm.action.CONFIRM_PERMISSIONS",
INTENT_ACTION_CONFIRM_INSTALL,
INTENT_ACTION_CONFIRM_PERMISSIONS,
Intent.ACTION_UNINSTALL_PACKAGE,
Intent.ACTION_DELETE
)
Expand Down Expand Up @@ -100,8 +105,8 @@ object IntentAnalyzer {
private val allowedActions = listOf(
Intent.ACTION_VIEW,
Intent.ACTION_INSTALL_PACKAGE,
"android.content.pm.action.CONFIRM_INSTALL",
"android.content.pm.action.CONFIRM_PERMISSIONS",
INTENT_ACTION_CONFIRM_INSTALL,
INTENT_ACTION_CONFIRM_PERMISSIONS,
Intent.ACTION_UNINSTALL_PACKAGE,
Intent.ACTION_DELETE
)
Expand Down
24 changes: 18 additions & 6 deletions app/src/main/java/io/github/chimio/inxlocker/util/IntentRedirector.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,19 +59,31 @@ object IntentRedirector {
}

private fun applyRedirection(intent: Intent) {
val isUninstall = intent.action == ACTION_DELETE || intent.action == ACTION_UNINSTALL_PACKAGE
val targetPackage = getTargetPackageForIntent(intent)

if (!targetPackage.isNullOrBlank()) {
val forcedComponent = getForcedComponentForPackage(targetPackage)
if (forcedComponent != null) {
intent.component = forcedComponent
intent.`package` = null
} else {
if (isUninstall) {
// Clear component and only set the target package for uninstall scenarios
// The target app will handle the ACTION_DELETE routing automatically
intent.component = null
intent.setPackage(targetPackage)
} else {
// For installation, check if a specific component is forced by the user
val forcedComponent = getForcedComponentForPackage(targetPackage)
if (forcedComponent != null) {
intent.component = forcedComponent
intent.`package` = null
} else {
intent.component = null
intent.setPackage(targetPackage)
}
}
// Add necessary flags for redirection
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_GRANT_READ_URI_PERMISSION)
} else {
if (intent.action == ACTION_DELETE || intent.action == ACTION_UNINSTALL_PACKAGE) {
// If no specific target package is set, ensure system default handles it cleanly
if (isUninstall) {
intent.component = null
intent.`package` = null
}
Expand Down
Loading