Merge branch 'rc/3.1.+' into rc/3.2.+

# Conflicts: # CHANGELOG.md # android/src/main/java/io/agora/rtc/react/PromiseCallback.kt # package.json
AgoraIO-Extensions · Dec 28, 2020 · 48c139c · 48c139c
2 parents b989cfd + e85a653
commit 48c139c
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,13 @@
 * upgrade to 3.2.0 ([4ee51a9](https://github.com/AgoraIO-Community/react-native-agora/commit/4ee51a9b405deb17b467f5359f6717033c3961a2))
 * upgrade to 3.2.0 ([680048f](https://github.com/AgoraIO-Community/react-native-agora/commit/680048f7836940f586ce7228559ba2cde9e0de62))
 
+## [3.1.7](https://github.com/AgoraIO-Community/react-native-agora/compare/v3.1.6...v3.1.7) (2020-12-28)
+
+
+### Bug Fixes
+
+* process resolve value type ([d28c79d](https://github.com/AgoraIO-Community/react-native-agora/commit/d28c79d18338604cbc6e723baedd9618e8a11374))
+
 ## [3.1.6](https://github.com/AgoraIO-Community/react-native-agora/compare/v3.1.5...v3.1.6) (2020-12-21)
 
 

diff --git a/android/src/main/java/io/agora/rtc/react/PromiseCallback.kt b/android/src/main/java/io/agora/rtc/react/PromiseCallback.kt
@@ -8,16 +8,21 @@ class PromiseCallback(
   private val promise: Promise?
 ) : Callback() {
   override fun success(data: Any?) {
-    if (data is Map<*, *>) {
-      val map = mutableMapOf<String, Any?>()
-      data.forEach {
-        if (it.key is String) {
-          map[it.key as String] = it.value
+    when (data) {
+      null, is Boolean, is Int, is String -> promise?.resolve(data)
+      is Number -> promise?.resolve(data.toDouble())
+      is Array<*> -> promise?.resolve(Arguments.makeNativeArray<Any>(arrayOf(data)))
+      is List<*> -> promise?.resolve(Arguments.makeNativeArray(data))
+      is Map<*, *> -> {
+        val map = mutableMapOf<String, Any?>()
+        data.forEach {
+          if (it.key is String) {
+            map[it.key as String] = it.value
+          }
         }
+        promise?.resolve(Arguments.makeNativeMap(map))
       }
-      promise?.resolve(Arguments.makeNativeMap(map))
-    } else {
-      promise?.resolve(data)
+      else -> promise?.reject(IllegalArgumentException("Could not convert " + data.javaClass))
     }
   }