Feat: options to open the app when install completed

tiann · tiann · commit edf18acb5c15 · 2019-04-05T13:58:54.000+08:00
diff --git a/VirtualApp/app/src/main/java/io/virtualapp/home/ListAppFragment.java b/VirtualApp/app/src/main/java/io/virtualapp/home/ListAppFragment.java
@@ -196,7 +196,14 @@ public boolean isSelectable(int position) {
 
             if (dataList.size() > 0) {
                 String path = dataList.get(0).path;
-                chooseInstallWay(() -> Installd.startInstallerActivity(getActivity(), dataList), path);
+                chooseInstallWay(() -> {
+                    Activity activity = getActivity();
+                    if (activity == null) {
+                        return;
+                    }
+                    Installd.startInstallerActivity(activity, dataList);
+                    activity.setResult(Activity.RESULT_OK);
+                }, path);
             }
         });
         mSelectFromExternal.setOnClickListener(v -> {
@@ -249,7 +256,10 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
             return;
         }
 
-        chooseInstallWay(() -> Installd.handleRequestFromFile(getActivity(), path), path);
+        chooseInstallWay(() -> {
+            Installd.handleRequestFromFile(getActivity(), path);
+            getActivity().setResult(Activity.RESULT_OK);
+        }, path);
     }
 
     public static String getPath(Context context, Uri uri) {
diff --git a/VirtualApp/app/src/main/java/io/virtualapp/settings/SettingsActivity.java b/VirtualApp/app/src/main/java/io/virtualapp/settings/SettingsActivity.java
@@ -22,6 +22,7 @@
 import java.io.IOException;
 
 import io.virtualapp.R;
+import io.virtualapp.VCommends;
 import io.virtualapp.gms.FakeGms;
 import io.virtualapp.home.ListAppActivity;
 import io.virtualapp.utils.Misc;
@@ -327,4 +328,13 @@ public void startActivity(Intent intent) {
             }
         }
     }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == VCommends.REQUEST_SELECT_APP) {
+            if (resultCode == RESULT_OK) {
+                finish();
+            }
+        }
+    }
 }
diff --git a/VirtualApp/app/src/main/java/io/virtualapp/sys/InstallerActivity.java b/VirtualApp/app/src/main/java/io/virtualapp/sys/InstallerActivity.java
@@ -28,6 +28,7 @@
 import io.virtualapp.R;
 import io.virtualapp.VCommends;
 import io.virtualapp.abs.ui.VUiKit;
+import io.virtualapp.home.LoadingActivity;
 import io.virtualapp.home.models.AppData;
 import io.virtualapp.home.models.AppInfoLite;
 
@@ -134,9 +135,16 @@ public void update(AppData model) {
                                     mProgressText.postDelayed(() -> {
                                         mProgressBar.setVisibility(View.GONE);
 
+                                        mLeft.setVisibility(View.VISIBLE);
+                                        mLeft.setText(R.string.install_complete);
+                                        mLeft.setOnClickListener((vv) -> finish());
+
                                         mRight.setVisibility(View.VISIBLE);
-                                        mRight.setText(R.string.install_complete);
-                                        mRight.setOnClickListener((vv) -> finish());
+                                        mRight.setText(R.string.install_complete_and_open);
+                                        mRight.setOnClickListener((vv) -> {
+                                            LoadingActivity.launch(getApplicationContext(), appInfoLite.packageName, 0);
+                                            finish();
+                                        });
                                     }, 500);
                                 }
                             }
@@ -260,14 +268,11 @@ private void handleSystemIntent(Intent intent) {
             finish();
             return;
         }
-        PackageInfo packageArchiveInfo = packageManager.getPackageArchiveInfo(path, 0);
-        if (packageArchiveInfo == null) {
-            finish();
-            return;
-        }
-        String toInstalledVersion = packageArchiveInfo.versionName;
-        int toInstalledVersionCode = packageArchiveInfo.versionCode;
-        CharSequence label = packageArchiveInfo.packageName;
+
+        final String packageName = pkgInfo.packageName;
+        String toInstalledVersion = pkgInfo.versionName;
+        int toInstalledVersionCode = pkgInfo.versionCode;
+        CharSequence label = packageName;
 
         if (installedAppInfo != null) {
             String currentVersion;
@@ -316,10 +321,18 @@ private void handleSystemIntent(Intent intent) {
                 mProgressText.setVisibility(View.VISIBLE);
                 mProgressText.setText(getResources().getString(R.string.add_app_loading_complete, apkName));
                 mProgressBar.setVisibility(View.GONE);
+                mRight.setVisibility(View.VISIBLE);
                 mRight.setEnabled(true);
-                mRight.setText(res.isSuccess ? getResources().getString(R.string.install_complete) :
+                mRight.setText(R.string.install_complete_and_open);
+                mRight.setOnClickListener(vv -> {
+                    LoadingActivity.launch(this, packageName, 0);
+                    finish();
+                });
+                mLeft.setVisibility(View.VISIBLE);
+                mLeft.setEnabled(true);
+                mLeft.setText(res.isSuccess ? getResources().getString(R.string.install_complete) :
                         getResources().getString(R.string.install_fail, res.error));
-                mRight.setOnClickListener((vv) -> finish());
+                mLeft.setOnClickListener((vv) -> finish());
             }).fail((res) -> {
                 String msg = res.getMessage();
                 if (msg == null) {
diff --git a/VirtualApp/app/src/main/res/values-es/strings.xml b/VirtualApp/app/src/main/res/values-es/strings.xml
@@ -166,4 +166,5 @@
     <string name="install_permission_manager_tips">Permission Manage es implementado por XPrivacyLua, descarga (aproximadamente 1.7M) e instálalo ahora?</string>
     <string name="advance_settings_enable_launcher_summary">Enable Launcher</string>
     <string name="advance_settings_enable_launcher">Enable Launcher</string>
+    <string name="install_complete_and_open">Abierto</string>
 </resources>
diff --git a/VirtualApp/app/src/main/res/values-fr/strings.xml b/VirtualApp/app/src/main/res/values-fr/strings.xml
@@ -163,4 +163,5 @@
     <string name="install_permission_manager_tips">Permission Manage est mis en œuvre par XPrivacyLua, télécharger (environ 1,7M) et l\'installer maintenant?</string>
     <string name="advance_settings_enable_launcher_summary">Enable Launcher</string>
     <string name="advance_settings_enable_launcher">Enable Launcher</string>
+    <string name="install_complete_and_open">Ouvert</string>
 </resources>
diff --git a/VirtualApp/app/src/main/res/values-pt-rBR/strings.xml b/VirtualApp/app/src/main/res/values-pt-rBR/strings.xml
@@ -167,4 +167,5 @@
     <string name="install_permission_manager_tips">Gerenciador de permissões é implementado pelo XPrivacyLua, baixar (cerca de 1.7M) e instalá-lo agora?</string>
     <string name="advance_settings_enable_launcher_summary">Enable Launcher</string>
     <string name="advance_settings_enable_launcher">Enable Launcher</string>
+    <string name="install_complete_and_open">Aberto</string>
 </resources>
diff --git a/VirtualApp/app/src/main/res/values-ru/strings.xml b/VirtualApp/app/src/main/res/values-ru/strings.xml
@@ -148,4 +148,5 @@
         <string name="advance_settings_enable_launcher">Включить лаунчер</string>
 	<string name="advance_settings_disable_xposed_summary">Когда отключен, все Xposed модули не будут работать.</string>
         <string name="advance_settings_disable_xposed">Отключить Xposed</string>
+    <string name="install_complete_and_open">открытый</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
@@ -177,4 +177,5 @@
 跟我之前创造的 VirtualXposed 一样，EXposed 也是一个免Root使用Xposed 模块的App；他俩各有千秋，EXposed 由于直接运行在原生系统，不论是性能还是稳定性都会好很多；而VirtualXposed 基于VA，天生支持多开。EXposed 才诞生一个月，其稳定性已经超越发展将近一年的 VirtualXposed。\n\n
 
 目前 EXposed 已经上架应用商店，并且改名为 太极，大家可以在安装尝试一下。</string>
+    <string name="install_complete_and_open">打开</string>
 </resources>
diff --git a/VirtualApp/app/src/main/res/values-zh-rTW/strings.xml b/VirtualApp/app/src/main/res/values-zh-rTW/strings.xml
@@ -161,4 +161,5 @@
     <string name="install_permission_manager_tips">權限管理由XPrivacyLua實現，下載（約1.7M）並立即安裝？</string>
     <string name="advance_settings_enable_launcher_summary">Enable Launcher</string>
     <string name="advance_settings_enable_launcher">Enable Launcher</string>
+    <string name="install_complete_and_open">打開</string>
 </resources>
diff --git a/VirtualApp/app/src/main/res/values/strings.xml b/VirtualApp/app/src/main/res/values/strings.xml
@@ -183,4 +183,5 @@ Currently, EXposed has been put on the app store and renamed to Tai Chi. You can
     <string name="install_go_to_install_exp">Go to install TaiChi</string>
     <string name="install_taichi_while_old_version">The version of TaiChi installed is too old, Please install the latest Taichi!</string>
     <string name="install_go_latest_exp">Install the latest TaiChi</string>
+    <string name="install_complete_and_open">Open</string>
 </resources>

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`	`import java.io.IOException;`
`23`	`23`
`24`	`24`	`import io.virtualapp.R;`
	`25`	`+import io.virtualapp.VCommends;`
`25`	`26`	`import io.virtualapp.gms.FakeGms;`
`26`	`27`	`import io.virtualapp.home.ListAppActivity;`
`27`	`28`	`import io.virtualapp.utils.Misc;`
`@@ -327,4 +328,13 @@ public void startActivity(Intent intent) {`
`327`	`328`	`}`
`328`	`329`	`}`
`329`	`330`	`}`
	`331`	`+`
	`332`	`+ @Override`
	`333`	`+ protected void onActivityResult(int requestCode, int resultCode, Intent data) {`
	`334`	`+ if (requestCode == VCommends.REQUEST_SELECT_APP) {`
	`335`	`+ if (resultCode == RESULT_OK) {`
	`336`	`+ finish();`
	`337`	`+ }`
	`338`	`+ }`
	`339`	`+ }`
`330`	`340`	`}`