make it more stronger with error handle

Author: yjfnypeu

updatepluginlib/src/main/java/org/lzh/framework/updatepluginlib/callback/DefaultCheckCB.java

@@ -27,8 +27,12 @@ public void setBuilder (UpdateBuilder builder) {
 
     @Override
     public void onCheckStart() {
-        if (checkCB != null) {
-            checkCB.onCheckStart();
+        try {
+            if (checkCB != null) {
+                checkCB.onCheckStart();
+            }
+        } catch (Throwable t) {
+            onCheckError(t);
         }
     }
 
@@ -38,69 +42,88 @@ public void onCheckStart() {
      */
     @Override
     public void hasUpdate(Update update) {
-        if (checkCB != null) {
-            checkCB.hasUpdate(update);
+        try {
+            if (checkCB != null) {
+                checkCB.hasUpdate(update);
+            }
+
+            if (!builder.getStrategy().isShowUpdateDialog(update)) {
+                Updater.getInstance().downUpdate(update,builder);
+                return;
+            }
+
+            Activity current = ActivityManager.get().topActivity();
+
+            DialogCreator creator = builder.getUpdateDialogCreator();
+            creator.setBuilder(builder);
+            creator.setCheckCB(builder.getCheckCB());
+            Dialog dialog = creator.create(update,current);
+            SafeDialogOper.safeShowDialog(dialog);
+
+            release();
+        } catch (Throwable t) {
+            onCheckError(t);
         }
-
-        if (!builder.getStrategy().isShowUpdateDialog(update)) {
-            Updater.getInstance().downUpdate(update,builder);
-            return;
-        }
-
-        Activity current = ActivityManager.get().topActivity();
-
-        DialogCreator creator = builder.getUpdateDialogCreator();
-        creator.setBuilder(builder);
-        creator.setCheckCB(builder.getCheckCB());
-        Dialog dialog = creator.create(update,current);
-        SafeDialogOper.safeShowDialog(dialog);
-
-        release();
     }
 
     /**
      * Receive and pass no_update event send by {@link UpdateWorker#sendNoUpdate()}
      */
     @Override
     public void noUpdate() {
-        if (checkCB != null) {
-            checkCB.noUpdate();
+        try {
+            if (checkCB != null) {
+                checkCB.noUpdate();
+            }
+            release();
+        } catch (Throwable t) {
+            onCheckError(t);
         }
 
-        release();
     }
 
     /**
      * Receive and pass check_error event send by {@link UpdateWorker#sendOnErrorMsg(Throwable)}
      */
     @Override
     public void onCheckError(Throwable t) {
-        if (checkCB != null) {
-            checkCB.onCheckError(t);
+        try {
+            if (checkCB != null) {
+                checkCB.onCheckError(t);
+            }
+        } catch (Throwable ignore) {
+            ignore.printStackTrace();
+        } finally {
+            release();
         }
-
-        release();
     }
 
     /**
      * will be never invoke
      */
     @Override
     public void onUserCancel() {
-        if (checkCB != null) {
-            checkCB.onUserCancel();
+        try {
+            if (checkCB != null) {
+                checkCB.onUserCancel();
+            }
+            release();
+        } catch (Throwable t) {
+            onCheckError(t);
         }
 
-        release();
     }
 
     @Override
     public void onCheckIgnore(Update update) {
-        if (checkCB != null) {
-            checkCB.onCheckIgnore(update);
+        try {
+            if (checkCB != null) {
+                checkCB.onCheckIgnore(update);
+            }
+            release();
+        } catch (Throwable t) {
+            onCheckError(t);
         }
-
-        release();
     }
 
     @Override

updatepluginlib/src/main/java/org/lzh/framework/updatepluginlib/callback/DefaultDownloadCB.java

@@ -47,12 +47,16 @@ public void setUpdate(Update update) {
      */
     @Override
     public void onUpdateStart() {
-        if (downloadCB != null) {
-            downloadCB.onUpdateStart();
-        }
-        innerCB = getInnerCB();
-        if (innerCB != null) {
-            innerCB.onUpdateStart();
+        try {
+            if (downloadCB != null) {
+                downloadCB.onUpdateStart();
+            }
+            innerCB = getInnerCB();
+            if (innerCB != null) {
+                innerCB.onUpdateStart();
+            }
+        } catch (Throwable t) {
+            onUpdateError(t);
         }
     }
 
@@ -73,17 +77,21 @@ private UpdateDownloadCB getInnerCB() {
      */
     @Override
     public void onUpdateComplete(File file) {
-        if (downloadCB != null) {
-            downloadCB.onUpdateComplete(file);
-        }
+        try {
+            if (downloadCB != null) {
+                downloadCB.onUpdateComplete(file);
+            }
 
-        if (innerCB != null) {
-            innerCB.onUpdateComplete(file);
-        }
+            if (innerCB != null) {
+                innerCB.onUpdateComplete(file);
+            }
 
-        showInstallDialogIfNeed(file);
+            showInstallDialogIfNeed(file);
 
-        release();
+            release();
+        } catch (Throwable t) {
+            onUpdateError(t);
+        }
     }
 
     public void showInstallDialogIfNeed(File file) {
@@ -106,29 +114,37 @@ public void showInstallDialogIfNeed(File file) {
      */
     @Override
     public void onUpdateProgress(long current,long total) {
-        if (downloadCB != null) {
-            downloadCB.onUpdateProgress(current,total);
+        try {
+            if (downloadCB != null) {
+                downloadCB.onUpdateProgress(current,total);
+            }
+
+            if (innerCB != null) {
+                innerCB.onUpdateProgress(current,total);
+            }
+        } catch (Throwable t) {
+            onUpdateError(t);
         }
 
-        if (innerCB != null) {
-            innerCB.onUpdateProgress(current,total);
-        }
     }
 
     /**
      * Receive and pass download_error event send by {@link DownloadWorker#sendUpdateError(Throwable)}
      */
     @Override
     public void onUpdateError(Throwable t) {
-        if (downloadCB != null) {
-            downloadCB.onUpdateError(t);
-        }
-
-        if (innerCB != null) {
-            innerCB.onUpdateError(t);
+        try {
+            if (downloadCB != null) {
+                downloadCB.onUpdateError(t);
+            }
+            if (innerCB != null) {
+                innerCB.onUpdateError(t);
+            }
+        } catch (Throwable ignore) {
+            ignore.printStackTrace();
+        } finally {
+            release();
         }
-
-        release();
     }
 
     @Override