fix: sendStats in android and updateFailed position

Cap-go · May 20, 2022 · fd3e744 · lincolnthree · May 20, 2022 · fd3e744
1 parent 719d2f5
commit fd3e744
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 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
@@ -375,7 +375,7 @@ public void sendStats(final String action, final VersionInfo version) {
             url = new URL(this.getStatsUrl());
             json.put("platform", "android");
             json.put("action", action);
-            json.put("version_name", version);
+            json.put("version_name", version.getName());
             json.put("device_id", this.getDeviceID());
             json.put("version_build", this.versionBuild);
             json.put("version_code", this.versionCode);

diff --git a/android/src/main/java/ee/forgr/capacitor_updater/CapacitorUpdaterPlugin.java b/android/src/main/java/ee/forgr/capacitor_updater/CapacitorUpdaterPlugin.java
@@ -529,7 +529,10 @@ public void onActivityStopped(@NonNull final Activity activity) {
                     Log.i(CapacitorUpdater.TAG, "Version: " + current + ", is in error state.");
                     Log.i(CapacitorUpdater.TAG, "Will fallback to: " + fallback + " on application restart.");
                     Log.i(CapacitorUpdater.TAG, "Did you forget to call 'notifyAppReady()' in your Capacitor App code?");
-
+                    final JSObject ret = new JSObject();
+                    ret.put("version", current);
+                    this.notifyListeners("updateFailed", ret);
+                    this.implementation.sendStats("revert", current)
                     if (!fallback.isBuiltin() && !fallback.equals(current)) {
                         final Boolean res = this.implementation.set(fallback);
                         if (res && this._reload()) {
@@ -544,9 +547,6 @@ public void onActivityStopped(@NonNull final Activity activity) {
                     }
 
                     if (this.autoDeleteFailed) {
-                        final JSObject ret = new JSObject();
-                        ret.put("version", current);
-                        this.notifyListeners("updateFailed", ret);
                         Log.i(CapacitorUpdater.TAG, "Deleting failing version: " + current);
                         try {
                             final Boolean res = this.implementation.delete(current.getVersion());

diff --git a/ios/Plugin/CapacitorUpdaterPlugin.swift b/ios/Plugin/CapacitorUpdaterPlugin.swift
@@ -342,6 +342,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
             print("\(self.implementation.TAG) Version: \(curVersionName), is considered broken")
             print("\(self.implementation.TAG) Will downgraded to version: \(pastVersionName == "" ? "builtin" : pastVersionName) for next start")
             print("\(self.implementation.TAG) Don't forget to trigger 'notifyAppReady()' in js code to validate a version.")
+            self.notifyListeners("updateFailed", data: ["version": curVersionName])
             implementation.sendStats(action: "revert", version: curVersionName)
             if (pastVersion != "" && pastVersionName != "") {
                 let res = implementation.set(version: pastVersion, versionName: pastVersionName)
@@ -364,7 +365,6 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
             UserDefaults.standard.set(curVersionName, forKey: "failingVersion")
             let res = implementation.delete(version: curVersion, versionName: curVersionName)
             if (res) {
-                self.notifyListeners("updateFailed", data: ["version": curVersionName])
                 print("\(self.implementation.TAG) Delete failing version: \(curVersionName)")
             }
         } else if (pastVersion != "") {