Merge pull request #1478 from OneSignal/fix/unescapeEID

Match and fix any external id that has escaped forward slashes
OneSignal · Nov 5, 2021 · dbed822 · dbed822
2 parents 6445171 + a72bb20
commit dbed822
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/OneSignalRestClient.java b/OneSignalSDK/onesignal/src/main/java/com/onesignal/OneSignalRestClient.java
@@ -40,6 +40,8 @@
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.Scanner;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 class OneSignalRestClient {
  static abstract class ResponseHandler {
@@ -158,6 +160,18 @@ private static Thread startHTTPConnection(String url, String method, JSONObject
 
  if (jsonBody != null) {
  String strJsonBody = jsonBody.toString();
+
+ Pattern eidPattern = Pattern.compile("(?<=\"external_user_id\":\").*\\\\/.*?(?=\",|\"\\})");
+ Matcher eidMatcher = eidPattern.matcher(strJsonBody);
+
+ if (eidMatcher.find()) {
+ String matched = eidMatcher.group(0);
+ if (matched != null) {
+ String unescapedEID = matched.replace("\\/", "/");
+ strJsonBody = eidMatcher.replaceAll(unescapedEID);
+ }
+ }
+
  OneSignal.Log(OneSignal.LOG_LEVEL.DEBUG, "OneSignalRestClient: " + method + " SEND JSON: " + strJsonBody);
 
  byte[] sendBytes = strJsonBody.getBytes("UTF-8");