From 22eac0831d10671f6bc2ad914a93a0da5046c7df Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Thu, 22 Oct 2026 16:54:12 -0400 Subject: [PATCH] fix: keep the default launcher entry named MainActivity so RedMagic Game Space keeps DroidDeck (#1345) --- app/src/main/AndroidManifest.xml | 8 ++-- .../{MainActivity.kt => FrontEndActivity.kt} | 15 +++---- .../com/droiddeck/launcher/HomeActivity.kt | 2 +- .../com/droiddeck/launcher/LauncherIcon.kt | 8 +++- .../core/WirelessAdbPairingService.kt | 4 +- .../launcher/frontend/GameShortcuts.kt | 4 +- .../launcher/runtime/RuntimeInstallService.kt | 4 +- .../stores/download/StoreDownloadService.kt | 4 +- .../launcher/frontend/GameLaunchLinkTest.kt | 42 +++++++++++++++++-- 9 files changed, 66 insertions(+), 25 deletions(-) rename app/src/main/java/com/droiddeck/launcher/{MainActivity.kt => FrontEndActivity.kt} (99%) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5439940930..fcd9b2e11b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -61,7 +61,7 @@ @@ -84,8 +84,8 @@ @@ -97,7 +97,7 @@ diff --git a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt similarity index 99% rename from app/src/main/java/com/droiddeck/launcher/MainActivity.kt rename to app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 7d7dcf066f..1081cb8948 100644 --- a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -80,7 +80,7 @@ import com.droiddeck.launcher.session.GameStorage import com.droiddeck.launcher.input.SecondScreenDisplay import com.droiddeck.launcher.input.SecondScreenDisplays -class MainActivity : ComponentActivity() { +class FrontEndActivity : ComponentActivity() { override fun attachBaseContext(newBase: android.content.Context) { super.attachBaseContext(newBase) com.droiddeck.launcher.core.AppLanguage.applyTo(this, newBase) @@ -697,7 +697,7 @@ class MainActivity : ComponentActivity() { else { switchPoll = null switchingTo = null - android.widget.Toast.makeText(this@MainActivity, R.string.game_link_session_busy, android.widget.Toast.LENGTH_LONG).show() + android.widget.Toast.makeText(this@FrontEndActivity, R.string.game_link_session_busy, android.widget.Toast.LENGTH_LONG).show() } return } @@ -755,6 +755,7 @@ class MainActivity : ComponentActivity() { downloadPrefix = DownloadSource.custom(this) DownloadSource.probe() animationsEnabled = SessionPrefs.animationsEnabled(this) + LauncherIcon.repair(this, intent?.component) launcherIcon = LauncherIcon.current(this) gameStoresEnabled = SessionPrefs.gameStoresEnabled(this) gameStoresSpeedTier = SessionPrefs.gameStoresSpeedTier(this) @@ -1035,7 +1036,7 @@ class MainActivity : ComponentActivity() { onWirelessAdbPair = { host, port, code, complete -> Thread({ val result = runCatching { - kotlinx.coroutines.runBlocking { WirelessAdbFix.pair(this@MainActivity, host, port, code) } + kotlinx.coroutines.runBlocking { WirelessAdbFix.pair(this@FrontEndActivity, host, port, code) } } val error = result.exceptionOrNull()?.let { it.localizedMessage ?: getString(R.string.main_wadb_pair_failed) } ui.post { complete(error) } @@ -1043,13 +1044,13 @@ class MainActivity : ComponentActivity() { }, onFindWirelessAdbPort = { host, complete -> Thread({ - val port = WirelessAdbFix.findConnectPort(this@MainActivity, host) + val port = WirelessAdbFix.findConnectPort(this@FrontEndActivity, host) ui.post { complete(port) } }, "wireless-adb-discovery").start() }, onWirelessAdbApply = { host, port, enabled, complete -> Thread({ - val result = runCatching { WirelessAdbFix.setChildProcessLimit(this@MainActivity, host, port, enabled) } + val result = runCatching { WirelessAdbFix.setChildProcessLimit(this@FrontEndActivity, host, port, enabled) } val error = result.exceptionOrNull()?.let { it.localizedMessage ?: getString(R.string.main_wadb_command_failed) } ui.post { if (error == null) refreshPhantomStatus() @@ -1059,7 +1060,7 @@ class MainActivity : ComponentActivity() { }, onSetPhantomProcessLimit = { enabled, complete -> Thread({ - val result = runCatching { WirelessAdbFix.setUsingSavedPairing(this@MainActivity, enabled) } + val result = runCatching { WirelessAdbFix.setUsingSavedPairing(this@FrontEndActivity, enabled) } val error = result.exceptionOrNull()?.let { it.localizedMessage ?: getString(R.string.main_wadb_unavailable) } ui.post { if (error == null) refreshPhantomStatus() @@ -1115,7 +1116,7 @@ class MainActivity : ComponentActivity() { showNonAdreno?.let { release -> ConfirmDialog( title = androidx.compose.ui.res.stringResource(R.string.main_non_adreno_title), - text = androidx.compose.ui.res.stringResource(R.string.main_non_adreno_text, com.droiddeck.launcher.core.DeviceSupport.gpuName(this@MainActivity), release.size / 1e6), + text = androidx.compose.ui.res.stringResource(R.string.main_non_adreno_text, com.droiddeck.launcher.core.DeviceSupport.gpuName(this@FrontEndActivity), release.size / 1e6), confirm = androidx.compose.ui.res.stringResource(R.string.main_install_anyway), onConfirm = { showNonAdreno = null; install(release) }, onDismiss = { showNonAdreno = null }, diff --git a/app/src/main/java/com/droiddeck/launcher/HomeActivity.kt b/app/src/main/java/com/droiddeck/launcher/HomeActivity.kt index 54526834b5..71304e8837 100644 --- a/app/src/main/java/com/droiddeck/launcher/HomeActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/HomeActivity.kt @@ -23,7 +23,7 @@ class HomeActivity : Activity() { .setAction(SessionService.ACTION_HOME_GUIDE) .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP) } else { - Intent(this, MainActivity::class.java) + Intent(this, FrontEndActivity::class.java) .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP) } startActivity(destination) diff --git a/app/src/main/java/com/droiddeck/launcher/LauncherIcon.kt b/app/src/main/java/com/droiddeck/launcher/LauncherIcon.kt index 9183df76e8..89c33523ac 100644 --- a/app/src/main/java/com/droiddeck/launcher/LauncherIcon.kt +++ b/app/src/main/java/com/droiddeck/launcher/LauncherIcon.kt @@ -8,7 +8,7 @@ object LauncherIcon { const val DARK = "dark" const val LIGHT = "light" - private val aliases = linkedMapOf(DARK to "com.droiddeck.launcher.LauncherDark", LIGHT to "com.droiddeck.launcher.LauncherLight") + private val aliases = linkedMapOf(DARK to "com.droiddeck.launcher.MainActivity", LIGHT to "com.droiddeck.launcher.LauncherLight") val options: List> = listOf( DARK to R.string.setup_launcher_icon_dark, @@ -29,6 +29,12 @@ object LauncherIcon { fun activity(context: Context): ComponentName = component(context, current(context)) + fun repair(context: Context, launchedFrom: ComponentName?) { + if (!enabled(context, DARK) || !enabled(context, LIGHT) || launchedFrom == component(context, DARK)) return + context.packageManager.setComponentEnabledSetting(component(context, DARK), + PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP) + } + fun set(context: Context, style: String) { if (style !in aliases || style == current(context)) return val pm = context.packageManager diff --git a/app/src/main/java/com/droiddeck/launcher/core/WirelessAdbPairingService.kt b/app/src/main/java/com/droiddeck/launcher/core/WirelessAdbPairingService.kt index f8806c7c03..c924f85329 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/WirelessAdbPairingService.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/WirelessAdbPairingService.kt @@ -14,7 +14,7 @@ import android.os.Build import android.os.Handler import android.os.IBinder import android.os.Looper -import com.droiddeck.launcher.MainActivity +import com.droiddeck.launcher.FrontEndActivity import com.droiddeck.launcher.R import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow @@ -185,7 +185,7 @@ class WirelessAdbPairingService : Service() { enableVibration(false) }) val open = PendingIntent.getActivity(this, 0, - Intent(this, MainActivity::class.java).setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_REORDER_TO_FRONT), + Intent(this, FrontEndActivity::class.java).setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_REORDER_TO_FRONT), PendingIntent.FLAG_IMMUTABLE) val cancel = PendingIntent.getService(this, 1, Intent(this, WirelessAdbPairingService::class.java).setAction(ACTION_CANCEL), PendingIntent.FLAG_IMMUTABLE) diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/GameShortcuts.kt b/app/src/main/java/com/droiddeck/launcher/frontend/GameShortcuts.kt index 80cdd93c1b..45b2452694 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/GameShortcuts.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/GameShortcuts.kt @@ -11,13 +11,13 @@ import android.graphics.drawable.Icon import android.net.Uri import android.widget.Toast import com.droiddeck.launcher.LauncherIcon -import com.droiddeck.launcher.MainActivity +import com.droiddeck.launcher.FrontEndActivity import com.droiddeck.launcher.R import java.io.File object GameShortcuts { fun launchIntent(context: Context, gameId: String) = Intent(Intent.ACTION_VIEW, - Uri.parse(GameLaunchLink.uri(gameId)), context, MainActivity::class.java) + Uri.parse(GameLaunchLink.uri(gameId)), context, FrontEndActivity::class.java) .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP) private fun info(context: Context, game: Library.SteamGame): ShortcutInfo { diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeInstallService.kt b/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeInstallService.kt index d2cee04350..aa53092fe2 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeInstallService.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeInstallService.kt @@ -9,7 +9,7 @@ import android.content.Context import android.content.Intent import android.os.Build import android.os.IBinder -import com.droiddeck.launcher.MainActivity +import com.droiddeck.launcher.FrontEndActivity import com.droiddeck.launcher.R class RuntimeInstallService : Service() { @@ -75,7 +75,7 @@ class RuntimeInstallService : Service() { enableVibration(false) }) val open = PendingIntent.getActivity(this, 0, - Intent(this, MainActivity::class.java).setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_REORDER_TO_FRONT), + Intent(this, FrontEndActivity::class.java).setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_REORDER_TO_FRONT), PendingIntent.FLAG_IMMUTABLE) return Notification.Builder(this, CHANNEL_ID) .setSmallIcon(R.drawable.ic_stat_session) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/download/StoreDownloadService.kt b/app/src/main/java/com/droiddeck/launcher/stores/download/StoreDownloadService.kt index a32bceeb69..1f80eecf55 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/download/StoreDownloadService.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/download/StoreDownloadService.kt @@ -15,7 +15,7 @@ import android.os.IBinder import android.os.Looper import android.os.PowerManager import android.util.Log -import com.droiddeck.launcher.MainActivity +import com.droiddeck.launcher.FrontEndActivity import com.droiddeck.launcher.R import com.droiddeck.launcher.core.DeviceSupport import com.droiddeck.launcher.stores.StoresState @@ -189,7 +189,7 @@ class StoreDownloadService : Service() { } private fun openPage(context: Context, nav: String, code: Int): PendingIntent = - PendingIntent.getActivity(context, code, Intent(context, MainActivity::class.java).putExtra(EXTRA_NAV, nav) + PendingIntent.getActivity(context, code, Intent(context, FrontEndActivity::class.java).putExtra(EXTRA_NAV, nav) .addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_CLEAR_TOP), PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT) private fun openDownloads(context: Context, code: Int) = openPage(context, "stores:downloads", code) diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/GameLaunchLinkTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/GameLaunchLinkTest.kt index 9493a630b4..1fbd8c4914 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/GameLaunchLinkTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/GameLaunchLinkTest.kt @@ -4,7 +4,7 @@ import android.content.Intent import android.net.Uri import android.app.Activity import com.droiddeck.launcher.LauncherIcon -import com.droiddeck.launcher.MainActivity +import com.droiddeck.launcher.FrontEndActivity import com.droiddeck.launcher.frontend.Library import org.junit.Assert.assertEquals import org.junit.Assert.assertNotNull @@ -54,7 +54,7 @@ class GameShortcutIntentTest { assertEquals(Intent.ACTION_VIEW, intent.action) assertEquals(Uri.parse("droiddeck://game/$id"), intent.data) - assertEquals(MainActivity::class.java.name, intent.component?.className) + assertEquals(FrontEndActivity::class.java.name, intent.component?.className) assertEquals(android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP or android.content.Intent.FLAG_ACTIVITY_SINGLE_TOP, intent.flags) } @@ -69,8 +69,8 @@ class GameShortcutIntentTest { val launch = requireNotNull(shortcut.intent) assertEquals("game:8400", shortcut.id) assertEquals("Geometry Wars: Retro Evolved", shortcut.shortLabel.toString()) - assertEquals("com.droiddeck.launcher.LauncherDark", shortcut.activity?.className) - assertEquals(MainActivity::class.java.name, launch.component?.className) + assertEquals("com.droiddeck.launcher.MainActivity", shortcut.activity?.className) + assertEquals(FrontEndActivity::class.java.name, launch.component?.className) assertEquals(Intent.ACTION_VIEW, launch.action) assertEquals(Uri.parse("droiddeck://game/8400"), launch.data) assertEquals(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP, launch.flags) @@ -93,4 +93,38 @@ class GameShortcutIntentTest { assertNotNull(GameShortcuts.result(activity, game)) } + + @Test fun theDefaultLauncherEntryKeepsTheMainActivityName() { + val activity = Robolectric.buildActivity(Activity::class.java).setup().get() + val launchers = activity.packageManager.queryIntentActivities( + Intent(Intent.ACTION_MAIN).addCategory(Intent.CATEGORY_LAUNCHER).setPackage(activity.packageName), 0) + + assertEquals(listOf("com.droiddeck.launcher.MainActivity"), launchers.map { it.activityInfo.name }) + assertEquals(android.content.ComponentName(activity, "com.droiddeck.launcher.MainActivity"), LauncherIcon.activity(activity)) + } + + @Test fun repairDropsTheDefaultIconLeftBesideAChosenLightIcon() { + val activity = Robolectric.buildActivity(Activity::class.java).setup().get() + val pm = activity.packageManager + pm.setComponentEnabledSetting(android.content.ComponentName(activity, "com.droiddeck.launcher.LauncherLight"), + android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_ENABLED, android.content.pm.PackageManager.DONT_KILL_APP) + val dark = android.content.ComponentName(activity, "com.droiddeck.launcher.MainActivity") + + LauncherIcon.repair(activity, dark) + assertEquals(android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DEFAULT, pm.getComponentEnabledSetting(dark)) + + LauncherIcon.repair(activity, android.content.ComponentName(activity, "com.droiddeck.launcher.LauncherLight")) + assertEquals(android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DISABLED, pm.getComponentEnabledSetting(dark)) + assertEquals(LauncherIcon.LIGHT, LauncherIcon.current(activity)) + } + + @Test fun repairLeavesASingleIconAlone() { + val activity = Robolectric.buildActivity(Activity::class.java).setup().get() + val dark = android.content.ComponentName(activity, "com.droiddeck.launcher.MainActivity") + + LauncherIcon.repair(activity, null) + + assertEquals(android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DEFAULT, activity.packageManager.getComponentEnabledSetting(dark)) + assertEquals(LauncherIcon.DARK, LauncherIcon.current(activity)) + } }