Allow component classname obfuscation

app/src/main/java/a/e.java

@@ -2,6 +2,14 @@ package a;
 
 import com.topjohnwu.magisk.App;
 
+import java.util.Map;
+
 public class e extends App {
-    /* stub */
+    public e() {
+        super();
+    }
+
+    public e(Map<String, String> map) {
+        super(map);
+    }
 }

app/src/main/java/com/topjohnwu/magisk/App.kt

@@ -23,7 +23,12 @@ import org.koin.android.ext.koin.androidContext
 import org.koin.core.context.startKoin
 import timber.log.Timber
 
-open class App : Application() {
+open class App() : Application() {
+
+    constructor(map: Map<String, String>) : this() {
+        isRunningAsStub = true
+        ClassMap.componentMap = map
+    }
 
     init {
         AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)

app/src/main/java/com/topjohnwu/magisk/ClassMap.kt

@@ -1,5 +1,8 @@
 package com.topjohnwu.magisk
 
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
 import com.topjohnwu.magisk.model.download.DownloadService
 import com.topjohnwu.magisk.model.receiver.GeneralReceiver
 import com.topjohnwu.magisk.model.update.UpdateCheckService
@@ -9,7 +12,8 @@ import com.topjohnwu.magisk.ui.flash.FlashActivity
 import com.topjohnwu.magisk.ui.surequest.SuRequestActivity
 
 object ClassMap {
-    private val map = mapOf(
+
+    private val classMap = mapOf(
         App::class.java to a.e::class.java,
         MainActivity::class.java to a.b::class.java,
         SplashActivity::class.java to a.c::class.java,
@@ -20,7 +24,21 @@ object ClassMap {
         SuRequestActivity::class.java to a.m::class.java
     )
 
-    operator fun <T : Class<*>>get(c: Class<*>): T {
-        return map.getOrElse(c) { throw IllegalArgumentException() } as T
-    }
+    // This will be set if running as guest app
+    var componentMap: Map<String, String>? = null
+
+    operator fun get(c: Class<*>) = classMap.getOrElse(c) { throw IllegalArgumentException() }
+}
+
+fun Class<*>.cmp(pkg: String = BuildConfig.APPLICATION_ID): ComponentName {
+    val name = ClassMap[this].name
+    return ComponentName(pkg, ClassMap.componentMap?.get(name) ?: name)
+}
+
+fun Context.intent(c: Class<*>): Intent {
+    val cls = ClassMap[c]
+    return ClassMap.componentMap?.let {
+        val className = it.getOrElse(cls.name) { cls.name }
+        Intent().setComponent(ComponentName(this, className))
+    } ?: Intent(this, cls)
 }

app/src/main/java/com/topjohnwu/magisk/model/download/DownloadService.kt

@@ -7,11 +7,11 @@ import android.content.Intent
 import android.os.Build
 import android.webkit.MimeTypeMap
 import androidx.core.app.NotificationCompat
-import com.topjohnwu.magisk.ClassMap
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.extensions.chooser
 import com.topjohnwu.magisk.extensions.exists
 import com.topjohnwu.magisk.extensions.provide
+import com.topjohnwu.magisk.intent
 import com.topjohnwu.magisk.model.entity.internal.Configuration.*
 import com.topjohnwu.magisk.model.entity.internal.Configuration.Flash.Secondary
 import com.topjohnwu.magisk.model.entity.internal.DownloadSubject
@@ -140,8 +140,7 @@ open class DownloadService : RemoteFileService() {
         inline operator fun invoke(context: Context, argBuilder: Builder.() -> Unit) {
             val app = context.applicationContext
             val builder = Builder().apply(argBuilder)
-            val intent = Intent(app, ClassMap[DownloadService::class.java])
-                .putExtra(ARG_URL, builder.subject)
+            val intent = app.intent(DownloadService::class.java).putExtra(ARG_URL, builder.subject)
 
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 app.startForegroundService(intent)

app/src/main/java/com/topjohnwu/magisk/model/download/ManagerUpgrade.kt

@@ -1,10 +1,9 @@
 package com.topjohnwu.magisk.model.download
 
-import android.content.ComponentName
 import com.topjohnwu.magisk.BuildConfig
-import com.topjohnwu.magisk.ClassMap
 import com.topjohnwu.magisk.Config
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.cmp
 import com.topjohnwu.magisk.extensions.DynamicClassLoader
 import com.topjohnwu.magisk.model.entity.internal.Configuration.APK.Restore
 import com.topjohnwu.magisk.model.entity.internal.Configuration.APK.Upgrade
@@ -52,9 +51,7 @@ private fun RemoteFileService.restore(apk: File, id: Int) {
     // Make it world readable
     apk.setReadable(true, false)
     if (Shell.su("pm install $apk").exec().isSuccess) {
-        val component = ComponentName(BuildConfig.APPLICATION_ID,
-                ClassMap.get<Class<*>>(SplashActivity::class.java).name)
-        Utils.rmAndLaunch(packageName, component)
+        Utils.rmAndLaunch(packageName, SplashActivity::class.java.cmp())
     }
 }
 

app/src/main/java/com/topjohnwu/magisk/model/receiver/GeneralReceiver.kt

@@ -2,7 +2,6 @@ package com.topjohnwu.magisk.model.receiver
 
 import android.content.ContextWrapper
 import android.content.Intent
-import com.topjohnwu.magisk.ClassMap
 import com.topjohnwu.magisk.Config
 import com.topjohnwu.magisk.Const
 import com.topjohnwu.magisk.Info
@@ -10,6 +9,7 @@ import com.topjohnwu.magisk.base.BaseReceiver
 import com.topjohnwu.magisk.data.database.PolicyDao
 import com.topjohnwu.magisk.data.database.base.su
 import com.topjohnwu.magisk.extensions.reboot
+import com.topjohnwu.magisk.intent
 import com.topjohnwu.magisk.model.download.DownloadService
 import com.topjohnwu.magisk.model.entity.ManagerJson
 import com.topjohnwu.magisk.model.entity.internal.Configuration
@@ -51,7 +51,7 @@ open class GeneralReceiver : BaseReceiver() {
                 }
                 when (action) {
                     REQUEST -> {
-                        val i = Intent(context, ClassMap[SuRequestActivity::class.java])
+                        val i = context.intent(SuRequestActivity::class.java)
                                 .setAction(action)
                                 .putExtra("socket", intent.getStringExtra("socket"))
                                 .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)

app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt

@@ -7,11 +7,8 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentTransaction
 import com.ncapdevi.fragnav.FragNavController
 import com.ncapdevi.fragnav.FragNavTransactionOptions
-import com.topjohnwu.magisk.ClassMap
-import com.topjohnwu.magisk.Config
+import com.topjohnwu.magisk.*
 import com.topjohnwu.magisk.Const.Key.OPEN_SECTION
-import com.topjohnwu.magisk.Info
-import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.base.BaseActivity
 import com.topjohnwu.magisk.base.BaseFragment
 import com.topjohnwu.magisk.databinding.ActivityMainBinding
@@ -61,7 +58,7 @@ open class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Na
 
     override fun onCreate(savedInstanceState: Bundle?) {
         if (!SplashActivity.DONE) {
-            startActivity(Intent(this, ClassMap[SplashActivity::class.java]))
+            startActivity(intent(SplashActivity::class.java))
             finish()
         }
 

app/src/main/java/com/topjohnwu/magisk/ui/SplashActivity.kt

@@ -2,7 +2,6 @@ package com.topjohnwu.magisk.ui
 
 import android.app.Activity
 import android.content.Context
-import android.content.Intent
 import android.os.Bundle
 import android.text.TextUtils
 import androidx.appcompat.app.AlertDialog
@@ -62,7 +61,7 @@ open class SplashActivity : Activity() {
         // Setup shortcuts
         Shortcuts.setup(this)
 
-        val intent = Intent(this, ClassMap[MainActivity::class.java])
+        val intent = intent(MainActivity::class.java)
         intent.putExtra(Const.Key.OPEN_SECTION, getIntent().getStringExtra(Const.Key.OPEN_SECTION))
         DONE = true
         startActivity(intent)

app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashActivity.kt

@@ -6,12 +6,12 @@ import android.net.Uri
 import android.os.Bundle
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.net.toUri
-import com.topjohnwu.magisk.ClassMap
 import com.topjohnwu.magisk.Const
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.base.BaseActivity
 import com.topjohnwu.magisk.databinding.ActivityFlashBinding
 import com.topjohnwu.magisk.extensions.snackbar
+import com.topjohnwu.magisk.intent
 import com.topjohnwu.magisk.model.events.BackPressEvent
 import com.topjohnwu.magisk.model.events.PermissionEvent
 import com.topjohnwu.magisk.model.events.SnackbarEvent
@@ -60,7 +60,7 @@ open class FlashActivity : BaseActivity<FlashViewModel, ActivityFlashBinding>()
 
     companion object {
 
-        private fun intent(context: Context) = Intent(context, ClassMap[FlashActivity::class.java])
+        private fun intent(context: Context) = context.intent(FlashActivity::class.java)
             .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
         private fun intent(context: Context, file: File) = intent(context).setData(file.toUri())
 

app/src/main/java/com/topjohnwu/magisk/ui/module/ModulesFragment.kt

@@ -14,6 +14,7 @@ import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.base.BaseFragment
 import com.topjohnwu.magisk.databinding.FragmentModulesBinding
 import com.topjohnwu.magisk.extensions.reboot
+import com.topjohnwu.magisk.intent
 import com.topjohnwu.magisk.model.events.OpenFilePickerEvent
 import com.topjohnwu.magisk.model.events.ViewEvent
 import com.topjohnwu.magisk.ui.flash.FlashActivity
@@ -28,7 +29,7 @@ class ModulesFragment : BaseFragment<ModuleViewModel, FragmentModulesBinding>()
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         if (requestCode == Const.ID.FETCH_ZIP && resultCode == Activity.RESULT_OK && data != null) {
             // Get the URI of the selected file
-            val intent = Intent(activity, ClassMap[FlashActivity::class.java])
+            val intent = activity.intent(FlashActivity::class.java)
             intent.setData(data.data).putExtra(Const.Key.FLASH_ACTION, Const.Value.FLASH_ZIP)
             startActivity(intent)
         }

app/src/main/java/com/topjohnwu/magisk/utils/PatchAPK.kt

@@ -1,6 +1,5 @@
 package com.topjohnwu.magisk.utils
 
-import android.content.ComponentName
 import android.content.Context
 import android.widget.Toast
 import com.topjohnwu.magisk.*
@@ -102,8 +101,7 @@ object PatchAPK {
 
         Config.suManager = pkg
         Config.export()
-        Utils.rmAndLaunch(BuildConfig.APPLICATION_ID,
-                ComponentName(pkg, ClassMap.get<Class<*>>(SplashActivity::class.java).name))
+        Utils.rmAndLaunch(BuildConfig.APPLICATION_ID, SplashActivity::class.java.cmp(pkg))
 
         return true
     }

app/src/main/java/com/topjohnwu/magisk/utils/Utils.kt

@@ -46,7 +46,7 @@ object Utils {
                     .setRequiresDeviceIdle(true)
                     .build()
             val request = PeriodicWorkRequest
-                    .Builder(ClassMap[UpdateCheckService::class.java], 12, TimeUnit.HOURS)
+                    .Builder(ClassMap[UpdateCheckService::class.java] as Class<Worker>, 12, TimeUnit.HOURS)
                     .setConstraints(constraints)
                     .build()
             WorkManager.getInstance(context).enqueueUniquePeriodicWork(

app/src/main/java/com/topjohnwu/magisk/view/Notifications.kt

@@ -4,15 +4,11 @@ import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.app.PendingIntent
 import android.content.Context
-import android.content.Intent
 import android.os.Build
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.app.TaskStackBuilder
-import com.topjohnwu.magisk.ClassMap
-import com.topjohnwu.magisk.Const
-import com.topjohnwu.magisk.Info
-import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.*
 import com.topjohnwu.magisk.extensions.get
 import com.topjohnwu.magisk.model.receiver.GeneralReceiver
 import com.topjohnwu.magisk.ui.SplashActivity
@@ -34,10 +30,10 @@ object Notifications {
     }
 
     fun magiskUpdate(context: Context) {
-        val intent = Intent(context, ClassMap[SplashActivity::class.java])
-        intent.putExtra(Const.Key.OPEN_SECTION, "magisk")
+        val intent = context.intent(SplashActivity::class.java)
+                .putExtra(Const.Key.OPEN_SECTION, "magisk")
         val stackBuilder = TaskStackBuilder.create(context)
-        stackBuilder.addParentStack(ClassMap.get<Class<*>>(SplashActivity::class.java))
+        stackBuilder.addParentStack(SplashActivity::class.java.cmp(context.packageName))
         stackBuilder.addNextIntent(intent)
         val pendingIntent = stackBuilder.getPendingIntent(Const.ID.MAGISK_UPDATE_NOTIFICATION_ID,
                 PendingIntent.FLAG_UPDATE_CURRENT)
@@ -54,9 +50,9 @@ object Notifications {
     }
 
     fun managerUpdate(context: Context) {
-        val intent = Intent(context, ClassMap[GeneralReceiver::class.java])
-        intent.action = Const.Key.BROADCAST_MANAGER_UPDATE
-        intent.putExtra(Const.Key.INTENT_SET_APP, Info.remote.app)
+        val intent = context.intent(GeneralReceiver::class.java)
+                .setAction(Const.Key.BROADCAST_MANAGER_UPDATE)
+                .putExtra(Const.Key.INTENT_SET_APP, Info.remote.app)
 
         val pendingIntent = PendingIntent.getBroadcast(context,
                 Const.ID.APK_UPDATE_NOTIFICATION_ID, intent, PendingIntent.FLAG_UPDATE_CURRENT)
@@ -73,7 +69,7 @@ object Notifications {
     }
 
     fun dtboPatched(context: Context) {
-        val intent = Intent(context, ClassMap[GeneralReceiver::class.java])
+        val intent = context.intent(GeneralReceiver::class.java)
                 .setAction(Const.Key.BROADCAST_REBOOT)
         val pendingIntent = PendingIntent.getBroadcast(context,
                 Const.ID.DTBO_NOTIFICATION_ID, intent, PendingIntent.FLAG_UPDATE_CURRENT)

app/src/main/java/com/topjohnwu/magisk/view/Shortcuts.kt

@@ -25,10 +25,11 @@ object Shortcuts {
     private fun getShortCuts(context: Context): List<ShortcutInfo> {
         val shortCuts = mutableListOf<ShortcutInfo>()
         val root = Shell.rootAccess()
+        val intent = context.intent(SplashActivity::class.java)
         if (Utils.showSuperUser()) {
             shortCuts.add(ShortcutInfo.Builder(context, "superuser")
                     .setShortLabel(context.getString(R.string.superuser))
-                    .setIntent(Intent(context, ClassMap[SplashActivity::class.java])
+                    .setIntent(Intent(intent)
                             .putExtra(Const.Key.OPEN_SECTION, "superuser")
                             .setAction(Intent.ACTION_VIEW)
                             .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK))
@@ -39,7 +40,7 @@ object Shortcuts {
         if (root && Config.magiskHide) {
             shortCuts.add(ShortcutInfo.Builder(context, "magiskhide")
                     .setShortLabel(context.getString(R.string.magiskhide))
-                    .setIntent(Intent(context, ClassMap[SplashActivity::class.java])
+                    .setIntent(Intent(intent)
                             .putExtra(Const.Key.OPEN_SECTION, "magiskhide")
                             .setAction(Intent.ACTION_VIEW)
                             .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK))
@@ -50,7 +51,7 @@ object Shortcuts {
         if (!Config.coreOnly && root && Info.magiskVersionCode >= 0) {
             shortCuts.add(ShortcutInfo.Builder(context, "modules")
                     .setShortLabel(context.getString(R.string.modules))
-                    .setIntent(Intent(context, ClassMap[SplashActivity::class.java])
+                    .setIntent(Intent(intent)
                             .putExtra(Const.Key.OPEN_SECTION, "modules")
                             .setAction(Intent.ACTION_VIEW)
                             .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK))
@@ -59,7 +60,7 @@ object Shortcuts {
                     .build())
             shortCuts.add(ShortcutInfo.Builder(context, "downloads")
                     .setShortLabel(context.getString(R.string.downloads))
-                    .setIntent(Intent(context, ClassMap[SplashActivity::class.java])
+                    .setIntent(Intent(intent)
                             .putExtra(Const.Key.OPEN_SECTION, "downloads")
                             .setAction(Intent.ACTION_VIEW)
                             .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK))