pushwoosh-react-native-plugin 2.0.0 → 2.2.17

package/src/android/gradlew.bat

@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

package/src/android/src/main/AndroidManifest.xml

@@ -1,59 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.pushwoosh.reactnativeplugin">
-
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-
-    <!-- Permission to get DeviceId -->
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-
-    <!-- GCM connects to Google Services. -->
-    <uses-permission android:name="android.permission.INTERNET" />
-
-    <!-- GCM requires a Google account. -->
-    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-
-    <!-- Keeps the processor from sleeping when a message is received. -->
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-
-    <!-- Enables vibration permission for notification. -->
-    <uses-permission android:name="android.permission.VIBRATE" />
-
-    <!--
-     Creates a custom permission so only this app can receive its messages.
-
-     NOTE: the permission *must* be called PACKAGE.permission.C2D_MESSAGE,
-           where PACKAGE is the application's package name.
-    -->
-    <permission
-        android:name="${applicationId}.permission.C2D_MESSAGE"
-        android:protectionLevel="signature" />
-
-    <uses-permission android:name="${applicationId}.permission.C2D_MESSAGE" />
-
-    <!-- This app has permission to register and receive data message. -->
-    <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
-
-    <application
-        android:allowBackup="true"
-        android:label="@string/app_name">
-        <meta-data
-            android:name="PW_NOTIFICATION_RECEIVER"
-            android:value="com.pushwoosh.reactnativeplugin.NotificationReceiver" />
-
-        <receiver
-            android:name="com.google.android.gms.gcm.GcmReceiver"
-            android:exported="true"
-            android:permission="com.google.android.c2dm.permission.SEND">
+          package="com.pushwoosh.reactnativeplugin">
+
+	<application>
+		
+		<meta-data
+			android:name="com.pushwoosh.notification_service_extension"
+			android:value="com.pushwoosh.reactnativeplugin.PushwooshNotificationServiceExtension" />
+		
+		<meta-data
+			android:name="com.pushwoosh.internal.plugin_provider"
+			android:value="com.pushwoosh.reactnativeplugin.internal.ReactNativePluginProvider" />
+            
+<!--    <service android:name="com.pushwoosh.reactnativeplugin.CustomFirebaseMessagingService" android:exported="false">
             <intent-filter>
-                <action android:name="com.google.android.c2dm.intent.RECEIVE" />
-
-                <category android:name="${applicationId}" />
+                <action android:name="com.google.firebase.MESSAGING_EVENT"/>
             </intent-filter>
-        </receiver>
-        <receiver android:name=".NotificationReceiver" />
-
-        <activity android:name=".PostEventActivity"></activity>
-    </application>
+        </service>
+-->
+	
+	</application>
 
-</manifest>
+</manifest>

package/src/android/src/main/java/com/pushwoosh/reactnativeplugin/ConversionUtil.java

@@ -1,5 +1,11 @@
 package com.pushwoosh.reactnativeplugin;
 
+import android.os.Bundle;
+import android.util.Log;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableMapKeySetIterator;
@@ -8,160 +14,220 @@ import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeArray;
 import com.facebook.react.bridge.WritableNativeMap;
+import com.pushwoosh.inbox.data.InboxMessage;
 import com.pushwoosh.internal.utils.JsonUtils;
 import com.pushwoosh.internal.utils.PWLog;
+import com.pushwoosh.tags.TagsBundle;
 
+import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 public final class ConversionUtil {
 
-    public static Map<String, Object> toMap(ReadableMap readableMap) {
-        ReadableMapKeySetIterator iterator = readableMap.keySetIterator();
-        Map<String, Object> result = new HashMap<>();
-        while (iterator.hasNextKey()) {
-            String key = iterator.nextKey();
-            ReadableType type = readableMap.getType(key);
-            switch (type) {
-                case Null:
-                    result.put(key, null);
-                    break;
-                case Boolean:
-                    result.put(key, readableMap.getBoolean(key));
-                    break;
-                case Number:
-                    result.put(key, readableMap.getDouble(key));
-                    break;
-                case String:
-                    result.put(key, readableMap.getString(key));
-                    break;
-                case Map:
-                    result.put(key, toMap(readableMap.getMap(key)));
-                    break;
-                case Array:
-                    result.put(key, toArray(readableMap.getArray(key)));
-                    break;
-                default:
-                    PWLog.error(PushwooshPlugin.TAG, "Could not convert object with key: " + key + ".");
-            }
-
-        }
-        return result;
-    }
-
-    public static List<Object> toArray(ReadableArray readableArray) {
-        List<Object> result = new ArrayList<>(readableArray.size());
-        for (int i = 0; i < readableArray.size(); i++) {
-            ReadableType indexType = readableArray.getType(i);
-            switch(indexType) {
-                case Null:
-                    result.add(i, null);
-                    break;
-                case Boolean:
-                    result.add(i, readableArray.getBoolean(i));
-                    break;
-                case Number:
-                    result.add(i, readableArray.getDouble(i));
-                    break;
-                case String:
-                    result.add(i, readableArray.getString(i));
-                    break;
-                case Map:
-                    result.add(i, toMap(readableArray.getMap(i)));
-                    break;
-                case Array:
-                    result.add(i, toArray(readableArray.getArray(i)));
-                    break;
-                default:
-                    PWLog.error(PushwooshPlugin.TAG, "Could not convert object at index " + i + ".");
-            }
-        }
-        return result;
-    }
-
-    public static Map<String, Object> stringToMap(String string) {
-        try {
-            JSONObject json = new JSONObject(string);
-            return JsonUtils.jsonToMap(json);
-        }
-        catch (JSONException e) {
-            PWLog.exception(e);
-        }
-
-        return Collections.<String, Object>emptyMap();
-    }
-
-    public static WritableMap toWritableMap(Map<String, Object> map) {
-        WritableNativeMap result = new WritableNativeMap();
-
-        for(Map.Entry<String, Object> entry : map.entrySet()) {
-            String key = entry.getKey();
-            Object value = entry.getValue();
-            if (value == null) {
-                result.putNull(key);
-            }
-            else if (value instanceof Map) {
-                result.putMap(key, toWritableMap((Map)value));
-            }
-            else if (value instanceof List) {
-                result.putArray(key, toWritableArray((List) value));
-            }
-            else if (value instanceof Boolean) {
-                result.putBoolean(key, (Boolean)value);
-            }
-            else if (value instanceof Integer) {
-                result.putInt(key, (Integer)value);
-            }
-            else if (value instanceof String) {
-                result.putString(key, (String)value);
-            }
-            else if (value instanceof Double) {
-                result.putDouble(key, (Double)value);
-            }
-            else {
-                PWLog.error(PushwooshPlugin.TAG, "Could not convert object " + value.toString());
-            }
-        }
-
-        return result;
-    }
-
-    public static WritableArray toWritableArray(List<Object> array) {
-        WritableNativeArray result = new WritableNativeArray();
-
-        for (Object value : array) {
-            if (value == null) {
-                result.pushNull();
-            }
-            else if (value instanceof Map) {
-                result.pushMap(toWritableMap((Map) value));
-            }
-            else if (value instanceof List) {
-                result.pushArray(toWritableArray((List) value));
-            }
-            else if (value instanceof Boolean) {
-                result.pushBoolean((Boolean) value);
-            }
-            else if (value instanceof Integer) {
-                result.pushInt((Integer) value);
-            }
-            else if (value instanceof String) {
-                result.pushString((String) value);
-            }
-            else if (value instanceof Double) {
-                result.pushDouble((Double) value);
-            }
-            else {
-                PWLog.error(PushwooshPlugin.TAG, "Could not convert object " + value.toString());
-            }
-        }
-
-        return result;
-    }
+	public static TagsBundle convertToTagsBundle(ReadableMap readableMap) {
+		return new TagsBundle.Builder()
+				.putAll(toJsonObject(readableMap))
+				.build();
+	}
+
+	public static JSONObject toJsonObject(ReadableMap readableMap) {
+		ReadableMapKeySetIterator iterator = readableMap.keySetIterator();
+		JSONObject result = new JSONObject();
+		while (iterator.hasNextKey()) {
+			String key = iterator.nextKey();
+			ReadableType type = readableMap.getType(key);
+			try {
+				switch (type) {
+					case Null:
+						result.put(key, JSONObject.NULL);
+						break;
+					case Boolean:
+						result.put(key, readableMap.getBoolean(key));
+						break;
+					case Number:
+						result.put(key, readableMap.getDouble(key));
+						break;
+					case String:
+						result.put(key, readableMap.getString(key));
+						break;
+					case Map:
+						result.put(key, toJsonObject(readableMap.getMap(key)));
+						break;
+					case Array:
+						result.put(key, toArray(readableMap.getArray(key)));
+						break;
+					default:
+						PWLog.error(PushwooshPlugin.TAG, "Could not convert object with key: " + key + ".");
+				}
+
+			} catch (JSONException e) {
+				PWLog.error(PushwooshPlugin.TAG, "Could not convert object with key: " + key + ".", e);
+			}
+
+		}
+		return result;
+	}
+
+	public static JSONArray toArray(ReadableArray readableArray) {
+		JSONArray result = new JSONArray();
+		for (int i = 0; i < readableArray.size(); i++) {
+			ReadableType indexType = readableArray.getType(i);
+			try {
+				switch (indexType) {
+					case Null:
+						result.put(i, JSONObject.NULL);
+						break;
+					case Boolean:
+						result.put(i, readableArray.getBoolean(i));
+						break;
+					case Number:
+						result.put(i, readableArray.getDouble(i));
+						break;
+					case String:
+						result.put(i, readableArray.getString(i));
+						break;
+					case Map:
+						result.put(i, toJsonObject(readableArray.getMap(i)));
+						break;
+					case Array:
+						result.put(i, toArray(readableArray.getArray(i)));
+						break;
+					default:
+						PWLog.error(PushwooshPlugin.TAG, "Could not convert object at index " + i + ".");
+				}
+			} catch (JSONException e) {
+				PWLog.error(PushwooshPlugin.TAG, "Could not convert object at index " + i + ".", e);
+			}
+		}
+		return result;
+	}
+
+	public static JSONObject stringToJSONObject(String string) {
+		try {
+			JSONObject json = new JSONObject(string);
+			return json;
+		} catch (JSONException e) {
+			PWLog.exception(e);
+		}
+
+		return new JSONObject();
+	}
+
+	public static WritableMap toWritableMap(JSONObject jsonObject) {
+		WritableNativeMap result = new WritableNativeMap();
+
+		Iterator<String> keys = jsonObject.keys();
+		while (keys.hasNext()) {
+			String key = keys.next();
+			try {
+				Object value = jsonObject.get(key);
+
+				if (value == null || JSONObject.NULL.equals(value)) {
+					result.putNull(key);
+				} else if (value instanceof JSONObject) {
+					result.putMap(key, toWritableMap((JSONObject) value));
+				} else if (value instanceof JSONArray) {
+					result.putArray(key, toWritableArray((JSONArray) value));
+				} else if (value instanceof Boolean) {
+					result.putBoolean(key, (Boolean) value);
+				} else if (value instanceof Integer) {
+					result.putInt(key, (Integer) value);
+				} else if (value instanceof Long) {
+					result.putString(key, String.valueOf(value));
+				} else if (value instanceof String) {
+					result.putString(key, (String) value);
+				} else if (value instanceof Double) {
+					result.putDouble(key, (Double) value);
+				} else {
+					PWLog.error(PushwooshPlugin.TAG, "Could not convert object " + value.toString());
+				}
+
+			} catch (JSONException e) {
+				PWLog.error(PushwooshPlugin.TAG, "Could not convert object with key " + key, e);
+			}
+		}
+
+		return result;
+	}
+
+	public static WritableArray toWritableArray(JSONArray array) {
+		WritableNativeArray result = new WritableNativeArray();
+
+		for (int i = 0; i < array.length(); i++) {
+			try {
+				Object value = array.get(i);
+				if (value == null) {
+					result.pushNull();
+				} else if (value instanceof JSONObject) {
+					result.pushMap(toWritableMap((JSONObject) value));
+				} else if (value instanceof JSONArray) {
+					result.pushArray(toWritableArray((JSONArray) value));
+				} else if (value instanceof Boolean) {
+					result.pushBoolean((Boolean) value);
+				} else if (value instanceof Integer) {
+					result.pushInt((Integer) value);
+				} else if (value instanceof Long) {
+					result.pushString(String.valueOf(value));
+				} else if (value instanceof String) {
+					result.pushString((String) value);
+				} else if (value instanceof Double) {
+					result.pushDouble((Double) value);
+				} else {
+					PWLog.error(PushwooshPlugin.TAG, "Could not convert object " + value.toString());
+				}
+			} catch (JSONException e) {
+				e.printStackTrace();
+				PWLog.error(PushwooshPlugin.TAG, "Could not convert object with index i " + i + " in array " + array.toString(), e);
+			}
+		}
+
+		return result;
+	}
+
+	public static WritableMap inboxMessageToWritableMap(InboxMessage message) {
+		return toWritableMap(inboxMessageToJson(message));
+	}
+
+	public static JSONObject inboxMessageToJson(InboxMessage message) {
+		JSONObject object = new JSONObject();
+		try {
+			object.put("code", message.getCode())
+					.put("title", message.getTitle())
+					.put("imageUrl", message.getImageUrl())
+					.put("message",message.getMessage())
+					.put("sendDate",message.getISO8601SendDate())
+					.put("type", message.getType().getCode())
+					.put("bannerUrl", message.getBannerUrl())
+					.put("isRead",message.isRead())
+					.put("actionParams",message.getActionParams())
+					.put("isActionPerformed",message.isActionPerformed());
+
+			Bundle bundle = JsonUtils.jsonStringToBundle( message.getActionParams());
+			String customData = bundle.getString("u");
+			if (customData != null) {
+				object.put("customData", customData);
+			}
+		} catch (JSONException e) {
+			Log.e("PushwooshInbox", "Failed to fetch inbox message :" + e.getMessage());
+		}
+		return object;
+	}
+	
+	public static ArrayList<String> messageCodesArrayToArrayList(ReadableArray readableArray) {
+		ArrayList<String> result = new ArrayList<>();
+		for (int i = 0; i < readableArray.size(); i++) {
+			ReadableType indexType = readableArray.getType(i);
+			try {
+				if (indexType == ReadableType.String) {
+					result.add(readableArray.getString(i));
+				} else {
+					PWLog.error(PushwooshPlugin.TAG, "Could not convert object at index " + i + ".");
+				}
+			} catch (Exception e) {
+				PWLog.error(PushwooshPlugin.TAG, "Could not convert object at index " + i + ".", e);
+			}
+		}
+		return result;
+	}
 }

package/src/android/src/main/java/com/pushwoosh/reactnativeplugin/CustomFirebaseMessagingService.java

@@ -0,0 +1,29 @@
+package com.pushwoosh.plugin.pushnotifications;
+
+import androidx.annotation.NonNull;
+
+import com.google.firebase.messaging.FirebaseMessagingService;
+import com.google.firebase.messaging.RemoteMessage;
+import com.pushwoosh.firebase.PushwooshFcmHelper;
+
+public class CustomFirebaseMessagingService extends FirebaseMessagingService {
+    @Override
+    public void onMessageReceived(@NonNull RemoteMessage remoteMessage) {
+        if (PushwooshFcmHelper.isPushwooshMessage(remoteMessage)){
+            PushwooshFcmHelper.onMessageReceived(this, remoteMessage);
+        } else {
+            //handle push from a different service here
+        }
+    }
+
+    @Override
+    public void onNewToken(@NonNull String s) {
+        super.onNewToken(s);
+        PushwooshFcmHelper.onTokenRefresh(s);
+        sendTokenToAnotherService();
+    }
+
+    public void sendTokenToAnotherService() {
+        //handle push registration of another service here
+    }
+}

package/src/android/src/main/java/com/pushwoosh/reactnativeplugin/EventDispatcher.java

@@ -1,14 +1,15 @@
 package com.pushwoosh.reactnativeplugin;
 
-import com.facebook.react.bridge.Callback;
-import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.modules.core.DeviceEventManagerModule;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.facebook.react.bridge.Callback;
+import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.modules.core.DeviceEventManagerModule;
+
 public class EventDispatcher {
 
     private  Map<String, List<Callback>> subscribers = new HashMap<String, List<Callback>>();
@@ -44,8 +45,8 @@ public class EventDispatcher {
         }
     }
 
-    public void sendJSEvent(ReactContext reactContext, String event, Map<String, Object> params) {
+    public void sendJSEvent(ReactContext reactContext, String event, WritableMap params) {
         reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-                .emit(event, ConversionUtil.toWritableMap(params));
+                .emit(event, params);
     }
 }