Merge branch 'master' into updateCart-addition

Iterable · Aug 5, 2021 · f7f9e1f · f7f9e1f
2 parents 27deb0d + 82a6637
commit f7f9e1f
Showing 5 changed files with 146 additions and 119 deletions.
diff --git a/android/src/main/java/com/iterable/reactnative/RNIterableAPIModule.java b/android/src/main/java/com/iterable/reactnative/RNIterableAPIModule.java
@@ -14,6 +14,7 @@
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.facebook.react.modules.core.RCTNativeAppEventEmitter;
@@ -33,6 +34,7 @@
 import com.iterable.iterableapi.IterableUrlHandler;
 import com.iterable.iterableapi.RNIterableInternal;
 
+
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -367,10 +369,14 @@ public void setInAppShowResponse(Integer number) {
     }
 
     @ReactMethod
-    public void setAutoDisplayPaused(boolean paused) {
+    public void setAutoDisplayPaused(final boolean paused) {
         IterableLogger.printInfo();
-
-        IterableApi.getInstance().getInAppManager().setAutoDisplayPaused(paused);
+        UiThreadUtil.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                IterableApi.getInstance().getInAppManager().setAutoDisplayPaused(paused);
+            }
+        });
     }
 
     // ---------------------------------------------------------------------------------------

diff --git a/integration-testing/ios/example/IterableAPISupport.swift b/integration-testing/ios/example/IterableAPISupport.swift
@@ -53,7 +53,7 @@ struct IterableAPISupport {
                                                                     return SendRequestError.createErroredFuture(reason: "Could not create in-app consume request")
         }
 
-        return NetworkHelper.sendRequest(request, usingSession: urlSession)
+        return RequestSender.sendRequest(request, usingSession: urlSession)
     }
 
     private static let urlSession: URLSession = {
@@ -65,9 +65,9 @@ struct IterableAPISupport {
     private static func getInAppMessages(apiKey: String,
                                          email: String) -> Future<[IterableInAppMessage], SendRequestError> {
         var args: [String: String] = [
-            JsonKey.email.jsonKey: email,
+            JsonKey.email: email,
             JsonKey.InApp.count: maxMessages.description,
-            JsonKey.platform.jsonKey: JsonValue.iOS.rawValue,
+            JsonKey.platform: JsonValue.iOS,
             JsonKey.InApp.sdkVersion: IterableAPI.sdkVersion,
         ]
 
@@ -82,12 +82,12 @@ struct IterableAPISupport {
                                                                     return SendRequestError.createErroredFuture(reason: "could not create get in-app request")
         }
 
-        return NetworkHelper.sendRequest(request, usingSession: urlSession).map { inAppMessages(fromPayload: $0) }
+        return RequestSender.sendRequest(request, usingSession: urlSession).map { inAppMessages(fromPayload: $0) }
     }
 
     private static func createIterableHeaders(apiKey: String) -> [String: String] {
-        let headers = [JsonKey.contentType.jsonKey: JsonValue.applicationJson.jsonStringValue,
-                       JsonKey.Header.sdkPlatform: JsonValue.iOS.jsonStringValue,
+        let headers = [JsonKey.contentType: JsonValue.applicationJson,
+                       JsonKey.Header.sdkPlatform: JsonValue.iOS,
                        JsonKey.Header.sdkVersion: IterableAPI.sdkVersion,
                        JsonKey.Header.apiKey: apiKey]
 
@@ -151,6 +151,6 @@ struct IterableAPISupport {
                                                                     return SendRequestError.createErroredFuture(reason: "Could not create in-app consume request")
         }
 
-        return NetworkHelper.sendRequest(request, usingSession: urlSession)
+        return RequestSender.sendRequest(request, usingSession: urlSession)
     }
 }
diff --git a/integration-testing/package.json b/integration-testing/package.json
@@ -16,7 +16,7 @@
     "@react-navigation/native": "^5.4.0",
     "@react-navigation/stack": "^5.3.7",
     "react": "^17.0.2",
-    "react-native": "^0.64.1",
+    "react-native": "^0.63",
     "react-native-elements": "^1.2.7",
     "react-native-gesture-handler": "^1.6.1",
     "react-native-ionicons": "^5.0.0-rc",
@@ -38,4 +38,4 @@
     "mocha": "^6.1.3",
     "react-test-renderer": "16.9.0"
   }
-}
+}