fix: android update

Cap-go · Aug 17, 2023 · bbd4c50 · bbd4c50
1 parent e3d1d93
commit bbd4c50
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 9 deletions.
diff --git a/android/src/main/java/ee/forgr/capacitor_updater/CapacitorUpdater.java b/android/src/main/java/ee/forgr/capacitor_updater/CapacitorUpdater.java
@@ -144,6 +144,10 @@ void notifyDownload(final String id, final int percent) {
     return;
   }
 
+  void directUpdateFinish(final BundleInfo latest) {
+    return;
+  }
+
   void notifyListeners(final String id, final JSObject res) {
     return;
   }
@@ -371,7 +375,7 @@ public void finishDownload(
       CapacitorUpdater.this.notifyListeners("updateAvailable", ret);
       if (setNext) {
         if (this.directUpdate) {
-          this.set(next);
+          CapacitorUpdater.this.directUpdateFinish(next);
         } else {
           this.setNextBundle(next.getId());
         }

diff --git a/android/src/main/java/ee/forgr/capacitor_updater/CapacitorUpdaterPlugin.java b/android/src/main/java/ee/forgr/capacitor_updater/CapacitorUpdaterPlugin.java
@@ -96,6 +96,11 @@ public void notifyDownload(final String id, final int percent) {
             CapacitorUpdaterPlugin.this.notifyDownload(id, percent);
           }
 
+          @Override
+          public void directUpdateFinish(final BundleInfo latest) {
+            CapacitorUpdaterPlugin.this.directUpdateFinish(latest);
+          }
+
           @Override
           public void notifyListeners(final String id, final JSObject res) {
             CapacitorUpdaterPlugin.this.notifyListeners(id, res);
@@ -168,6 +173,14 @@ public void notifyListeners(final String id, final JSObject res) {
     application.registerActivityLifecycleCallbacks(this);
   }
 
+  private void directUpdateFinish(final BundleInfo latest) {
+    final JSObject ret = new JSObject();
+    ret.put("bundle", latest.toJSON());
+    CapacitorUpdaterPlugin.this.implementation.set(latest);
+    CapacitorUpdaterPlugin.this._reload();
+    CapacitorUpdaterPlugin.this.notifyListeners("appReady", ret);
+  }
+
   private void cleanupObsoleteVersions() {
     try {
       final Version previous = new Version(
@@ -877,6 +890,10 @@ public void run() {
                         "noNeedUpdate",
                         retNoNeed
                       );
+                    CapacitorUpdaterPlugin.this.notifyListeners(
+                        "appReady",
+                        retNoNeed
+                      );
                     return;
                   }
 
@@ -893,6 +910,11 @@ public void run() {
                         "noNeedUpdate",
                         retNoNeed
                       );
+                    CapacitorUpdaterPlugin.this.notifyListeners(
+                        "appReady",
+                        retNoNeed
+                      );
+                    return;
                   }
                   final String latestVersionName = res.getString("version");
 
@@ -906,6 +928,8 @@ public void run() {
                           latestVersionName
                         );
                     if (latest != null) {
+                      final JSObject ret = new JSObject();
+                      ret.put("bundle", latest.toJSON());
                       if (latest.isErrorStatus()) {
                         Log.e(
                           CapacitorUpdater.TAG,
@@ -917,6 +941,10 @@ public void run() {
                             "noNeedUpdate",
                             retNoNeed
                           );
+                        CapacitorUpdaterPlugin.this.notifyListeners(
+                            "appReady",
+                            ret
+                          );
                         return;
                       }
                       if (latest.isDownloaded()) {
@@ -932,15 +960,7 @@ public void run() {
                               latest
                             );
                           CapacitorUpdaterPlugin.this._reload();
-                          final JSObject ret = new JSObject();
-                          ret.put("bundle", latest.toJSON());
-                          CapacitorUpdaterPlugin.this.notifyListeners(
-                              "appReady",
-                              ret
-                            );
                         } else {
-                          final JSObject ret = new JSObject();
-                          ret.put("bundle", latest.toJSON());
                           CapacitorUpdaterPlugin.this.notifyListeners(
                               "updateAvailable",
                               ret
@@ -949,6 +969,10 @@ public void run() {
                               latest.getId()
                             );
                         }
+                        CapacitorUpdaterPlugin.this.notifyListeners(
+                            "appReady",
+                            ret
+                          );
                         return;
                       }
                       if (latest.isDeleted()) {
@@ -978,6 +1002,10 @@ public void run() {
                           );
                         }
                       }
+                      CapacitorUpdaterPlugin.this.notifyListeners(
+                          "appReady",
+                          ret
+                        );
                     }
 
                     new Thread(
@@ -1032,6 +1060,10 @@ public void run() {
                                 "noNeedUpdate",
                                 retNoNeed
                               );
+                            CapacitorUpdaterPlugin.this.notifyListeners(
+                                "appReady",
+                                ret
+                              );
                           }
                         }
                       }