Skip to content
Merged
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
1 change: 0 additions & 1 deletion app/src/main/kotlin/com/github/kr328/clash/AppModule.kt
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@ val appModule = module { single<AppInfoProvider> { AppInfoProviderImpl } }

private object AppInfoProviderImpl : AppInfoProvider {
override val mainActivityClass: Class<out Activity> = MainActivity::class.java
override val mainActivityAlias: String = "${MainActivity::class.qualifiedName}Alias"
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import org.koin.core.component.inject

interface AppInfoProvider {
val mainActivityClass: Class<out Activity>
val mainActivityAlias: String

companion object : KoinComponent {
val instance: AppInfoProvider by inject()
Expand Down
19 changes: 18 additions & 1 deletion glue/src/main/kotlin/com/github/kr328/clash/util/Intent.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package com.github.kr328.clash.util
import android.content.ComponentName
import android.content.Context
import android.content.Intent
import android.content.pm.PackageManager
import com.github.kr328.clash.di.AppInfoProvider.Companion.instance as appInfoProvider

fun mainIntent(context: Context, action: String? = null): Intent {
Expand All @@ -11,4 +12,20 @@ fun mainIntent(context: Context, action: String? = null): Intent {
}

val Context.mainActivityAlias: ComponentName
get() = ComponentName(this, appInfoProvider.mainActivityAlias)
get() {
val mainActivityName = appInfoProvider.mainActivityClass.name
val launcherIntent = Intent(Intent.ACTION_MAIN).addCategory(Intent.CATEGORY_LAUNCHER)
val resolveFlags = PackageManager.MATCH_DISABLED_COMPONENTS

return packageManager
.queryIntentActivities(launcherIntent, resolveFlags)
.firstNotNullOfOrNull { resolveInfo ->
val activityInfo = resolveInfo.activityInfo
if (activityInfo.targetActivity == mainActivityName) {
ComponentName(activityInfo.packageName, activityInfo.name)
} else {
null
}
}
?: error("Launcher alias targeting $mainActivityName is not declared in AndroidManifest.xml")
}