Add cli feature

Implement cli via socket

Author: JingMatrix

app/src/main/java/org/lsposed/manager/ConfigManager.java

@@ -336,15 +336,6 @@ public static boolean setHiddenIcon(boolean hide) {
         }
     }
 
-    public static String getApi() {
-        try {
-            return LSPManagerServiceHolder.getService().getApi();
-        } catch (RemoteException e) {
-            Log.e(App.TAG, Log.getStackTraceString(e));
-            return e.toString();
-        }
-    }
-
     public static List<String> getDenyListPackages() {
         List<String> list = new ArrayList<>();
         try {

app/src/main/java/org/lsposed/manager/ui/fragment/HomeFragment.java

@@ -150,8 +150,8 @@ private void updateStates(Activity activity, boolean binderAlive, boolean needUp
                 binding.statusTitle.setText(R.string.activated);
                 binding.statusIcon.setImageResource(R.drawable.ic_round_check_circle_24);
             }
-            binding.statusSummary.setText(String.format(LocaleDelegate.getDefaultLocale(), "%s (%d) - %s",
-                    ConfigManager.getXposedVersionName(), ConfigManager.getXposedVersionCode(), ConfigManager.getApi()));
+            binding.statusSummary.setText(String.format(LocaleDelegate.getDefaultLocale(), "%s (%d)",
+                    ConfigManager.getXposedVersionName(), ConfigManager.getXposedVersionCode()));
             binding.developerWarningCard.setVisibility(isDeveloper() ? View.VISIBLE : View.GONE);
         } else {
             boolean isMagiskInstalled = ConfigManager.isMagiskInstalled();

app/src/main/java/org/lsposed/manager/ui/fragment/SettingsFragment.java

@@ -80,7 +80,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
             getChildFragmentManager().beginTransaction().add(R.id.setting_container, new PreferenceFragment()).commitNow();
         }
         if (ConfigManager.isBinderAlive()) {
-            binding.toolbar.setSubtitle(String.format(LocaleDelegate.getDefaultLocale(), "%s (%d) - %s", ConfigManager.getXposedVersionName(), ConfigManager.getXposedVersionCode(), ConfigManager.getApi()));
+            binding.toolbar.setSubtitle(String.format(LocaleDelegate.getDefaultLocale(), "%s (%d)", ConfigManager.getXposedVersionName(), ConfigManager.getXposedVersionCode()));
         } else {
             binding.toolbar.setSubtitle(String.format(LocaleDelegate.getDefaultLocale(), "%s (%d) - %s", BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE, getString(R.string.not_installed)));
         }

app/src/main/java/org/lsposed/manager/util/UpdateUtil.java

@@ -55,13 +55,12 @@ public void onResponse(@NonNull Call call, @NonNull Response response) {
                 if (!response.isSuccessful()) return;
                 var body = response.body();
                 if (body == null) return;
-                String api = ConfigManager.isBinderAlive() ? ConfigManager.getApi() : "riru";
                 try {
                     var info = JsonParser.parseReader(body.charStream()).getAsJsonObject();
                     var notes = info.get("body").getAsString();
                     var assetsArray = info.getAsJsonArray("assets");
                     for (var assets : assetsArray) {
-                        checkAssets(assets.getAsJsonObject(), notes, api.toLowerCase(Locale.ROOT));
+                        checkAssets(assets.getAsJsonObject(), notes);
                     }
                 } catch (Throwable t) {
                     Log.e(App.TAG, t.getMessage(), t);
@@ -79,11 +78,10 @@ public void onFailure(@NonNull Call call, @NonNull IOException e) {
         App.getOkHttpClient().newCall(request).enqueue(callback);
     }
 
-    private static void checkAssets(JsonObject assets, String releaseNotes, String api) {
+    private static void checkAssets(JsonObject assets, String releaseNotes) {
         var pref = App.getPreferences();
         var name = assets.get("name").getAsString();
         var splitName = name.split("-");
-        if (!splitName[3].equals(api)) return;
         pref.edit()
                 .putInt("latest_version", Integer.parseInt(splitName[2]))
                 .putLong("latest_check", Instant.now().getEpochSecond())

daemon/build.gradle.kts

@@ -1,6 +1,7 @@
 import com.android.build.api.dsl.ApplicationExtension
 import com.android.ide.common.signing.KeystoreHelper
 import java.io.PrintStream
+import java.util.UUID
 
 val defaultManagerPackageName: String by rootProject.extra
 val injectedPackageName: String by rootProject.extra
@@ -26,6 +27,11 @@ android {
     buildConfigField("int", "MANAGER_INJECTED_UID", """$injectedPackageUid""")
     buildConfigField("String", "VERSION_NAME", """"${versionNameProvider.get()}"""")
     buildConfigField("long", "VERSION_CODE", versionCodeProvider.get())
+
+    val cliToken = UUID.randomUUID()
+    // Inject the MSB and LSB as Long constants
+    buildConfigField("Long", "CLI_TOKEN_MSB", "${cliToken.mostSignificantBits}L")
+    buildConfigField("Long", "CLI_TOKEN_LSB", "${cliToken.leastSignificantBits}L")
   }
 
   buildTypes {
@@ -92,6 +98,8 @@ android.applicationVariants.all {
 
 dependencies {
   implementation(libs.agp.apksig)
+  implementation(libs.gson)
+  implementation(libs.picocli)
   implementation(libs.kotlinx.coroutines.android)
   implementation(libs.kotlinx.coroutines.core)
   implementation(projects.external.apache)

daemon/proguard-rules.pro

@@ -1,7 +1,10 @@
 -keepclasseswithmembers,includedescriptorclasses class * {
     native <methods>;
 }
--keepclasseswithmembers class org.matrix.vector.daemon.core.VectorDaemon {
+-keepclasseswithmembers class org.matrix.vector.daemon.VectorDaemon {
+    public static void main(java.lang.String[]);
+}
+-keepclasseswithmembers class org.matrix.vector.daemon.Cli {
     public static void main(java.lang.String[]);
 }
 -keepclasseswithmembers class org.matrix.vector.daemon.env.LogcatMonitor {