Merge pull request #368 from SkyEric/dev

cundong · web-flow · commit 220bd717b510 · 2017-09-25T17:07:34.000+08:00
Improve the implementation of the plugin uninstall logic
diff --git a/replugin-host-library/replugin-host-lib/src/main/aidl/com/qihoo360/loader2/IPluginHost.aidl b/replugin-host-library/replugin-host-lib/src/main/aidl/com/qihoo360/loader2/IPluginHost.aidl
@@ -62,6 +62,8 @@ interface IPluginHost {
 
     PluginInfo pluginDownloaded(String path);
 
+    boolean pluginUninstalled(in PluginInfo info);
+
     boolean pluginExtracted(String path);
 
     oneway void sendIntent2Process(String target, in Intent intent);
diff --git a/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/loader2/MP.java b/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/loader2/MP.java
@@ -282,13 +282,11 @@ public static final boolean pluginUninstall(String pluginName) {
             return true;
         }
 
-        // 插件已安装
         try {
-            return PluginManagerProxy.uninstall(pi);
-        } catch (RemoteException e) {
-            e.printStackTrace();
-            if (LOG) {
-                e.printStackTrace();
+            return PluginProcessMain.getPluginHost().pluginUninstalled(pi);
+        } catch (Throwable e) {
+            if (LOGR) {
+                LogRelease.e(PLUGIN_TAG, "uninstall. error: " + e.getMessage(), e);
             }
         }
 
diff --git a/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/loader2/PmBase.java b/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/loader2/PmBase.java
@@ -581,9 +581,8 @@ final void callAppCreate() {
         if (!IPC.isPersistentProcess()) {
             // 由于常驻进程已经在内部做了相关的处理，此处仅需要在UI进程注册并更新即可
             registerReceiverAction(ACTION_NEW_PLUGIN);
+            registerReceiverAction(ACTION_UNINSTALL_PLUGIN);
         }
-        // 由于常驻进程内未做处理，因此需要在常驻和UI进程同时注册并更新缓存信息
-        registerReceiverAction(ACTION_UNINSTALL_PLUGIN);
     }
 
     /**
diff --git a/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/loader2/PmHostSvc.java b/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/loader2/PmHostSvc.java
@@ -27,9 +27,11 @@
 import android.support.v4.content.LocalBroadcastManager;
 import android.text.TextUtils;
 
+import com.qihoo360.mobilesafe.api.Tasks;
 import com.qihoo360.replugin.RePlugin;
 import com.qihoo360.replugin.RePluginConstants;
 import com.qihoo360.replugin.RePluginEventCallbacks;
+import com.qihoo360.replugin.RePluginInternal;
 import com.qihoo360.replugin.base.IPC;
 import com.qihoo360.replugin.base.LocalBroadcastHelper;
 import com.qihoo360.replugin.component.ComponentList;
@@ -42,6 +44,7 @@
 import com.qihoo360.replugin.helper.LogRelease;
 import com.qihoo360.replugin.model.PluginInfo;
 import com.qihoo360.replugin.packages.IPluginManagerServer;
+import com.qihoo360.replugin.packages.PluginInfoUpdater;
 import com.qihoo360.replugin.packages.PluginManagerServer;
 
 import java.io.File;
@@ -329,13 +332,29 @@ public PluginInfo pluginDownloaded(String path) throws RemoteException {
 
         if (pi != null) {
             // 通常到这里，表示“安装已成功”，这时不管处于什么状态，都应该通知外界更新插件内存表
-            syncPluginInfo2All(pi);
+            syncInstalledPluginInfo2All(pi);
+
         }
 
         return pi;
     }
 
-    private void syncPluginInfo2All(PluginInfo pi) {
+    @Override
+    public boolean pluginUninstalled(PluginInfo info) throws RemoteException {
+        if (LOG) {
+            LogDebug.d(PLUGIN_TAG, "pluginUninstalled： pn=" + info.getName());
+        }
+        final boolean result = mManager.getService().uninstall(info);
+
+        // 卸载完成
+        if (result) {
+            syncUninstalledPluginInfo2All(info);
+        }
+
+        return result;
+    }
+
+    private void syncInstalledPluginInfo2All(PluginInfo pi) {
         // PS：若更新了“正在运行”的插件（属于“下次重启进程后更新”），则由于install返回的是“新的PluginInfo”，为防止出现“错误更新”，需要使用原来的
         //
         // 举例，有一个正在运行的插件A（其Info为PluginInfoOld）升级到新版（其Info为PluginInfoNew），则：
@@ -363,7 +382,30 @@ private void syncPluginInfo2All(PluginInfo pi) {
         IPC.sendLocalBroadcast2AllSync(mContext, intent);
 
         if (LOG) {
-            LogDebug.d(TAG, "syncPluginInfo2All: Sync complete! syncPi=" + needToSyncPi);
+            LogDebug.d(TAG, "syncInstalledPluginInfo2All: Sync complete! syncPi=" + needToSyncPi);
+        }
+    }
+
+
+    private void syncUninstalledPluginInfo2All(PluginInfo pi) {
+
+        // 在常驻进程内更新插件内存表
+        mPluginMgr.pluginUninstalled(pi);
+
+        // 给各进程发送广播，同步更新
+        final Intent intent = new Intent(PluginInfoUpdater.ACTION_UNINSTALL_PLUGIN);
+        intent.putExtra("obj", pi);
+        // 注意：若在attachBaseContext中调用此方法，则由于此时getApplicationContext为空，导致发送广播时会出现空指针异常。
+        // 则应该Post一下，待getApplicationContext有值后再发送广播。
+        if (RePluginInternal.getAppContext().getApplicationContext() != null) {
+            IPC.sendLocalBroadcast2AllSync(RePluginInternal.getAppContext(), intent);
+        } else {
+            Tasks.post2UI(new Runnable() {
+                @Override
+                public void run() {
+                    IPC.sendLocalBroadcast2All(RePluginInternal.getAppContext(), intent);
+                }
+            });
         }
     }
 
diff --git a/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/replugin/packages/PluginManagerProxy.java b/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/replugin/packages/PluginManagerProxy.java
@@ -102,32 +102,6 @@ public static List<PluginInfo> updateAllPlugins() throws RemoteException {
         return sRemote.load();
     }
 
-    /**
-     * 常驻进程进行插件卸载
-     *
-     * @param pi
-     */
-    public static boolean uninstall(PluginInfo pi) throws RemoteException {
-        if (pi == null) {
-            // 不太可能到这里
-            return false;
-        }
-        if (pi.isPnPlugin()) {
-            // 是常驻进程？老逻辑直接走dex文件存在判断，也无需做处理
-            return false;
-        }
-
-        if (sRemote == null) {
-            // 常驻已挂掉，可以认为无需处理
-            if (LogRelease.LOGR) {
-                LogRelease.e(PLUGIN_TAG, "pmc.uuin: s=null");
-            }
-            return false;
-        }
-
-        return sRemote.uninstall(pi);
-    }
-
     /**
      * 去常驻进程更新isUsed状态，并发送到所有进程中更新
      *
diff --git a/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/replugin/packages/PluginManagerServer.java b/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/replugin/packages/PluginManagerServer.java
@@ -428,6 +428,9 @@ private void updateNow(PluginInfo curInfo, PluginInfo newInfo) {
     }
 
     private void move(@NonNull PluginInfo curPi, @NonNull PluginInfo newPi) {
+        if (LogDebug.LOG) {
+            LogDebug.i(TAG, "move. curPi=" + curPi.getPath() + "; newPi=" + newPi.getPath());
+        }
         try {
             FileUtils.copyFile(newPi.getApkFile(), curPi.getApkFile());
 
@@ -529,21 +532,6 @@ private boolean uninstallNow(PluginInfo info) {
         mList.remove(info.getName());
         mList.save(mContext);
 
-        // 3. 给各进程发送广播，同步更新
-        final Intent intent = new Intent(PluginInfoUpdater.ACTION_UNINSTALL_PLUGIN);
-        intent.putExtra("obj", info);
-        // 注意：若在attachBaseContext中调用此方法，则由于此时getApplicationContext为空，导致发送广播时会出现空指针异常。
-        // 则应该Post一下，待getApplicationContext有值后再发送广播。
-        if (RePluginInternal.getAppContext().getApplicationContext() != null) {
-            IPC.sendLocalBroadcast2AllSync(RePluginInternal.getAppContext(), intent);
-        } else {
-            Tasks.post2UI(new Runnable() {
-                @Override
-                public void run() {
-                    IPC.sendLocalBroadcast2All(RePluginInternal.getAppContext(), intent);
-                }
-            });
-        }
         return true;
     }
 
diff --git a/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/replugin/utils/pkg/PackageFilesUtil.java b/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/replugin/utils/pkg/PackageFilesUtil.java
@@ -284,15 +284,21 @@ public static void forceDelete(PluginInfo info) {
 
         try {
             // 删除插件APK
-            FileUtils.forceDelete(info.getApkFile());
-            if (BuildConfig.DEBUG) {
-                Log.i(TAG, "delete " + info.getApkFile());
+            final File apkFile = info.getApkFile();
+            if (apkFile.exists()) {
+                FileUtils.forceDelete(apkFile);
+                if (BuildConfig.DEBUG) {
+                    Log.i(TAG, "delete " + info.getApkFile());
+                }
             }
 
             // 删除释放后的odex
-            FileUtils.forceDelete(info.getDexFile());
-            if (BuildConfig.DEBUG) {
-                Log.i(TAG, "delete " + info.getDexFile());
+            final File dexFile = info.getDexFile();
+            if (dexFile.exists()) {
+                FileUtils.forceDelete(dexFile);
+                if (BuildConfig.DEBUG) {
+                    Log.i(TAG, "delete " + info.getDexFile());
+                }
             }
 
             if (Build.VERSION.SDK_INT > Build.VERSION_CODES.N_MR1) {
@@ -323,9 +329,12 @@ public static void forceDelete(PluginInfo info) {
             }
 
             // 删除Native文件
-            FileUtils.forceDelete(info.getNativeLibsDir());
-            if (BuildConfig.DEBUG) {
-                Log.i(TAG, "delete " + info.getNativeLibsDir());
+            final File libsFile = info.getNativeLibsDir();
+            if (libsFile.exists()) {
+                FileUtils.forceDelete(info.getNativeLibsDir());
+                if (BuildConfig.DEBUG) {
+                    Log.i(TAG, "delete " + info.getNativeLibsDir());
+                }
             }
 
             // 删除进程锁文件

Original file line number	Diff line number	Diff line change
`@@ -282,13 +282,11 @@ public static final boolean pluginUninstall(String pluginName) {`
`282`	`282`	`return true;`
`283`	`283`	`}`
`284`	`284`
`285`		`- // 插件已安装`
`286`	`285`	`try {`
`287`		`- return PluginManagerProxy.uninstall(pi);`
`288`		`- } catch (RemoteException e) {`
`289`		`- e.printStackTrace();`
`290`		`- if (LOG) {`
`291`		`- e.printStackTrace();`
	`286`	`+ return PluginProcessMain.getPluginHost().pluginUninstalled(pi);`
	`287`	`+ } catch (Throwable e) {`
	`288`	`+ if (LOGR) {`
	`289`	`+ LogRelease.e(PLUGIN_TAG, "uninstall. error: " + e.getMessage(), e);`
`292`	`290`	`}`
`293`	`291`	`}`
`294`	`292`
Original file line number	Diff line number	Diff line change
`@@ -581,9 +581,8 @@ final void callAppCreate() {`
`581`	`581`	`if (!IPC.isPersistentProcess()) {`
`582`	`582`	`// 由于常驻进程已经在内部做了相关的处理，此处仅需要在UI进程注册并更新即可`
`583`	`583`	`registerReceiverAction(ACTION_NEW_PLUGIN);`
	`584`	`+ registerReceiverAction(ACTION_UNINSTALL_PLUGIN);`
`584`	`585`	`}`
`585`		`- // 由于常驻进程内未做处理，因此需要在常驻和UI进程同时注册并更新缓存信息`
`586`		`- registerReceiverAction(ACTION_UNINSTALL_PLUGIN);`
`587`	`586`	`}`
`588`	`587`
`589`	`588`	`/**`