@capgo/capacitor-updater 6.4.1 → 6.6.4

package/README.md

@@ -591,6 +591,7 @@ setChannel(options: SetChannelOptions) => Promise<ChannelRes>
 Sets the channel for this device. The channel has to allow for self assignment for this to work.
 Do not use this method to set the channel at boot when `autoUpdate` is enabled in the {@link PluginsConfig}.
 This method is to set the channel after the app is ready.
+This methods send to Capgo backend a request to link the device ID to the channel. Capgo can accept or refuse depending of the setting of your channel.
 
 | Param         | Type                                                            | Description                                                                      |
 | ------------- | --------------------------------------------------------------- | -------------------------------------------------------------------------------- |

package/android/build.gradle

@@ -52,11 +52,12 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':capacitor-android')
     implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
-    implementation 'com.android.volley:volley:1.2.1'
+//     implementation 'com.android.volley:volley:1.2.1'
     implementation 'io.github.g00fy2:versioncompare:1.5.0'
     implementation 'com.google.code.gson:gson:2.11.0'
     testImplementation "junit:junit:$junitVersion"
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
     implementation 'org.brotli:dec:0.1.2'
+    implementation 'com.squareup.okhttp3:okhttp:4.12.0'
 }

package/android/src/main/java/ee/forgr/capacitor_updater/CapacitorUpdater.java

@@ -8,6 +8,7 @@ package ee.forgr.capacitor_updater;
 
 import static android.content.Context.RECEIVER_NOT_EXPORTED;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -18,14 +19,6 @@ import android.os.Build;
 import android.os.Bundle;
 import android.util.Base64;
 import android.util.Log;
-import com.android.volley.BuildConfig;
-import com.android.volley.DefaultRetryPolicy;
-import com.android.volley.NetworkResponse;
-import com.android.volley.Request;
-import com.android.volley.RequestQueue;
-import com.android.volley.VolleyError;
-import com.android.volley.toolbox.HttpHeaderParser;
-import com.android.volley.toolbox.JsonObjectRequest;
 import com.getcapacitor.JSObject;
 import com.getcapacitor.plugin.WebView;
 import java.io.BufferedInputStream;
@@ -37,7 +30,6 @@ import java.io.FileOutputStream;
 import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.security.GeneralSecurityException;
@@ -54,6 +46,7 @@ import java.util.zip.CRC32;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 import javax.crypto.SecretKey;
+import okhttp3.*;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -74,7 +67,7 @@ public class CapacitorUpdater {
   public SharedPreferences.Editor editor;
   public SharedPreferences prefs;
 
-  public RequestQueue requestQueue;
+  public OkHttpClient client;
 
   public File documentsDir;
   public Boolean directUpdate = false;
@@ -105,7 +98,13 @@ public class CapacitorUpdater {
   };
 
   private boolean isProd() {
-    return !BuildConfig.DEBUG;
+    try {
+      return !Objects.requireNonNull(getClass().getPackage())
+        .getName()
+        .contains(".debug");
+    } catch (Exception e) {
+      return true; // Default to production if we can't determine
+    }
   }
 
   private boolean isEmulator() {
@@ -252,6 +251,7 @@ public class CapacitorUpdater {
     sourceFile.delete();
   }
 
+  @SuppressLint("UnspecifiedRegisterReceiverFlag")
   public void onResume() {
     IntentFilter filter = new IntentFilter();
     filter.addAction(DownloadService.NOTIFICATION);
@@ -478,9 +478,15 @@ public class CapacitorUpdater {
     intent.putExtra(DownloadService.SESSIONKEY, sessionKey);
     intent.putExtra(DownloadService.CHECKSUM, checksum);
     if (manifest != null) {
-      intent.putExtra(DownloadService.MANIFEST, manifest.toString());
+      DataManager.getInstance().setManifest(manifest);
+      intent.putExtra(DownloadService.IS_MANIFEST, true);
+    }
+
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+      this.activity.startForegroundService(intent);
+    } else {
+      this.activity.startService(intent);
     }
-    this.activity.startService(intent);
   }
 
   private void downloadFile(
@@ -954,36 +960,65 @@ public class CapacitorUpdater {
     return json;
   }
 
-  private JsonObjectRequest setRetryPolicy(JsonObjectRequest request) {
-    request.setRetryPolicy(
-      new DefaultRetryPolicy(
-        this.timeout,
-        DefaultRetryPolicy.DEFAULT_MAX_RETRIES,
-        DefaultRetryPolicy.DEFAULT_BACKOFF_MULT
-      )
-    );
-    return request;
-  }
+  private void makeJsonRequest(
+    String url,
+    JSONObject jsonBody,
+    Callback callback
+  ) {
+    MediaType JSON = MediaType.get("application/json; charset=utf-8");
+    RequestBody body = RequestBody.create(jsonBody.toString(), JSON);
+
+    Request request = new Request.Builder().url(url).post(body).build();
+
+    client
+      .newCall(request)
+      .enqueue(
+        new okhttp3.Callback() {
+          @Override
+          public void onFailure(Call call, IOException e) {
+            JSObject retError = new JSObject();
+            retError.put("message", "Request failed: " + e.getMessage());
+            retError.put("error", "network_error");
+            callback.callback(retError);
+          }
 
-  private JSObject createError(String message, VolleyError error) {
-    NetworkResponse response = error.networkResponse;
-    final JSObject retError = new JSObject();
-    retError.put("error", "response_error");
-    if (response != null) {
-      try {
-        String json = new String(
-          response.data,
-          HttpHeaderParser.parseCharset(response.headers)
-        );
-        retError.put("message", message + ": " + json);
-      } catch (UnsupportedEncodingException e) {
-        retError.put("message", message + ": " + e);
-      }
-    } else {
-      retError.put("message", message + ": " + error);
-    }
-    Log.e(TAG, message + ": " + retError);
-    return retError;
+          @Override
+          public void onResponse(Call call, Response response)
+            throws IOException {
+            try (ResponseBody responseBody = response.body()) {
+              if (!response.isSuccessful()) {
+                JSObject retError = new JSObject();
+                retError.put("message", "Server error: " + response.code());
+                retError.put("error", "response_error");
+                callback.callback(retError);
+                return;
+              }
+
+              String responseData = responseBody.string();
+              JSONObject jsonResponse = new JSONObject(responseData);
+              JSObject ret = new JSObject();
+
+              Iterator<String> keys = jsonResponse.keys();
+              while (keys.hasNext()) {
+                String key = keys.next();
+                if (jsonResponse.has(key)) {
+                  if ("session_key".equals(key)) {
+                    ret.put("sessionKey", jsonResponse.get(key));
+                  } else {
+                    ret.put(key, jsonResponse.get(key));
+                  }
+                }
+              }
+              callback.callback(ret);
+            } catch (JSONException e) {
+              JSObject retError = new JSObject();
+              retError.put("message", "JSON parse error: " + e.getMessage());
+              retError.put("error", "parse_error");
+              callback.callback(retError);
+            }
+          }
+        }
+      );
   }
 
   public void getLatest(final String updateUrl, final Callback callback) {
@@ -992,7 +1027,6 @@ public class CapacitorUpdater {
       json = this.createInfoObject();
     } catch (JSONException e) {
       Log.e(TAG, "Error getLatest JSONException", e);
-      e.printStackTrace();
       final JSObject retError = new JSObject();
       retError.put("message", "Cannot get info: " + e);
       retError.put("error", "json_error");
@@ -1001,40 +1035,8 @@ public class CapacitorUpdater {
     }
 
     Log.i(CapacitorUpdater.TAG, "Auto-update parameters: " + json);
-    // Building a request
-    JsonObjectRequest request = new JsonObjectRequest(
-      Request.Method.POST,
-      updateUrl,
-      json,
-      res -> {
-        final JSObject ret = new JSObject();
-        Iterator<String> keys = res.keys();
-        while (keys.hasNext()) {
-          String key = keys.next();
-          if (res.has(key)) {
-            try {
-              if ("session_key".equals(key)) {
-                ret.put("sessionKey", res.get(key));
-              } else {
-                ret.put(key, res.get(key));
-              }
-            } catch (JSONException e) {
-              e.printStackTrace();
-              final JSObject retError = new JSObject();
-              retError.put("message", "Cannot set info: " + e);
-              retError.put("error", "response_error");
-              callback.callback(retError);
-            }
-          }
-        }
-        callback.callback(ret);
-      },
-      error ->
-        callback.callback(
-          CapacitorUpdater.this.createError("Error get latest", error)
-        )
-    );
-    this.requestQueue.add(setRetryPolicy(request));
+
+    makeJsonRequest(updateUrl, json, callback);
   }
 
   public void unsetChannel(final Callback callback) {
@@ -1052,44 +1054,66 @@ public class CapacitorUpdater {
       json = this.createInfoObject();
     } catch (JSONException e) {
       Log.e(TAG, "Error unsetChannel JSONException", e);
-      e.printStackTrace();
       final JSObject retError = new JSObject();
       retError.put("message", "Cannot get info: " + e);
       retError.put("error", "json_error");
       callback.callback(retError);
       return;
     }
-    // Building a request
-    JsonObjectRequest request = new JsonObjectRequest(
-      Request.Method.DELETE,
-      channelUrl,
-      json,
-      res -> {
-        final JSObject ret = new JSObject();
-        Iterator<String> keys = res.keys();
-        while (keys.hasNext()) {
-          String key = keys.next();
-          if (res.has(key)) {
-            try {
-              ret.put(key, res.get(key));
-            } catch (JSONException e) {
-              e.printStackTrace();
-              final JSObject retError = new JSObject();
-              retError.put("message", "Cannot unset channel: " + e);
-              retError.put("error", "response_error");
+
+    Request request = new Request.Builder()
+      .url(channelUrl)
+      .delete(
+        RequestBody.create(json.toString(), MediaType.get("application/json"))
+      )
+      .build();
+
+    client
+      .newCall(request)
+      .enqueue(
+        new okhttp3.Callback() {
+          @Override
+          public void onFailure(Call call, IOException e) {
+            JSObject retError = new JSObject();
+            retError.put("message", "Request failed: " + e.getMessage());
+            retError.put("error", "network_error");
+            callback.callback(retError);
+          }
+
+          @Override
+          public void onResponse(Call call, Response response)
+            throws IOException {
+            try (ResponseBody responseBody = response.body()) {
+              if (!response.isSuccessful()) {
+                JSObject retError = new JSObject();
+                retError.put("message", "Server error: " + response.code());
+                retError.put("error", "response_error");
+                callback.callback(retError);
+                return;
+              }
+
+              String responseData = responseBody.string();
+              JSONObject jsonResponse = new JSONObject(responseData);
+              JSObject ret = new JSObject();
+
+              Iterator<String> keys = jsonResponse.keys();
+              while (keys.hasNext()) {
+                String key = keys.next();
+                if (jsonResponse.has(key)) {
+                  ret.put(key, jsonResponse.get(key));
+                }
+              }
+              Log.i(TAG, "Channel unset");
               callback.callback(ret);
+            } catch (JSONException e) {
+              JSObject retError = new JSObject();
+              retError.put("message", "JSON parse error: " + e.getMessage());
+              retError.put("error", "parse_error");
+              callback.callback(retError);
             }
           }
         }
-        Log.i(TAG, "Channel unset");
-        callback.callback(ret);
-      },
-      error ->
-        callback.callback(
-          CapacitorUpdater.this.createError("Error unset channel", error)
-        )
-    );
-    this.requestQueue.add(setRetryPolicy(request));
+      );
   }
 
   public void setChannel(final String channel, final Callback callback) {
@@ -1108,44 +1132,14 @@ public class CapacitorUpdater {
       json.put("channel", channel);
     } catch (JSONException e) {
       Log.e(TAG, "Error setChannel JSONException", e);
-      e.printStackTrace();
       final JSObject retError = new JSObject();
       retError.put("message", "Cannot get info: " + e);
       retError.put("error", "json_error");
       callback.callback(retError);
       return;
     }
-    // Building a request
-    JsonObjectRequest request = new JsonObjectRequest(
-      Request.Method.POST,
-      channelUrl,
-      json,
-      res -> {
-        final JSObject ret = new JSObject();
-        Iterator<String> keys = res.keys();
-        while (keys.hasNext()) {
-          String key = keys.next();
-          if (res.has(key)) {
-            try {
-              ret.put(key, res.get(key));
-            } catch (JSONException e) {
-              e.printStackTrace();
-              final JSObject retError = new JSObject();
-              retError.put("message", "Cannot set channel: " + e);
-              retError.put("error", "response_error");
-              callback.callback(ret);
-            }
-          }
-        }
-        Log.i(TAG, "Channel set to \"" + channel);
-        callback.callback(ret);
-      },
-      error ->
-        callback.callback(
-          CapacitorUpdater.this.createError("Error set channel", error)
-        )
-    );
-    this.requestQueue.add(setRetryPolicy(request));
+
+    makeJsonRequest(channelUrl, json, callback);
   }
 
   public void getChannel(final Callback callback) {
@@ -1163,62 +1157,81 @@ public class CapacitorUpdater {
       json = this.createInfoObject();
     } catch (JSONException e) {
       Log.e(TAG, "Error getChannel JSONException", e);
-      e.printStackTrace();
       final JSObject retError = new JSObject();
       retError.put("message", "Cannot get info: " + e);
       retError.put("error", "json_error");
       callback.callback(retError);
       return;
     }
-    // Building a request
-    JsonObjectRequest request = new JsonObjectRequest(
-      Request.Method.PUT,
-      channelUrl,
-      json,
-      res -> {
-        final JSObject ret = new JSObject();
-        Iterator<String> keys = res.keys();
-        while (keys.hasNext()) {
-          String key = keys.next();
-          if (res.has(key)) {
-            try {
-              ret.put(key, res.get(key));
-            } catch (JSONException e) {
-              e.printStackTrace();
-            }
+
+    Request request = new Request.Builder()
+      .url(channelUrl)
+      .put(
+        RequestBody.create(json.toString(), MediaType.get("application/json"))
+      )
+      .build();
+
+    client
+      .newCall(request)
+      .enqueue(
+        new okhttp3.Callback() {
+          @Override
+          public void onFailure(Call call, IOException e) {
+            JSObject retError = new JSObject();
+            retError.put("message", "Request failed: " + e.getMessage());
+            retError.put("error", "network_error");
+            callback.callback(retError);
           }
-        }
-        Log.i(TAG, "Channel get to \"" + ret);
-        callback.callback(ret);
-      },
-      error -> {
-        try {
-          if (error.networkResponse.statusCode == 400) {
-            String data = new String(
-              error.networkResponse.data,
-              HttpHeaderParser.parseCharset(error.networkResponse.headers)
-            );
-            if (
-              data.contains("channel_not_found") &&
-              !this.defaultChannel.isEmpty()
-            ) {
-              final JSObject ret = new JSObject();
-              ret.put("channel", this.defaultChannel);
-              ret.put("status", "default");
+
+          @Override
+          public void onResponse(Call call, Response response)
+            throws IOException {
+            try (ResponseBody responseBody = response.body()) {
+              if (response.code() == 400) {
+                String data = responseBody.string();
+                if (
+                  data.contains("channel_not_found") &&
+                  !defaultChannel.isEmpty()
+                ) {
+                  JSObject ret = new JSObject();
+                  ret.put("channel", defaultChannel);
+                  ret.put("status", "default");
+                  Log.i(TAG, "Channel get to \"" + ret);
+                  callback.callback(ret);
+                  return;
+                }
+              }
+
+              if (!response.isSuccessful()) {
+                JSObject retError = new JSObject();
+                retError.put("message", "Server error: " + response.code());
+                retError.put("error", "response_error");
+                callback.callback(retError);
+                return;
+              }
+
+              String responseData = responseBody.string();
+              JSONObject jsonResponse = new JSONObject(responseData);
+              JSObject ret = new JSObject();
+
+              Iterator<String> keys = jsonResponse.keys();
+              while (keys.hasNext()) {
+                String key = keys.next();
+                if (jsonResponse.has(key)) {
+                  ret.put(key, jsonResponse.get(key));
+                }
+              }
               Log.i(TAG, "Channel get to \"" + ret);
               callback.callback(ret);
-              return;
+            } catch (JSONException e) {
+              JSObject retError = new JSObject();
+              retError.put("message", "JSON parse error: " + e.getMessage());
+              retError.put("error", "parse_error");
+              callback.callback(retError);
             }
           }
-        } catch (Throwable t) {
-          // ignore
         }
-        callback.callback(
-          CapacitorUpdater.this.createError("Error get channel", error)
-        );
-      }
-    );
-    this.requestQueue.add(setRetryPolicy(request));
+      );
   }
 
   public void sendStats(final String action) {
@@ -1246,19 +1259,39 @@ public class CapacitorUpdater {
       json.put("action", action);
     } catch (JSONException e) {
       Log.e(TAG, "Error sendStats JSONException", e);
-      e.printStackTrace();
       return;
     }
-    // Building a request
-    JsonObjectRequest request = new JsonObjectRequest(
-      Request.Method.POST,
-      statsUrl,
-      json,
-      response ->
-        Log.i(TAG, "Stats send for \"" + action + "\", version " + versionName),
-      error -> CapacitorUpdater.this.createError("Error send stats", error)
-    );
-    this.requestQueue.add(setRetryPolicy(request));
+
+    Request request = new Request.Builder()
+      .url(statsUrl)
+      .post(
+        RequestBody.create(json.toString(), MediaType.get("application/json"))
+      )
+      .build();
+
+    client
+      .newCall(request)
+      .enqueue(
+        new okhttp3.Callback() {
+          @Override
+          public void onFailure(Call call, IOException e) {
+            Log.e(TAG, "Failed to send stats: " + e.getMessage());
+          }
+
+          @Override
+          public void onResponse(Call call, Response response)
+            throws IOException {
+            if (response.isSuccessful()) {
+              Log.i(
+                TAG,
+                "Stats send for \"" + action + "\", version " + versionName
+              );
+            } else {
+              Log.e(TAG, "Error sending stats: " + response.code());
+            }
+          }
+        }
+      );
   }
 
   public BundleInfo getBundleInfo(final String id) {

package/android/src/main/java/ee/forgr/capacitor_updater/CapacitorUpdaterPlugin.java

@@ -14,7 +14,6 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.util.Log;
-import com.android.volley.toolbox.Volley;
 import com.getcapacitor.CapConfig;
 import com.getcapacitor.JSArray;
 import com.getcapacitor.JSObject;
@@ -32,6 +31,7 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
@@ -42,6 +42,8 @@ import java.util.UUID;
 import java.util.concurrent.Phaser;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
+import okhttp3.OkHttpClient;
+import okhttp3.Protocol;
 import org.json.JSONArray;
 import org.json.JSONException;
 
@@ -55,7 +57,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
   private static final String channelUrlDefault =
     "https://plugin.capgo.app/channel_self";
 
-  private final String PLUGIN_VERSION = "6.4.1";
+  private final String PLUGIN_VERSION = "6.6.4";
   private static final String DELAY_CONDITION_PREFERENCES = "";
 
   private SharedPreferences.Editor editor;
@@ -136,9 +138,12 @@ public class CapacitorUpdaterPlugin extends Plugin {
         .getString("version", pInfo.versionName);
       this.implementation.PLUGIN_VERSION = this.PLUGIN_VERSION;
       this.implementation.versionCode = Integer.toString(pInfo.versionCode);
-      this.implementation.requestQueue = Volley.newRequestQueue(
-        this.getContext()
-      );
+      this.implementation.client = new OkHttpClient.Builder()
+        .protocols(Arrays.asList(Protocol.HTTP_2, Protocol.HTTP_1_1))
+        .connectTimeout(this.implementation.timeout, TimeUnit.MILLISECONDS)
+        .readTimeout(this.implementation.timeout, TimeUnit.MILLISECONDS)
+        .writeTimeout(this.implementation.timeout, TimeUnit.MILLISECONDS)
+        .build();
 
       this.implementation.directUpdate = this.getConfig()
         .getBoolean("directUpdate", false);
@@ -224,9 +229,8 @@ public class CapacitorUpdaterPlugin extends Plugin {
     this.updateUrl = this.getConfig().getString("updateUrl", updateUrlDefault);
     this.autoUpdate = this.getConfig().getBoolean("autoUpdate", true);
     this.appReadyTimeout = this.getConfig().getInt("appReadyTimeout", 10000);
-    this.implementation.timeout = this.getConfig()
-      .getInt("responseTimeout", 20) *
-    1000;
+    this.implementation.timeout =
+      this.getConfig().getInt("responseTimeout", 20) * 1000;
     boolean resetWhenUpdate =
       this.getConfig().getBoolean("resetWhenUpdate", true);
 
@@ -1107,7 +1111,15 @@ public class CapacitorUpdaterPlugin extends Plugin {
     Boolean error
   ) {
     if (error) {
-      Log.i(CapacitorUpdater.TAG, "endBackGroundTaskWithNotif error" + error);
+      Log.i(
+        CapacitorUpdater.TAG,
+        "endBackGroundTaskWithNotif error: " +
+        error +
+        " current: " +
+        current.getVersionName() +
+        "latestVersionName: " +
+        latestVersionName
+      );
       this.implementation.sendStats("download_fail", current.getVersionName());
       final JSObject ret = new JSObject();
       ret.put("version", latestVersionName);

package/android/src/main/java/ee/forgr/capacitor_updater/DataManager.java

@@ -0,0 +1,28 @@
+package ee.forgr.capacitor_updater;
+
+import org.json.JSONArray;
+
+public class DataManager {
+
+  private static DataManager instance;
+  private JSONArray currentManifest;
+
+  private DataManager() {}
+
+  public static synchronized DataManager getInstance() {
+    if (instance == null) {
+      instance = new DataManager();
+    }
+    return instance;
+  }
+
+  public void setManifest(JSONArray manifest) {
+    this.currentManifest = manifest;
+  }
+
+  public JSONArray getAndClearManifest() {
+    JSONArray manifest = this.currentManifest;
+    this.currentManifest = null;
+    return manifest;
+  }
+}