Port module shortcuts to IcePatch

Author: Anatdx

apd/src/module.cpp

@@ -61,6 +61,27 @@ bool ValidateModuleId(const std::string& id) {
   return true;
 }
 
+std::string ResolveModuleIconPath(const std::string& icon_value, const std::string& module_id,
+                                  const std::string& module_path, const char* key_name) {
+  if (icon_value.empty()) {
+    return "";
+  }
+  if (icon_value[0] == '/') {
+    LOGW("module %s: %s has absolute path, rejected", module_id.c_str(), key_name);
+    return "";
+  }
+  if (icon_value.find("..") != std::string::npos) {
+    LOGW("module %s: %s has parent traversal, rejected", module_id.c_str(), key_name);
+    return "";
+  }
+  std::string full_path = module_path + "/" + icon_value;
+  if (!FileExists(full_path)) {
+    LOGW("module %s: %s not found: %s", module_id.c_str(), key_name, full_path.c_str());
+    return "";
+  }
+  return icon_value;
+}
+
 std::map<std::string, std::string> ParseProps(const std::string& content) {
   std::map<std::string, std::string> props;
   std::stringstream ss(content);
@@ -463,12 +484,32 @@ bool ListModules() {
     bool web = DirExists(module_path + "/" + kModuleWebDir);
     bool action = FileExists(module_path + "/" + kModuleActionScript) ||
                   FileExists(module_path + "/" + id + ".lua");
+    std::string action_icon;
+    std::string webui_icon;
+    auto action_icon_it = props.find("actionIcon");
+    if (action_icon_it != props.end()) {
+      action_icon = ResolveModuleIconPath(action_icon_it->second, id, module_path, "actionIcon");
+    }
+    auto webui_icon_it = props.find("webuiIcon");
+    if (webui_icon_it != props.end()) {
+      webui_icon = ResolveModuleIconPath(webui_icon_it->second, id, module_path, "webuiIcon");
+    }
 
     props["enabled"] = enabled ? "true" : "false";
     props["update"] = update ? "true" : "false";
     props["remove"] = remove ? "true" : "false";
     props["web"] = web ? "true" : "false";
     props["action"] = action ? "true" : "false";
+    if (!action_icon.empty()) {
+      props["actionIcon"] = action_icon;
+    } else {
+      props.erase("actionIcon");
+    }
+    if (!webui_icon.empty()) {
+      props["webuiIcon"] = webui_icon;
+    } else {
+      props.erase("webuiIcon");
+    }
     modules.push_back(props);
     return true;
   });

app/src/main/AndroidManifest.xml

@@ -83,6 +83,7 @@
             android:autoRemoveFromRecents="true"
             android:documentLaunchMode="intoExisting"
             android:exported="false"
+            android:taskAffinity="${applicationId}.webui"
             android:theme="@style/Theme.IcePatch.WebUI" />
 
         <activity

app/src/main/java/com/anatdx/icepatch/ui/MainActivity.kt

@@ -55,6 +55,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
@@ -82,6 +83,7 @@ import com.anatdx.icepatch.ui.theme.rememberBackgroundConfig
 import com.anatdx.icepatch.ui.viewmodel.SuperUserViewModel
 import com.ramcosta.composedestinations.generated.destinations.InstallModeSelectScreenDestination
 import com.ramcosta.composedestinations.generated.destinations.InstallScreenDestination
+import com.ramcosta.composedestinations.generated.destinations.ExecuteAPMActionScreenDestination
 import com.anatdx.icepatch.ui.screen.MODULE_TYPE
 import com.anatdx.icepatch.util.KpmInfo
 import com.anatdx.icepatch.util.KpmInfoReader
@@ -92,6 +94,7 @@ import androidx.lifecycle.lifecycleScope
 import kotlinx.coroutines.launch
 import me.zhanghai.android.appiconloader.coil.AppIconFetcher
 import me.zhanghai.android.appiconloader.coil.AppIconKeyer
+import androidx.core.net.toUri
 
 class MainActivity : AppCompatActivity() {
 
@@ -239,6 +242,8 @@ class MainActivity : AppCompatActivity() {
                         }
                 }
 
+                ShortcutIntentHandler(currentIntent = currentIntent, navigator = navigator)
+
                 LaunchedEffect(Unit) {
                     if (SuperUserViewModel.apps.isEmpty()) {
                         SuperUserViewModel().fetchAppList()
@@ -397,6 +402,42 @@ class MainActivity : AppCompatActivity() {
     }
 }
 
+@Composable
+private fun ShortcutIntentHandler(
+    currentIntent: Intent?,
+    navigator: com.ramcosta.composedestinations.navigation.DestinationsNavigator
+) {
+    val context = LocalContext.current
+    var handled by remember(currentIntent) { mutableStateOf(false) }
+
+    LaunchedEffect(currentIntent, handled) {
+        if (handled) return@LaunchedEffect
+        val intent = currentIntent ?: return@LaunchedEffect
+        when (intent.getStringExtra("shortcut_type")) {
+            "module_action" -> {
+                val moduleId = intent.getStringExtra("module_id") ?: return@LaunchedEffect
+                navigator.navigate(ExecuteAPMActionScreenDestination(moduleId)) {
+                    launchSingleTop = true
+                }
+                handled = true
+            }
+
+            "module_webui" -> {
+                val moduleId = intent.getStringExtra("module_id") ?: return@LaunchedEffect
+                val moduleName = intent.getStringExtra("module_name") ?: moduleId
+                val webIntent = Intent(context, WebUIActivity::class.java)
+                    .setData("apatch://webui/$moduleId".toUri())
+                    .putExtra("id", moduleId)
+                    .putExtra("name", moduleName)
+                    .putExtra("from_webui_shortcut", true)
+                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK)
+                context.startActivity(webIntent)
+                handled = true
+            }
+        }
+    }
+}
+
 
 @Composable
 private fun BottomBar(navController: NavHostController, visibleDestinations: Set<BottomBarDestination>) {

app/src/main/java/com/anatdx/icepatch/ui/WebUIActivity.kt

@@ -109,9 +109,9 @@ class WebUIActivity : ComponentActivity() {
         val name = intent.getStringExtra("name")!!
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
             @Suppress("DEPRECATION")
-            setTaskDescription(ActivityManager.TaskDescription("APatch - $name"))
+            setTaskDescription(ActivityManager.TaskDescription("IcePatch - $name"))
         } else {
-            val taskDescription = ActivityManager.TaskDescription.Builder().setLabel("APatch - $name").build()
+            val taskDescription = ActivityManager.TaskDescription.Builder().setLabel("IcePatch - $name").build()
             setTaskDescription(taskDescription)
         }
 
@@ -236,4 +236,4 @@ class WebUIActivity : ComponentActivity() {
             }
         }
     }
-}
+}