@blueid/access-capacitor 1.9.0 → 1.18.0

package/android/build.gradle

@@ -11,7 +11,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.3.0'
+        classpath 'com.android.tools.build:gradle:8.0.2'
     }
 }
 
@@ -21,7 +21,7 @@ android {
     namespace "com.blueid.access.plugins.capacitor"
     compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 34
     defaultConfig {
-        minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 31
+        minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 30
         targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 34
         versionCode 1
         versionName "1.0"
@@ -45,14 +45,12 @@ android {
 repositories {
     google()
     mavenCentral()
-    maven { url "./repo" }
 }
 
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':capacitor-android')
-    implementation ('net.blueid:access:5.0@aar'){transitive=true}
     implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
     testImplementation "junit:junit:$junitVersion"
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"

package/android/repo/net/blueid/access/5.0/access-5.0-sources.jar.md5

@@ -1 +1 @@
-18ac210aab39615bf718ca3ec0f887b9
+4b5b566ab76c364fc8e7c24c410a40f2

package/android/repo/net/blueid/access/5.0/access-5.0-sources.jar.sha1

@@ -1 +1 @@
-5ddbc9fa3edb060233672058f9ee80005c3ff514
+f7e210c54fe9b23e72d7f3c88f0a8ebfa54a106b

package/android/repo/net/blueid/access/5.0/access-5.0-sources.jar.sha256

@@ -1 +1 @@
-ddd301c194b4976df4366b8ce07b4bc074bcf34e8b5edf2a7b71e46cea6b6abd
+ac3c7a633e9a446177b1100e8fcaf14c94681c0860f7c4cf8da7a031435c23fe

package/android/repo/net/blueid/access/5.0/access-5.0-sources.jar.sha512

@@ -1 +1 @@
-9a99bf35d80ebd0443e0c41e9a7d4dbc425e522706b3626a7491037837bcc379af4b96f206536013160d59f26d95bea0d3e3c0780e2fcb362a5539d58d76a913
+0fdaabbae28e381782bce56de50e0869e13d6144397ff03af368de0d85c46efe4f393369c796ee9206a0667a6b1ac1d9eca4ecc60d365810b4d63a8ded6c8155

package/android/repo/net/blueid/access/5.0/access-5.0.aar.md5

@@ -1 +1 @@
-1a0ab00667ec0c01cc7afd9289231a74
+edbcee983ca076d05b3abd2da31bf74a

package/android/repo/net/blueid/access/5.0/access-5.0.aar.sha1

@@ -1 +1 @@
-489dbf98951ea0befe602e0b80d4ac3bc81cb7be
+3e4877787d664c9f2cdd11ec4107f0c728b71dd1

package/android/repo/net/blueid/access/5.0/access-5.0.aar.sha256

@@ -1 +1 @@
-3f463d686f3b7b2a58924418ed198926a6f54efbb9cc27d91293596936438ee5
+50447fd265c245f097093bc8499ba54499b2c423690425c39ad42a4b2bc80b4b

package/android/repo/net/blueid/access/5.0/access-5.0.aar.sha512

@@ -1 +1 @@
-fce25405a2fa3f6d85849e706a0000aef13a7440874267cf1ebcb9a8d279feb15d75c2fc90143464a8f745f590b878738cba3c6e4936eb2b968a3aed02478e2d
+cd7a9541338e24ae60642b7d190acaa96361c3a0e9deb2d4e3ab935a7351d513b2e23c3741e7fb94fc407ac8c2f5d3ba8018ca2020c4740a59d6bdb9aaf4e21c

package/android/repo/net/blueid/access/5.0/access-5.0.module

@@ -34,11 +34,11 @@
         {
           "name": "access-5.0.aar",
           "url": "access-5.0.aar",
-          "size": 2563011,
-          "sha512": "fce25405a2fa3f6d85849e706a0000aef13a7440874267cf1ebcb9a8d279feb15d75c2fc90143464a8f745f590b878738cba3c6e4936eb2b968a3aed02478e2d",
-          "sha256": "3f463d686f3b7b2a58924418ed198926a6f54efbb9cc27d91293596936438ee5",
-          "sha1": "489dbf98951ea0befe602e0b80d4ac3bc81cb7be",
-          "md5": "1a0ab00667ec0c01cc7afd9289231a74"
+          "size": 2758664,
+          "sha512": "cd7a9541338e24ae60642b7d190acaa96361c3a0e9deb2d4e3ab935a7351d513b2e23c3741e7fb94fc407ac8c2f5d3ba8018ca2020c4740a59d6bdb9aaf4e21c",
+          "sha256": "50447fd265c245f097093bc8499ba54499b2c423690425c39ad42a4b2bc80b4b",
+          "sha1": "3e4877787d664c9f2cdd11ec4107f0c728b71dd1",
+          "md5": "edbcee983ca076d05b3abd2da31bf74a"
         }
       ]
     },
@@ -57,6 +57,13 @@
             "requires": "2.6.1"
           }
         },
+        {
+          "group": "com.google.android.material",
+          "module": "material",
+          "version": {
+            "requires": "1.11.0"
+          }
+        },
         {
           "group": "androidx.room",
           "module": "room-ktx",
@@ -64,6 +71,13 @@
             "requires": "2.6.1"
           }
         },
+        {
+          "group": "androidx.appcompat",
+          "module": "appcompat",
+          "version": {
+            "requires": "1.6.1"
+          }
+        },
         {
           "group": "com.squareup.retrofit2",
           "module": "retrofit",
@@ -209,11 +223,11 @@
         {
           "name": "access-5.0.aar",
           "url": "access-5.0.aar",
-          "size": 2563011,
-          "sha512": "fce25405a2fa3f6d85849e706a0000aef13a7440874267cf1ebcb9a8d279feb15d75c2fc90143464a8f745f590b878738cba3c6e4936eb2b968a3aed02478e2d",
-          "sha256": "3f463d686f3b7b2a58924418ed198926a6f54efbb9cc27d91293596936438ee5",
-          "sha1": "489dbf98951ea0befe602e0b80d4ac3bc81cb7be",
-          "md5": "1a0ab00667ec0c01cc7afd9289231a74"
+          "size": 2758664,
+          "sha512": "cd7a9541338e24ae60642b7d190acaa96361c3a0e9deb2d4e3ab935a7351d513b2e23c3741e7fb94fc407ac8c2f5d3ba8018ca2020c4740a59d6bdb9aaf4e21c",
+          "sha256": "50447fd265c245f097093bc8499ba54499b2c423690425c39ad42a4b2bc80b4b",
+          "sha1": "3e4877787d664c9f2cdd11ec4107f0c728b71dd1",
+          "md5": "edbcee983ca076d05b3abd2da31bf74a"
         }
       ]
     },
@@ -231,11 +245,11 @@
         {
           "name": "access-5.0-sources.jar",
           "url": "access-5.0-sources.jar",
-          "size": 888014,
-          "sha512": "9a99bf35d80ebd0443e0c41e9a7d4dbc425e522706b3626a7491037837bcc379af4b96f206536013160d59f26d95bea0d3e3c0780e2fcb362a5539d58d76a913",
-          "sha256": "ddd301c194b4976df4366b8ce07b4bc074bcf34e8b5edf2a7b71e46cea6b6abd",
-          "sha1": "5ddbc9fa3edb060233672058f9ee80005c3ff514",
-          "md5": "18ac210aab39615bf718ca3ec0f887b9"
+          "size": 909298,
+          "sha512": "0fdaabbae28e381782bce56de50e0869e13d6144397ff03af368de0d85c46efe4f393369c796ee9206a0667a6b1ac1d9eca4ecc60d365810b4d63a8ded6c8155",
+          "sha256": "ac3c7a633e9a446177b1100e8fcaf14c94681c0860f7c4cf8da7a031435c23fe",
+          "sha1": "f7e210c54fe9b23e72d7f3c88f0a8ebfa54a106b",
+          "md5": "4b5b566ab76c364fc8e7c24c410a40f2"
         }
       ]
     }

package/android/repo/net/blueid/access/5.0/access-5.0.module.md5

@@ -1 +1 @@
-39e8e045dfb99ebf6b6ac9ac0214fe43
+999f39fedb83ceb690d310dad99e6cbb

package/android/repo/net/blueid/access/5.0/access-5.0.module.sha1

@@ -1 +1 @@
-437431cc747f12cc9ab84282a6b26413d1a448ac
+d5c21392c1e9c947d19d2c84809c2b1d9110b82b

package/android/repo/net/blueid/access/5.0/access-5.0.module.sha256

@@ -1 +1 @@
-89b8694d76a34c6dd7d3675d67d58bf48f966c55d57c9db4688fd3ffcc43e733
+c0f5695efbbc71887d2fcab844ca968a53acada73b04ea0e3c32cf233913683b

package/android/repo/net/blueid/access/5.0/access-5.0.module.sha512

@@ -1 +1 @@
-192bf42cfb2d9b74924c67acd14a55cf6c577058f774a437910b10932dca86028c1fad308c83a81435c75734a1b0b4bbfcd32a8c6efdd580aaed8380d81921e2
+7bea45c6bd4f5a98ef58ca4916f50158ef082c94098036ebcfcb373342c7e2ca53d27b4f5508caf2b9a1e81475bba6a021ce763af106375937de2ce051746673

package/android/repo/net/blueid/access/5.0/access-5.0.pom

@@ -24,12 +24,24 @@
       <version>2.6.1</version>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>com.google.android.material</groupId>
+      <artifactId>material</artifactId>
+      <version>1.11.0</version>
+      <scope>runtime</scope>
+    </dependency>
     <dependency>
       <groupId>androidx.room</groupId>
       <artifactId>room-ktx</artifactId>
       <version>2.6.1</version>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>androidx.appcompat</groupId>
+      <artifactId>appcompat</artifactId>
+      <version>1.6.1</version>
+      <scope>runtime</scope>
+    </dependency>
     <dependency>
       <groupId>com.squareup.retrofit2</groupId>
       <artifactId>retrofit</artifactId>

package/android/repo/net/blueid/access/5.0/access-5.0.pom.md5

@@ -1 +1 @@
-0036f3c0d826d30dbabe2b982f19a18b
+26d0c37a2afe7471ed9c163d273a5044

package/android/repo/net/blueid/access/5.0/access-5.0.pom.sha1

@@ -1 +1 @@
-8ad9fd25e1597eda59eda04233b3be59191b148f
+1253640f192cb2cbcf4627f23675bd55907a689c

package/android/repo/net/blueid/access/5.0/access-5.0.pom.sha256

@@ -1 +1 @@
-39883b8df1511353495fc9c828a962d8ff9460200432e1f678c090ebac8d9b8c
+a00b32a36f20cbe58f6e27c593e890f75c9dc1d3f9d8851ebb8d5e1b13917b98

package/android/repo/net/blueid/access/5.0/access-5.0.pom.sha512

@@ -1 +1 @@
-891b93fa0f6adf22a65fc16a8e74b494bcd1ba43fe10508c5f94b60c8653c4a714fd30c085d66687ef8633822f3076de386bc4c7c4287dd187e12d5e1eae4c67
+0133f4e1be80d72dd5bf167c7c78bd2324b26eeba79f76f99c21835926c9dbdb69f7205abf1158c3fcc8455b669a585f1d8f53b97d2fb625e418d6b2b3bbb0b1

package/android/repo/net/blueid/access/maven-metadata.xml

@@ -8,6 +8,6 @@
     <versions>
       <version>5.0</version>
     </versions>
-    <lastUpdated>20240402213843</lastUpdated>
+    <lastUpdated>20240408201106</lastUpdated>
   </versioning>
 </metadata>

package/android/repo/net/blueid/access/maven-metadata.xml.md5

@@ -1 +1 @@
-01b5bfc1bac6e8a861cacdb03d00fd45
+fea20cb8b72b0378c243a5a9c0fd454a

package/android/repo/net/blueid/access/maven-metadata.xml.sha1

@@ -1 +1 @@
-839977e11b6f8cb24ead1b2fa014fe1c08bb3773
+82cb355b18e8f1dddc59c5816acf3a66bd7fc316

package/android/repo/net/blueid/access/maven-metadata.xml.sha256

@@ -1 +1 @@
-474b0aee3c623b3c393e35ad9c8a8a8bd6155414ce2e29c58bf06b930e50725c
+92b220235d1e6ba2b23ab3adb78c685fd26a390231ff13f7fd7f039a137ac022

package/android/repo/net/blueid/access/maven-metadata.xml.sha512

@@ -1 +1 @@
-0c858c1a5849523a1a79a818e973d1c06cc00345f5b2c74baab0fab722fb33055d3f42507ef6a4d39965f2e53628c5ad3e07ab29c8e2a36eaf1e955947c82d58
+a115da1464fabf791c63c790eb4655569322fcf5a4e3e67e3527c160d72fc51dbeba70d59b7d9028fa79150e524c84951aad1f84c6ff85fd14b2426208c35070

package/android/src/main/java/com/blueid/access/plugins/capacitor/BlueIDAccess.java

@@ -1,53 +1,11 @@
 package com.blueid.access.plugins.capacitor;
 
-import android.app.Application;
-import android.content.Context;
 import android.util.Log;
-import android.widget.Toast;
-
-import com.getcapacitor.App;
-
-import java.util.Map;
-
-import blueid.access.sdk.BluePlugin;
-import blueid.access.sdk.Sdk;
-import kotlin.jvm.functions.Function1;
-
 
 public class BlueIDAccess {
 
-    Sdk sdk;
-
-    private static BlueIDAccess instance = null;
-    private static BluePlugin plugin = null;
-    private final Application application;
-
-    private BlueIDAccess(Application application) {
-        this.application = application;
-        Log.i("Capacitor:", "BlueIDAccess Loaded "+application.getPackageName());
-        sdk = Sdk.INSTANCE;
-        sdk.init(application);
-        plugin = new BluePlugin();
-    }
-
-    public static BlueIDAccess getInstance(Application context) {
-
-        if (instance == null) {
-
-            instance = new BlueIDAccess(context);
-        }
-
-        return instance;
-    }
-
     public String echo(String value) {
-        Toast.makeText(application, "Echo "+value, Toast.LENGTH_SHORT).show();
+        Log.i("Echo", value);
         return value;
     }
-
-    public void runCommand(String command, Object arg0, Object arg1, Object arg2, Function1<Map<String, ? extends Object>, Void> resolve,
-                              Function1<Map<String, ? extends Object>, Void> reject) {
-
-        plugin.runCommand(command, arg0, arg1, arg2, resolve, reject);
-    }
 }

package/android/src/main/java/com/blueid/access/plugins/capacitor/BlueIDAccessPlugin.java

@@ -1,40 +1,15 @@
 package com.blueid.access.plugins.capacitor;
 
-import android.app.Application;
-import android.content.Context;
-import android.util.Log;
-
 import com.getcapacitor.JSObject;
 import com.getcapacitor.Plugin;
 import com.getcapacitor.PluginCall;
 import com.getcapacitor.PluginMethod;
 import com.getcapacitor.annotation.CapacitorPlugin;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.Map;
-
-import blueid.access.sdk.core.BlueError;
-import blueid.access.sdk.pb.BlueCore;
-import kotlin.jvm.functions.Function1;
-
 @CapacitorPlugin(name = "BlueIDAccess")
 public class BlueIDAccessPlugin extends Plugin {
 
-    private BlueIDAccess implementation;
-
-      @Override
-    public void load() {
-        super.load();
-
-        Application appInstance = (Application) getContext().getApplicationContext();
-        implementation =  BlueIDAccess.getInstance(appInstance);
-
-        Log.i("Capacitor:", "BlueIDAccessPlugin Loaded "+appInstance.getPackageName());
-    }
-
-
+    private BlueIDAccess implementation = new BlueIDAccess();
 
     @PluginMethod
     public void echo(PluginCall call) {
@@ -44,65 +19,4 @@ public class BlueIDAccessPlugin extends Plugin {
         ret.put("value", implementation.echo(value));
         call.resolve(ret);
     }
-
-    @PluginMethod
-    public void runCommand(PluginCall call) {
-
-        String command = call.getString("command");
-
-        if (command == null || command.isEmpty()) {
-            call.reject("Missing or invalid command");
-            return;
-        }
-
-        Object arg0 = null, arg1 = null, arg2 = null;
-
-        try {
-            arg0 = call.getData().get("arg0");
-            arg1 = call.getData().get("arg1");
-            arg2 = call.getData().get("arg2");
-        } catch (JSONException e) {
-            call.reject(e.getMessage());
-        }
-
-
-        Log.i("AndroidCapacitor:", "data: "+call.getData());
-
-        if (arg0 != null && arg0.toString().equals("null")){ // this is so important don't remove this
-            arg0 = null;
-        }
-        if (arg1 != null && arg1.toString().equals("null")){ // this is so important don't remove this
-            arg1 = null;
-        }
-        if (arg2 != null && arg2.toString().equals("null")){ // this is so important don't remove this
-            arg2 = null;
-        }
-
-
-        implementation.runCommand(command, arg0, arg1, arg2, stringObjectMap -> {
-
-            if (stringObjectMap != null) {
-                JSONObject result = new JSONObject(stringObjectMap);
-
-                try {
-                    call.resolve(JSObject.fromJSONObject(result));
-                } catch (JSONException e) {
-                    throw new RuntimeException(e);
-                }
-            }else{
-                call.resolve();
-            }
-            return null;
-        }, stringObjectMap -> {
-
-            Object value = stringObjectMap.get("message");
-            String errorMsg = value instanceof String ? (String) value : "Unknown_error";
-
-            Object error = stringObjectMap.get("error");
-
-            int errorValue = (int) (error instanceof Integer ? error : -1);
-            call.reject(errorMsg, String.valueOf(errorValue));
-            return null;
-        });
-    }
 }

package/dist/esm/BlueSystem_pb.d.ts

@@ -450,6 +450,39 @@ export declare class BlueSystemProvisioning extends Message<BlueSystemProvisioni
     static fromJsonString(jsonString: string, options?: Partial<JsonReadOptions>): BlueSystemProvisioning;
     static equals(a: BlueSystemProvisioning | PlainMessage<BlueSystemProvisioning> | undefined, b: BlueSystemProvisioning | PlainMessage<BlueSystemProvisioning> | undefined): boolean;
 }
+/**
+ * @generated from message BlueHardwareInfo
+ */
+export declare class BlueHardwareInfo extends Message<BlueHardwareInfo> {
+    /**
+     * @generated from field: required string name = 1;
+     */
+    name?: string;
+    /**
+     * @generated from field: required string vendor = 2;
+     */
+    vendor?: string;
+    /**
+     * @generated from field: required string vendorName = 3;
+     */
+    vendorName?: string;
+    /**
+     * @generated from field: required uint32 version = 4;
+     */
+    version?: number;
+    /**
+     * @generated from field: required BlueHardwareType type = 5;
+     */
+    type?: BlueHardwareType;
+    constructor(data?: PartialMessage<BlueHardwareInfo>);
+    static readonly runtime: typeof proto2;
+    static readonly typeName = "BlueHardwareInfo";
+    static readonly fields: FieldList;
+    static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): BlueHardwareInfo;
+    static fromJson(jsonValue: JsonValue, options?: Partial<JsonReadOptions>): BlueHardwareInfo;
+    static fromJsonString(jsonString: string, options?: Partial<JsonReadOptions>): BlueHardwareInfo;
+    static equals(a: BlueHardwareInfo | PlainMessage<BlueHardwareInfo> | undefined, b: BlueHardwareInfo | PlainMessage<BlueHardwareInfo> | undefined): boolean;
+}
 /**
  * @generated from message BlueSystemStatus
  */
@@ -504,6 +537,14 @@ export declare class BlueSystemStatus extends Message<BlueSystemStatus> {
      * @generated from field: optional bool newTestFirmwareVersionAvailable = 12;
      */
     newTestFirmwareVersionAvailable?: boolean;
+    /**
+     * @generated from field: optional bool newConfigurationAvailable = 13;
+     */
+    newConfigurationAvailable?: boolean;
+    /**
+     * @generated from field: optional BlueHardwareInfo hardwareInfo = 14;
+     */
+    hardwareInfo?: BlueHardwareInfo;
     constructor(data?: PartialMessage<BlueSystemStatus>);
     static readonly runtime: typeof proto2;
     static readonly typeName = "BlueSystemStatus";

package/dist/esm/BlueSystem_pb.js

@@ -372,6 +372,36 @@ BlueSystemProvisioning.fields = proto2.util.newFieldList(() => [
     { no: 4, name: "terminalPrivateKey", kind: "scalar", T: 12 /* ScalarType.BYTES */ },
     { no: 5, name: "signaturePublicKey", kind: "scalar", T: 12 /* ScalarType.BYTES */ },
 ]);
+/**
+ * @generated from message BlueHardwareInfo
+ */
+export class BlueHardwareInfo extends Message {
+    constructor(data) {
+        super();
+        proto2.util.initPartial(data, this);
+    }
+    static fromBinary(bytes, options) {
+        return new BlueHardwareInfo().fromBinary(bytes, options);
+    }
+    static fromJson(jsonValue, options) {
+        return new BlueHardwareInfo().fromJson(jsonValue, options);
+    }
+    static fromJsonString(jsonString, options) {
+        return new BlueHardwareInfo().fromJsonString(jsonString, options);
+    }
+    static equals(a, b) {
+        return proto2.util.equals(BlueHardwareInfo, a, b);
+    }
+}
+BlueHardwareInfo.runtime = proto2;
+BlueHardwareInfo.typeName = "BlueHardwareInfo";
+BlueHardwareInfo.fields = proto2.util.newFieldList(() => [
+    { no: 1, name: "name", kind: "scalar", T: 9 /* ScalarType.STRING */ },
+    { no: 2, name: "vendor", kind: "scalar", T: 9 /* ScalarType.STRING */ },
+    { no: 3, name: "vendorName", kind: "scalar", T: 9 /* ScalarType.STRING */ },
+    { no: 4, name: "version", kind: "scalar", T: 13 /* ScalarType.UINT32 */ },
+    { no: 5, name: "type", kind: "enum", T: proto2.getEnumType(BlueHardwareType) },
+]);
 /**
  * @generated from message BlueSystemStatus
  */
@@ -408,6 +438,8 @@ BlueSystemStatus.fields = proto2.util.newFieldList(() => [
     { no: 10, name: "applicationVersionTest", kind: "scalar", T: 13 /* ScalarType.UINT32 */, opt: true },
     { no: 11, name: "newFirmwareVersionAvailable", kind: "scalar", T: 8 /* ScalarType.BOOL */, opt: true },
     { no: 12, name: "newTestFirmwareVersionAvailable", kind: "scalar", T: 8 /* ScalarType.BOOL */, opt: true },
+    { no: 13, name: "newConfigurationAvailable", kind: "scalar", T: 8 /* ScalarType.BOOL */, opt: true },
+    { no: 14, name: "hardwareInfo", kind: "message", T: BlueHardwareInfo, opt: true },
 ]);
 /**
  * @generated from message BlueSystemLogQuery