修复崩溃

Justwen · Oct 7, 2021 · 13bc5da · 13bc5da
1 parent 2e31a1d
commit 13bc5da
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 5 deletions.
diff --git a/nga_phone_base_3.0/src/main/java/gov/anzong/androidnga/NgaClientApp.java b/nga_phone_base_3.0/src/main/java/gov/anzong/androidnga/NgaClientApp.java
@@ -7,8 +7,14 @@
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.justwen.androidnga.cloud.CloudServerManager;
 
+import org.apache.commons.io.FileUtils;
+
+import java.io.File;
+import java.io.IOException;
+
 import gov.anzong.androidnga.base.util.ContextUtils;
 import gov.anzong.androidnga.base.util.PreferenceUtils;
+import gov.anzong.androidnga.base.util.ThreadUtils;
 import gov.anzong.androidnga.common.PreferenceKey;
 import gov.anzong.androidnga.common.util.ReflectUtils;
 import sp.phone.common.FilterKeywordsManagerImpl;
@@ -38,10 +44,31 @@ public void onCreate() {
     }
 
     private void fixWebViewMultiProcessException() {
-        int index = PreferenceUtils.getData(PreferenceKey.KEY_WEBVIEW_DATA_INDEX, 0);
-        if (index > 0) {
-            WebView.setDataDirectorySuffix(String.valueOf(index));
+        File dataDir = getDataDir();
+        File[] dirs = dataDir.listFiles();
+
+        Object ppidObj = ReflectUtils.invokeMethod(Process.class, "myPpid");
+
+        int ppid = ppidObj != null ? (int) ppidObj : Process.myPid();
+
+        if (dirs != null) {
+            for (File dir : dirs) {
+                if (dir.getName().contains("webview")) {
+                    if (!dir.getName().contains("webview_" + ppid)){
+                        ThreadUtils.postOnSubThread(() -> {
+                            try {
+                                FileUtils.deleteDirectory(dir);
+                            } catch (IOException e) {
+                                e.printStackTrace();
+                            }
+                        });
+
+                    }
+                }
+            }
         }
+
+        WebView.setDataDirectorySuffix(String.valueOf(ppid));
     }
 
     private void initRouter() {

diff --git a/nga_phone_base_3.0/src/main/java/sp/phone/ui/adapter/BaseAppendableAdapter.java b/nga_phone_base_3.0/src/main/java/sp/phone/ui/adapter/BaseAppendableAdapter.java
@@ -43,8 +43,8 @@ public void appendData(List<E> dataList) {
         if (mDataList == null) {
             mDataList = new ArrayList<>();
         }
-
-        for (E e : dataList) {
+        List<E> newDataList = new ArrayList<>(dataList);
+        for (E e : newDataList) {
             if (!mDataList.contains(e)) {
                 mDataList.add(e);
             }