@imatis/react-native-notifications 4.3.1-imatis.24 → 4.3.1-imatis.26

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

@@ -3,6 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.wix.reactnativenotifications">
 
+    <uses-permission android:name="android.permission.VIBRATE" />
     <application>
 
         <!--

package/lib/android/app/src/main/java/com/wix/reactnativenotifications/core/JsIOHelper.java

@@ -17,6 +17,10 @@ public class JsIOHelper {
     }
 
     public boolean sendEventToJS(String eventName, WritableMap data, ReactContext reactContext) {
+        if(!reactContext.hasActiveCatalystInstance()) {
+            return;
+        }
+
         if (reactContext != null) {
             reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).emit(eventName, data);
             return true;

package/lib/android/app/src/main/java/com/wix/reactnativenotifications/core/notification/PushNotification.java

@@ -15,6 +15,8 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.PowerManager;
+import android.os.VibrationEffect;
+import android.os.Vibrator;
 import android.util.Log;
 
 import com.facebook.react.bridge.ReactContext;
@@ -214,7 +216,7 @@ public class PushNotification implements IPushNotification {
             Log.d(LOGTAG, e.getMessage());
         }
 
-        if(mNotificationProps.getCriticalAlert()){
+        if(mNotificationProps.getCriticalAlert() || mNotificationProps.getOverridemute()){
             try {
                 MediaPlayer mMediaPlayer = new MediaPlayer();
                 mMediaPlayer.setDataSource(mContext.getApplicationContext(), soundUri);
@@ -227,6 +229,18 @@ public class PushNotification implements IPushNotification {
                         mMediaPlayer.start();
                     }
                 });
+
+                Vibrator v = (Vibrator) mContext.getSystemService(Context.VIBRATOR_SERVICE);
+                // Vibrate with wave form
+                long[] timings = new long[] { 50, 50, 50, 50, 50, 100, 350, 25, 25, 25, 25, 200 };
+                int[] amplitudes = new int[] { 33, 51, 75, 113, 170, 255, 0, 38, 62, 100, 160, 255 };
+                int repeatIndex = -1; // Do not repeat.
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    v.vibrate(VibrationEffect.createWaveform(timings, amplitudes, repeatIndex));
+                } else {
+                    //deprecated in API 26
+                    v.vibrate(3000);
+                }
             } catch (Exception e) {
                 Log.d(LOGTAG, e.getMessage());
             }
@@ -248,7 +262,7 @@ public class PushNotification implements IPushNotification {
 
     private void setUpIconColor(Notification.Builder notification) {
         int colorResID = getAppResourceId("colorAccent", "color");
-        if (colorResID != 0 && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+        if (colorResID != 0) {
             int color = mContext.getResources().getColor(colorResID);
             notification.setColor(color);
         }

package/lib/android/app/src/main/java/com/wix/reactnativenotifications/core/notification/PushNotificationProps.java

@@ -58,6 +58,14 @@ public class PushNotificationProps {
         return 0.0;
     }
 
+    public Boolean getOverridemute() {
+        String val = mBundle.getString("overridemute");
+        if(val != null && !val.isEmpty()){
+            return val.toLowerCase().equals("true");
+        }
+        return false;
+    }
+
     public Boolean getOngoing() {
         return mBundle.getBoolean("ongoing");
     }

package/lib/android/app/src/test/java/com/wix/reactnativenotifications/core/AppLaunchHelperTest.java

@@ -0,0 +1,117 @@
+package com.wix.reactnativenotifications.core;
+
+import android.app.Activity;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+@RunWith(RobolectricTestRunner.class)
+public class AppLaunchHelperTest {
+
+    private static final String LAUNCHED_FROM_NOTIF_BOOLEAN_EXTRA_NAME = "launchedFromNotification";
+
+    static class ActivityMock extends Activity {
+    }
+
+    private final String APP_PACKAGE_NAME = "the.package";
+    private final String APP_MAIN_ACTIVITY_NAME = ActivityMock.class.getName();
+
+    @Mock private Context mContext;
+    @Mock private PackageManager mPackageManager;
+
+
+    @Before
+    public void setup() throws Exception {
+        MockitoAnnotations.initMocks(this);
+        when(mContext.getApplicationContext()).thenReturn(mContext);
+        when(mContext.getPackageManager()).thenReturn(mPackageManager);
+        when(mContext.getPackageName()).thenReturn(APP_PACKAGE_NAME);
+
+        // Set-up the intent (mock) returned by the SDK for getLaunchIntentForPackage()
+        Intent intent = mock(Intent.class);
+        when(intent.getComponent()).thenReturn(new ComponentName(APP_PACKAGE_NAME, APP_MAIN_ACTIVITY_NAME));
+        when(mPackageManager.getLaunchIntentForPackage(eq(APP_PACKAGE_NAME))).thenReturn(intent);
+    }
+
+    @Test
+    public void getLaunchIntent__returnsCustomIntentWithNotifFlagExtra() throws Exception {
+        final AppLaunchHelper uut = getUUT();
+        Intent intent = uut.getLaunchIntent(mContext);
+
+        assertNotNull(intent);
+        assertEquals(APP_PACKAGE_NAME, intent.getComponent().getPackageName());
+        assertEquals(APP_MAIN_ACTIVITY_NAME, intent.getComponent().getClassName());
+        assertEquals(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED, intent.getFlags());
+        assertTrue(intent.getBooleanExtra(LAUNCHED_FROM_NOTIF_BOOLEAN_EXTRA_NAME, false));
+    }
+
+    @Test
+    public void isLaunchIntentsActivity_activityIsMainLauncherActivity_returnTrue() throws Exception {
+        Activity activity = getActivityMock(APP_MAIN_ACTIVITY_NAME);
+
+        final AppLaunchHelper uut = getUUT();
+        boolean result = uut.isLaunchIntentsActivity(activity);
+
+        assertTrue(result);
+    }
+
+    @Test
+    public void isLaunchIntentsActivity_activityIsNotMainActivity_returnFalse() throws Exception {
+        Activity activity = getActivityMock("other.activity");
+
+        final AppLaunchHelper uut = getUUT();
+        boolean result = uut.isLaunchIntentsActivity(activity);
+
+        assertFalse(result);
+    }
+
+    @Test
+    public void isLaunchIntentOfNotification_hasFlagInBundle_returnTrue() throws Exception {
+        Intent intent = mock(Intent.class);
+        when(intent.getBooleanExtra(eq(LAUNCHED_FROM_NOTIF_BOOLEAN_EXTRA_NAME), eq(false))).thenReturn(true);
+
+        final AppLaunchHelper uut = getUUT();
+        boolean result = uut.isLaunchIntentOfNotification(intent);
+
+        assertTrue(result);
+    }
+
+    @Test
+    public void isLaunchIntentOfNotification_noFlagInBundle_returnFalse() throws Exception {
+        Intent intent = mock(Intent.class);
+
+        final AppLaunchHelper uut = getUUT();
+        boolean result = uut.isLaunchIntentOfNotification(intent);
+
+        assertFalse(result);
+    }
+
+    protected Activity getActivityMock(String activityClassName) {
+        Activity activity = mock(Activity.class);
+        when(activity.getPackageManager()).thenReturn(mPackageManager);
+        when(activity.getPackageName()).thenReturn(APP_PACKAGE_NAME);
+        when(activity.getComponentName()).thenReturn(new ComponentName(APP_PACKAGE_NAME, activityClassName));
+        when(activity.getLocalClassName()).thenReturn(activityClassName);
+        return activity;
+    }
+
+    private AppLaunchHelper getUUT() {
+        return new AppLaunchHelper();
+    }
+}

package/lib/android/app/src/test/java/com/wix/reactnativenotifications/core/InitialNotificationHolderTest.java

@@ -0,0 +1,59 @@
+package com.wix.reactnativenotifications.core;
+
+import com.wix.reactnativenotifications.core.notification.PushNotificationProps;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.mock;
+
+@RunWith(MockitoJUnitRunner.class)
+public class InitialNotificationHolderTest {
+
+    @Test
+    public void initialState() throws Exception {
+        final InitialNotificationHolder uut = createUUT();
+        assertNull(uut.get());
+    }
+
+    @Test
+    public void setsInitialNotification() throws Exception {
+        PushNotificationProps props = mock(PushNotificationProps.class);
+        final InitialNotificationHolder uut = createUUT();
+        uut.set(props);
+        assertEquals(props, uut.get());
+    }
+
+    @Test
+    public void clearsInitialNotification() throws Exception {
+        PushNotificationProps props = mock(PushNotificationProps.class);
+        final InitialNotificationHolder uut = createUUT();
+        uut.set(props);
+        uut.clear();
+        assertNull(uut.get());
+    }
+
+    @Test
+    public void replacesInitialNotification() throws Exception {
+        PushNotificationProps props1 = mock(PushNotificationProps.class);
+        PushNotificationProps props2 = mock(PushNotificationProps.class);
+        final InitialNotificationHolder uut = createUUT();
+        uut.set(props1);
+        uut.set(props2);
+        assertNotEquals(props1, props2);
+        assertEquals(props2, uut.get());
+    }
+
+    @Test
+    public void isALazySingleton() throws Exception {
+        final InitialNotificationHolder instance = InitialNotificationHolder.getInstance();
+        assertNotNull(instance);
+        assertEquals(instance, InitialNotificationHolder.getInstance());
+    }
+
+    private InitialNotificationHolder createUUT() {
+        return new InitialNotificationHolder();
+    }
+}

package/lib/android/app/src/test/java/com/wix/reactnativenotifications/core/JsIOHelperTest.java

@@ -0,0 +1,60 @@
+package com.wix.reactnativenotifications.core;
+
+import android.os.Bundle;
+
+import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.modules.core.DeviceEventManagerModule;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(MockitoJUnitRunner.class)
+public class JsIOHelperTest {
+
+    @Mock DeviceEventManagerModule.RCTDeviceEventEmitter mRCTDeviceEventEmitter;
+    @Mock ReactContext mReactContext;
+
+    @Before
+    public void setup() throws Exception {
+        when(mReactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)).thenReturn(mRCTDeviceEventEmitter);
+    }
+
+    @Test
+    public void sendEventToJS_hasReactContext_emitsEventToJs() throws Exception {
+        WritableMap data = mock(WritableMap.class);
+
+        final JsIOHelper uut = createUUT();
+        boolean result = uut.sendEventToJS("my-event", data, mReactContext);
+
+        assertTrue(result);
+        verify(mRCTDeviceEventEmitter).emit("my-event", data);
+    }
+
+    @Test
+    public void sendEventToJS_noReactContext_returnsFalse() throws Exception {
+        WritableMap data = mock(WritableMap.class);
+
+        final JsIOHelper uut = createUUT();
+        boolean result = uut.sendEventToJS("my-event", data, null);
+
+        assertFalse(result);
+        verify(mRCTDeviceEventEmitter, never()).emit(anyString(), any(WritableMap.class));
+    }
+
+    private JsIOHelper createUUT() {
+        return new JsIOHelper();
+    }
+}