Merge pull request #142 from edwinnyawoli/patch/active_calls_android

MethodChannel does not support custom type Data
hiennguyen92 · Jul 14, 2022 · d4a9948 · d4a9948
2 parents 97af9e1 + 69acb38
commit d4a9948
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/android/src/main/kotlin/com/hiennv/flutter_callkit_incoming/FlutterCallkitIncomingPlugin.kt b/android/src/main/kotlin/com/hiennv/flutter_callkit_incoming/FlutterCallkitIncomingPlugin.kt
@@ -187,7 +187,7 @@ class FlutterCallkitIncomingPlugin : FlutterPlugin, MethodCallHandler, ActivityA
                     result.success("OK")
                 }
                 "activeCalls" -> {
-                    result.success(getDataActiveCalls(context))
+                    result.success(getDataActiveCallsForFlutter(context))
                 }
                 "getDevicePushTokenVoIP" -> {
                     result.success("")

diff --git a/android/src/main/kotlin/com/hiennv/flutter_callkit_incoming/SharedPreferencesUtils.kt b/android/src/main/kotlin/com/hiennv/flutter_callkit_incoming/SharedPreferencesUtils.kt
@@ -54,6 +54,10 @@ fun getDataActiveCalls(context: Context?): ArrayList<Data> {
         .fromJson(json, object : TypeToken<ArrayList<Data>>() {}.type)
 }
 
+fun getDataActiveCallsForFlutter(context: Context?): ArrayList<Map<String, Any?>> {
+    val json = getString(context, "ACTIVE_CALLS", "[]")
+    return Utils.getGsonInstance().fromJson(json, object: TypeToken<ArrayList<Map<String, Any?>>>() {}.type)
+}
 
 fun putString(context: Context?, key: String, value: String?) {
     if (context == null) return

diff --git a/lib/flutter_callkit_incoming.dart b/lib/flutter_callkit_incoming.dart
@@ -68,7 +68,7 @@ class FlutterCallkitIncoming {
   /// Get active calls.
   /// On iOS: return active calls from Callkit.
   /// On Android: only return last call
-  static Future activeCalls() async {
+  static Future<dynamic> activeCalls() async {
     return await _channel.invokeMethod("activeCalls");
   }