Merge pull request #31 from Keyri-Co/releases/1.7.2

Fixed sendEvent on Android
Keyri-Co · Mar 8, 2024 · f1c4e4a · f1c4e4a
2 parents dfcab7e + 0051f72
commit f1c4e4a
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 4 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -7,4 +7,6 @@ on:
 
 jobs:
   publish:
+    permissions:
+      id-token: write
     uses: dart-lang/setup-dart/.github/workflows/publish.yml@v1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.7.2
+
+- Fixed `sendEvent` issue on Android
+
 ## 1.7.1
 
 - Updated Android SDK

diff --git a/android/src/main/kotlin/com/keyrico/keyri/KeyriPlugin.kt b/android/src/main/kotlin/com/keyrico/keyri/KeyriPlugin.kt
@@ -28,6 +28,7 @@ import io.flutter.plugin.common.PluginRegistry.Registrar
 import io.flutter.plugin.common.MethodChannel
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler
 import io.flutter.plugin.common.MethodChannel.Result
+import java.lang.Exception
 
 class KeyriPlugin : FlutterPlugin, MethodCallHandler, ActivityAware,
     PluginRegistry.ActivityResultListener {
@@ -369,7 +370,12 @@ class KeyriPlugin : FlutterPlugin, MethodCallHandler, ActivityAware,
         result: MethodChannel.Result
     ) {
         keyriCoroutineScope("sendEvent", result::error).launch {
-            val jsonMetadata = metadata?.let(::JSONObject)
+            val jsonMetadata = try {
+                metadata?.let { JSONObject(it) }
+            } catch (e: Exception) {
+                null
+            }
+
             val type = eventType?.let { EventType.custom(it, jsonMetadata) }
 
             if (success == null) {

diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -1,5 +1,5 @@
 name: keyri_example
-version: 1.7.1
+version: 1.7.2
 description: Demonstrates how to use the Keyri plugin.
 publish_to: 'none'
 

diff --git a/ios/Classes/KeyriPlugin.m b/ios/Classes/KeyriPlugin.m
@@ -46,7 +46,7 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
     } else if ([@"sendEvent" isEqualToString:call.method]) {
         [self sendEvent:call result:result];
     } else if ([@"createFingerprint" isEqualToString:call.method]) {
-        [self sendEvent:call result:result];
+        [self createFingerprint:call result:result];
     } else if ([@"initiateQrSession" isEqualToString:call.method]) {
         [self initiateQrSession:call result:result];
     } else if ([@"login" isEqualToString:call.method]) {

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: keyri_v3
 description: Keyri QR Login plugin for Flutter. Provides Keyri SDK capabilities for secure and passwordless login.
-version: 1.7.1
+version: 1.7.2
 homepage: https://keyri.com
 
 environment: