Extensibility refactor step 3: notification drawer & init-notification cleanup

example/android/myapplication/src/main/java/com/wix/reactnativenotifications/app/MainApplication.java

@@ -23,7 +23,7 @@ public class MainApplication extends Application implements ReactApplication {
         protected List<ReactPackage> getPackages() {
             return Arrays.asList(
                     new MainReactPackage(),
-                    new RNNotificationsPackage()
+                    new RNNotificationsPackage(MainApplication.this)
                 );
         }
     };

example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/RNNotificationsPackage.java

 package com.wix.reactnativenotifications;
 
+import android.app.Application;
+
 import com.facebook.react.ReactPackage;
 import com.facebook.react.bridge.JavaScriptModule;
 import com.facebook.react.bridge.NativeModule;
@@ -13,9 +15,16 @@ import java.util.List;
 
 public class RNNotificationsPackage implements ReactPackage {
 
+
+    final Application mApplication;
+
+    public RNNotificationsPackage(Application application) {
+        mApplication = application;
+    }
+
     @Override
     public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
-        return Arrays.<NativeModule>asList(new RNNotificationsModule(reactContext));
+        return Arrays.<NativeModule>asList(new RNNotificationsModule(mApplication, reactContext));
     }
 
     @Override

example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/core/AppLaunchHelper.java

@@ -34,7 +34,9 @@ public class AppLaunchHelper {
 
     public static boolean isLaunchIntentsActivity(Activity activity) {
         final Intent helperIntent = activity.getPackageManager().getLaunchIntentForPackage(activity.getPackageName());
-        return activity.getLocalClassName().equals(helperIntent.getComponent().getClassName());
+        final String activityName = activity.getComponentName().getClassName();
+        final String launchIntentActivityName = helperIntent.getComponent().getClassName();
+        return activityName.equals(launchIntentActivityName);
     }
 
     public static boolean isLaunchIntent(Intent intent) {

example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/core/INotificationsDrawerApplication.java

+package com.wix.reactnativenotifications.core;
+
+public interface INotificationsDrawerApplication {
+    IPushNotificationsDrawer getPushNotificationsDrawer();
+}

example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/core/IPushNotificationsDrawer.java

+package com.wix.reactnativenotifications.core;
+
+import android.app.Activity;
+
+public interface IPushNotificationsDrawer {
+    void onAppInit();
+    void onAppVisible();
+    void onNewActivity(Activity activity);
+
+    void onNotificationOpened();
+}

example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/core/InitialNotification.java

@@ -9,6 +9,10 @@ public class InitialNotification {
         sNotification = pushNotificationProps;
     }
 
+    public static void clear() {
+        sNotification = null;
+    }
+
     @Nullable
     public static PushNotificationProps get() {
         return sNotification;

example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/core/PushNotification.java

@@ -58,7 +58,7 @@ public class PushNotification implements IPushNotification {
     @Override
     public void onOpened() {
         digestNotification();
-        deleteAllPostedNotifications();
+        PushNotificationsDrawer.get(mContext).onNotificationOpened();
     }
 
     @Override
@@ -170,9 +170,4 @@ public class PushNotification implements IPushNotification {
         final Intent intent = AppLaunchHelper.getLaunchIntent(mContext);
         mContext.startActivity(intent);
     }
-
-    protected void deleteAllPostedNotifications() {
-        final NotificationManager notificationManager = (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
-        notificationManager.cancelAll();
-    }
 }

example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/core/PushNotificationsDrawer.java

+package com.wix.reactnativenotifications.core;
+
+import android.app.Activity;
+import android.app.NotificationManager;
+import android.content.Context;
+
+public class PushNotificationsDrawer implements IPushNotificationsDrawer {
+
+    protected final Context mContext;
+
+    public PushNotificationsDrawer(Context context) {
+        mContext = context;
+    }
+
+    public static IPushNotificationsDrawer get(Context context) {
+        final Context appContext = context.getApplicationContext();
+        if (appContext instanceof INotificationsDrawerApplication) {
+            return ((INotificationsDrawerApplication) appContext).getPushNotificationsDrawer();
+        }
+
+        return new PushNotificationsDrawer(context);
+    }
+
+    @Override
+    public void onAppInit() {
+        clearAll();
+    }
+
+    @Override
+    public void onAppVisible() {
+        clearAll();
+    }
+
+    @Override
+    public void onNewActivity(Activity activity) {
+        if (AppLaunchHelper.isLaunchIntentsActivity(activity) &&
+            !AppLaunchHelper.isLaunchIntent(activity.getIntent())) {
+            InitialNotification.clear();
+        }
+    }
+
+    @Override
+    public void onNotificationOpened() {
+        clearAll();
+    }
+
+    protected void clearAll() {
+        final NotificationManager notificationManager = (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
+        notificationManager.cancelAll();
+    }
+}

example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/core/RNNotificationsModule.java

 package com.wix.reactnativenotifications.core;
 
+import android.app.Activity;
+import android.app.Application;
 import android.content.Context;
 import android.content.Intent;
+import android.os.Bundle;
 import android.util.Log;
 
 import com.facebook.react.bridge.Arguments;
@@ -13,12 +16,14 @@ import com.wix.reactnativenotifications.gcm.GcmInstanceIdRefreshHandlerService;
 
 import static com.wix.reactnativenotifications.Defs.LOGTAG;
 
-public class RNNotificationsModule extends ReactContextBaseJavaModule {
+public class RNNotificationsModule extends ReactContextBaseJavaModule implements AppLifecycleFacade.AppVisibilityListener, Application.ActivityLifecycleCallbacks {
 
-    public RNNotificationsModule(ReactApplicationContext reactContext) {
+    public RNNotificationsModule(Application application, ReactApplicationContext reactContext) {
         super(reactContext);
 
-        ReactAppLifecycleFacade.get().onAppInit(reactContext);
+        ReactAppLifecycleFacade.get().init(reactContext);
+        ReactAppLifecycleFacade.get().addVisibilityListener(this);
+        application.registerActivityLifecycleCallbacks(this);
     }
 
     @Override
@@ -29,14 +34,17 @@ public class RNNotificationsModule extends ReactContextBaseJavaModule {
     @Override
     public void initialize() {
         Log.d(LOGTAG, "Native module init");
+        startGcmIntentService(GcmInstanceIdRefreshHandlerService.EXTRA_IS_APP_INIT);
 
-        final Context appContext = getReactApplicationContext().getApplicationContext();
-        final Intent tokenFetchIntent = new Intent(appContext, GcmInstanceIdRefreshHandlerService.class);
-        tokenFetchIntent.putExtra(GcmInstanceIdRefreshHandlerService.EXTRA_IS_APP_INIT, true);
-        appContext.startService(tokenFetchIntent);
+        IPushNotificationsDrawer notificationsDrawer = PushNotificationsDrawer.get(getReactApplicationContext().getApplicationContext());
+        notificationsDrawer.onAppInit();
     }
 
-
+    @ReactMethod
+    public void refreshToken() {
+        Log.d(LOGTAG, "Native method invocation: refreshToken()");
+        startGcmIntentService(GcmInstanceIdRefreshHandlerService.EXTRA_MANUAL_REFRESH);
+    }
 
     @ReactMethod
     public void getInitialNotification(final Promise promise) {
@@ -55,13 +63,50 @@ public class RNNotificationsModule extends ReactContextBaseJavaModule {
         }
     }
 
-    @ReactMethod
-    public void refreshToken() {
-        Log.d(LOGTAG, "Native method invocation: refreshToken()");
+    @Override
+    public void onAppVisible() {
+        IPushNotificationsDrawer notificationsDrawer = PushNotificationsDrawer.get(getReactApplicationContext().getApplicationContext());
+        notificationsDrawer.onAppVisible();
+    }
+
+    @Override
+    public void onAppNotVisible() {
+    }
+
+    @Override
+    public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
+        IPushNotificationsDrawer notificationsDrawer = PushNotificationsDrawer.get(getReactApplicationContext().getApplicationContext());
+        notificationsDrawer.onNewActivity(activity);
+    }
+
+    @Override
+    public void onActivityStarted(Activity activity) {
+    }
+
+    @Override
+    public void onActivityResumed(Activity activity) {
+    }
+
+    @Override
+    public void onActivityPaused(Activity activity) {
+    }
+
+    @Override
+    public void onActivityStopped(Activity activity) {
+    }
+
+    @Override
+    public void onActivitySaveInstanceState(Activity activity, Bundle outState) {
+    }
+
+    @Override
+    public void onActivityDestroyed(Activity activity) {
+    }
 
+    protected void startGcmIntentService(String extraFlag) {
         final Context appContext = getReactApplicationContext().getApplicationContext();
         final Intent tokenFetchIntent = new Intent(appContext, GcmInstanceIdRefreshHandlerService.class);
-        tokenFetchIntent.putExtra(GcmInstanceIdRefreshHandlerService.EXTRA_MANUAL_REFRESH, true);
+        tokenFetchIntent.putExtra(extraFlag, true);
         appContext.startService(tokenFetchIntent);
     }
 }

example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/core/ReactAppLifecycleFacade.java

@@ -12,7 +12,7 @@ import static com.wix.reactnativenotifications.Defs.LOGTAG;
 
 public class ReactAppLifecycleFacade implements AppLifecycleFacade {
 
-    private static ReactAppLifecycleFacade sInstance = new ReactAppLifecycleFacade();
+    private static final ReactAppLifecycleFacade sInstance = new ReactAppLifecycleFacade();
 
     private ReactContext mReactContext;
     private boolean mIsVisible;
@@ -22,10 +22,8 @@ public class ReactAppLifecycleFacade implements AppLifecycleFacade {
         return sInstance;
     }
 
-    public synchronized void onAppInit(ReactContext reactContext) {
+    public void init(ReactContext reactContext) {
         mReactContext = reactContext;
-        mIsVisible = false;
-
         reactContext.addLifecycleEventListener(new LifecycleEventListener() {
             @Override
             public void onHostResume() {
@@ -35,15 +33,14 @@ public class ReactAppLifecycleFacade implements AppLifecycleFacade {
 
             @Override
             public void onHostPause() {
+                Log.d(LOGTAG, "onHostPause");
                 switchToInvisible();
             }
 
             @Override
             public void onHostDestroy() {
-                switchToInvisible();
                 Log.d(LOGTAG, "onHostDestroy");
-                mReactContext.removeLifecycleEventListener(this);
-                mReactContext = null;
+                switchToInvisible();
             }
         });
     }

example/index.android.js

@@ -11,6 +11,30 @@ import {
 
 import {NotificationsAndroid, PendingNotifications} from './notifications';
 
+let mainScreen;
+
+function onPushRegistered() {
+  if (mainScreen) {
+    mainScreen.onPushRegistered();
+  }
+}
+
+function onNotificationOpened(notification) {
+  if (mainScreen) {
+    mainScreen.onNotificationOpened(notification)
+  }
+}
+
+function onNotificationReceived(notification) {
+  if (mainScreen) {
+    mainScreen.onNotificationReceived(notification)
+  }
+}
+
+NotificationsAndroid.setRegistrationTokenUpdateListener(onPushRegistered);
+NotificationsAndroid.setNotificationOpenedListener(onNotificationOpened);
+NotificationsAndroid.setNotificationReceivedListener(onNotificationReceived);
+
 const styles = StyleSheet.create({
   container: {
     flex: 1,
@@ -36,22 +60,24 @@ class MainComponent extends Component {
     this.state = {
       elapsed: 0,
       lastNotification: undefined
-    }
-  }
+    };
 
-  componentWillMount() {
-    NotificationsAndroid.setRegistrationTokenUpdateListener(this.onPushRegistered.bind(this));
-    NotificationsAndroid.setNotificationOpenedListener(this.onNotificationOpened.bind(this));
-    NotificationsAndroid.setNotificationReceivedListener(this.onNotificationReceived.bind(this));
+    console.log('ReactScreen', 'ReactScreen');
+    mainScreen = this;
   }
 
   componentDidMount() {
+    console.log('ReactScreen', 'componentDidMount');
     setInterval(this.onTick.bind(this), 1000);
     PendingNotifications.getInitialNotification()
       .then((notification) => {console.log("getInitialNotification:", notification); this.setState({initialNotification: notification.getData()});})
       .catch((err) => console.error("getInitialNotifiation failed", err));
   }
 
+  componentWillUnmount() {
+    console.log('ReactScreen', 'componentWillUnmount');
+  }
+
   onTick() {
     this.setState({elapsed: this.state.elapsed + 1});
   }