[VXP]: optimise the install process of Xposed Installer.

tiann · tiann · commit a64fb62b0c30 · 2018-06-10T11:26:39.000+08:00
diff --git a/VirtualApp/app/src/main/java/io/virtualapp/XApp.java b/VirtualApp/app/src/main/java/io/virtualapp/XApp.java
@@ -4,23 +4,13 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Build;
-import android.util.Log;
 
 import com.crashlytics.android.Crashlytics;
 import com.lody.virtual.client.NativeEngine;
-import com.lody.virtual.client.core.InstallStrategy;
 import com.lody.virtual.client.core.VirtualCore;
 import com.lody.virtual.client.stub.VASettings;
-import com.lody.virtual.helper.utils.DeviceUtil;
-import com.lody.virtual.helper.utils.FileUtils;
-import com.lody.virtual.helper.utils.VLog;
 import com.lody.virtual.os.VEnvironment;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-
 import io.fabric.sdk.android.Fabric;
 import io.virtualapp.delegate.MyAppRequestListener;
 import io.virtualapp.delegate.MyComponentDelegate;
@@ -72,51 +62,7 @@ public void onCreate() {
             @Override
             public void onMainProcess() {
                 Once.initialise(XApp.this);
-
                 Fabric.with(XApp.this, new Crashlytics());
-
-                boolean isXposedInstalled = false;
-                try {
-                    isXposedInstalled = VirtualCore.get().isAppInstalled(XPOSED_INSTALLER_PACKAGE);
-                    File oldXposedInstallerApk = getFileStreamPath("XposedInstaller_1_31.apk");
-                    if (oldXposedInstallerApk.exists()) {
-                        VirtualCore.get().uninstallPackage(XPOSED_INSTALLER_PACKAGE);
-                        oldXposedInstallerApk.delete();
-                        isXposedInstalled = false;
-                        Log.d(TAG, "remove xposed installer success!");
-                    }
-                } catch (Throwable e) {
-                    VLog.d(TAG, "remove xposed install failed.", e);
-                }
-
-                if (!isXposedInstalled) {
-                    File xposedInstallerApk = getFileStreamPath("XposedInstaller_5_8.apk");
-                    if (!xposedInstallerApk.exists()) {
-                        InputStream input = null;
-                        OutputStream output = null;
-                        try {
-                            input = getApplicationContext().getAssets().open("XposedInstaller_3.1.5.apk_");
-                            output = new FileOutputStream(xposedInstallerApk);
-                            byte[] buffer = new byte[1024];
-                            int length;
-                            while ((length = input.read(buffer)) > 0) {
-                                output.write(buffer, 0, length);
-                            }
-                        } catch (Throwable e) {
-                            VLog.e(TAG, "copy file error", e);
-                        } finally {
-                            FileUtils.closeQuietly(input);
-                            FileUtils.closeQuietly(output);
-                        }
-                    }
-
-                    if (xposedInstallerApk.isFile() && !DeviceUtil.isMeizuBelowN()) {
-                        try {
-                            VirtualCore.get().installPackage(xposedInstallerApk.getPath(), InstallStrategy.TERMINATE_IF_EXIST);
-                        } catch (Throwable ignored) {
-                        }
-                    }
-                }
             }
 
             @Override
diff --git a/VirtualApp/app/src/main/java/io/virtualapp/home/NewHomeActivity.java b/VirtualApp/app/src/main/java/io/virtualapp/home/NewHomeActivity.java
@@ -2,6 +2,7 @@
 
 import android.app.Activity;
 import android.app.AlertDialog;
+import android.app.ProgressDialog;
 import android.content.ActivityNotFoundException;
 import android.content.ComponentName;
 import android.content.Context;
@@ -18,6 +19,7 @@
 import android.preference.PreferenceManager;
 import android.provider.Settings;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.Window;
@@ -26,17 +28,26 @@
 
 import com.android.launcher3.LauncherFiles;
 import com.google.android.apps.nexuslauncher.NexusLauncherActivity;
+import com.lody.virtual.client.core.InstallStrategy;
 import com.lody.virtual.client.core.VirtualCore;
 import com.lody.virtual.helper.utils.DeviceUtil;
+import com.lody.virtual.helper.utils.FileUtils;
+import com.lody.virtual.helper.utils.MD5Utils;
+import com.lody.virtual.helper.utils.VLog;
 
 import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.lang.reflect.Method;
 
-import io.virtualapp.XApp;
 import io.virtualapp.R;
+import io.virtualapp.abs.ui.VUiKit;
 import io.virtualapp.settings.SettingsActivity;
 import io.virtualapp.update.VAVersionService;
 
+import static io.virtualapp.XApp.XPOSED_INSTALLER_PACKAGE;
+
 /**
  * @author weishu
  * @date 18/2/9.
@@ -49,6 +60,7 @@ public class NewHomeActivity extends NexusLauncherActivity {
 
     private Handler mUiHandler;
     private boolean mDirectlyBack = false;
+    private boolean checkXposedInstaller = true;
 
     public static void goHome(Context context) {
         Intent intent = new Intent(context, NewHomeActivity.class);
@@ -68,9 +80,73 @@ public void onCreate(Bundle savedInstanceState) {
         mDirectlyBack = sharedPreferences.getBoolean(SettingsActivity.DIRECTLY_BACK_KEY, false);
     }
 
+    private void installXposed() {
+        boolean isXposedInstalled = false;
+        try {
+            isXposedInstalled = VirtualCore.get().isAppInstalled(XPOSED_INSTALLER_PACKAGE);
+            File oldXposedInstallerApk = getFileStreamPath("XposedInstaller_1_31.apk");
+            if (oldXposedInstallerApk.exists()) {
+                VirtualCore.get().uninstallPackage(XPOSED_INSTALLER_PACKAGE);
+                oldXposedInstallerApk.delete();
+                isXposedInstalled = false;
+                Log.d(TAG, "remove xposed installer success!");
+            }
+        } catch (Throwable e) {
+            VLog.d(TAG, "remove xposed install failed.", e);
+        }
+
+        if (!isXposedInstalled) {
+            ProgressDialog dialog = new ProgressDialog(this);
+            dialog.setCancelable(false);
+            dialog.setMessage(getResources().getString(R.string.prepare_xposed_installer));
+            dialog.show();
+
+            VUiKit.defer().when(() -> {
+                File xposedInstallerApk = getFileStreamPath("XposedInstaller_5_8.apk");
+                if (!xposedInstallerApk.exists()) {
+                    InputStream input = null;
+                    OutputStream output = null;
+                    try {
+                        input = getApplicationContext().getAssets().open("XposedInstaller_3.1.5.apk_");
+                        output = new FileOutputStream(xposedInstallerApk);
+                        byte[] buffer = new byte[1024];
+                        int length;
+                        while ((length = input.read(buffer)) > 0) {
+                            output.write(buffer, 0, length);
+                        }
+                    } catch (Throwable e) {
+                        VLog.e(TAG, "copy file error", e);
+                    } finally {
+                        FileUtils.closeQuietly(input);
+                        FileUtils.closeQuietly(output);
+                    }
+                }
+
+                if (xposedInstallerApk.isFile() && !DeviceUtil.isMeizuBelowN()) {
+                    try {
+                        if ("8537fb219128ead3436cc19ff35cfb2e".equals(MD5Utils.getFileMD5String(xposedInstallerApk))) {
+                            VirtualCore.get().installPackage(xposedInstallerApk.getPath(), InstallStrategy.TERMINATE_IF_EXIST);
+                        } else {
+                            VLog.w(TAG, "unknown Xposed installer, ignore!");
+                        }
+                    } catch (Throwable ignored) {
+                    }
+                }
+            }).then((v) -> {
+                dialog.dismiss();
+            }).fail((err) -> {
+                dialog.dismiss();
+            });
+        }
+    }
+
     @Override
     protected void onResume() {
         super.onResume();
+        if (checkXposedInstaller) {
+            checkXposedInstaller = false;
+            installXposed();
+        }
         // check for update
         new Handler().postDelayed(() ->
                 VAVersionService.checkUpdate(getApplicationContext(), false), 1000);
@@ -146,7 +222,7 @@ private void alertForMeizu() {
         if (!DeviceUtil.isMeizuBelowN()) {
             return;
         }
-        boolean isXposedInstalled = VirtualCore.get().isAppInstalled(XApp.XPOSED_INSTALLER_PACKAGE);
+        boolean isXposedInstalled = VirtualCore.get().isAppInstalled(XPOSED_INSTALLER_PACKAGE);
         if (isXposedInstalled) {
             return;
         }
diff --git a/VirtualApp/app/src/main/java/io/virtualapp/splash/SplashActivity.java b/VirtualApp/app/src/main/java/io/virtualapp/splash/SplashActivity.java
@@ -42,7 +42,6 @@ protected void onCreate(Bundle savedInstanceState) {
         });
     }
 
-
     private void doActionInThread() {
         if (!VirtualCore.get().isEngineLaunched()) {
             VirtualCore.get().waitForEngine();
diff --git a/VirtualApp/app/src/main/res/values-es/strings.xml b/VirtualApp/app/src/main/res/values-es/strings.xml
@@ -162,4 +162,5 @@
     <string name="donate_bitconins_tips">Mi dirección de bitconins ha sido copiada al portapapeles :)</string>
     <string name="advance_settings_disable_xposed_summary">Cuando está deshabilitado, todo el módulo Xposed no tendrá efecto.</string>
     <string name="advance_settings_disable_xposed">Deshabilitar Xposed</string>
+    <string name="prepare_xposed_installer">Preparación del entorno Xposed, espere ...</string>
 </resources>
diff --git a/VirtualApp/app/src/main/res/values-fr/strings.xml b/VirtualApp/app/src/main/res/values-fr/strings.xml
@@ -162,4 +162,5 @@
     <string name="donate_bitconins_tips">Mon adresse bitconins a été copiée dans le presse-papiers :)</string>
     <string name="advance_settings_disable_xposed_summary">Lorsqu\'il est désactivé, tous les modules Xposed ne prennent pas effet.</string>
     <string name="advance_settings_disable_xposed">Désactiver Xposed</string>
+    <string name="prepare_xposed_installer">Préparation de l\'environnement Xposed, veuillez patienter ...</string>
 </resources>
diff --git a/VirtualApp/app/src/main/res/values-ru/strings.xml b/VirtualApp/app/src/main/res/values-ru/strings.xml
@@ -183,4 +183,5 @@
     <string name="donate_bitconins_tips">Мой адрес битконов был скопирован в буфер обмена :)</string>
     <string name="advance_settings_disable_xposed_summary">При отключении все модули Xposed не вступят в силу.</string>
     <string name="advance_settings_disable_xposed">Отключить Xposed</string>
+    <string name="prepare_xposed_installer">Подготовка среды Xposed, пожалуйста, подождите ...</string>
 </resources>
diff --git a/VirtualApp/app/src/main/res/values-zh-rCN/strings.xml b/VirtualApp/app/src/main/res/values-zh-rCN/strings.xml
@@ -158,4 +158,5 @@
     <string name="donate_alipay">支付宝</string>
     <string name="advance_settings_disable_xposed">关闭 Xposed</string>
     <string name="advance_settings_disable_xposed_summary">关闭Xposed之后，所有的Xposed均不会生效。</string>
+    <string name="prepare_xposed_installer">正在准备 Xposed 环境，请等待…</string>
 </resources>
diff --git a/VirtualApp/app/src/main/res/values/strings.xml b/VirtualApp/app/src/main/res/values/strings.xml
@@ -164,4 +164,5 @@
     <string name="donate_bitconins_tips">My bitconins address has been copied to clipboard:)</string>
     <string name="advance_settings_disable_xposed_summary">When disabled, all Xposed module won\'t take effect.</string>
     <string name="advance_settings_disable_xposed">Disable Xposed</string>
+    <string name="prepare_xposed_installer">Preparing Xposed environment, please wait…</string>
 </resources>

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,6 @@ protected void onCreate(Bundle savedInstanceState) {`
`42`	`42`	`});`
`43`	`43`	`}`
`44`	`44`
`45`		`-`
`46`	`45`	`private void doActionInThread() {`
`47`	`46`	`if (!VirtualCore.get().isEngineLaunched()) {`
`48`	`47`	`VirtualCore.get().waitForEngine();`