Merge pull request #55 from ryanhomer/rn0.29.0

React Native v0.29.0 compatibility.
zetavg · Jul 13, 2016 · 91b1126 · 91b1126
2 parents 589dac7 + 7f31800
commit 91b1126
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 17 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -17,7 +17,7 @@ android {
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.facebook.react:react-native:0.15.+'
+    compile 'com.facebook.react:react-native:0.19.+'
     compile 'com.google.code.gson:gson:2.3.+'
     compile 'com.android.support:appcompat-v7:23.0.1'
     compile 'com.android.support:support-annotations:+'

diff --git a/...ation/GCMNotificationListenerService.java → ...ation/GCMNotificationListenerService.java b/...ation/GCMNotificationListenerService.java → ...ation/GCMNotificationListenerService.java
diff --git a/...act-native/notification/Notification.java → ...eson/react/notification/Notification.java b/...act-native/notification/Notification.java → ...eson/react/notification/Notification.java
diff --git a/.../notification/NotificationAttributes.java → .../notification/NotificationAttributes.java b/.../notification/NotificationAttributes.java → .../notification/NotificationAttributes.java
diff --git a/...tification/NotificationEventReceiver.java → ...tification/NotificationEventReceiver.java b/...tification/NotificationEventReceiver.java → ...tification/NotificationEventReceiver.java
diff --git a/...ive/notification/NotificationManager.java → ...act/notification/NotificationManager.java b/...ive/notification/NotificationManager.java → ...act/notification/NotificationManager.java
diff --git a/...tive/notification/NotificationModule.java → ...eact/notification/NotificationModule.java b/...tive/notification/NotificationModule.java → ...eact/notification/NotificationModule.java
@@ -39,7 +39,6 @@
  */
 public class NotificationModule extends ReactContextBaseJavaModule {
     final static String PREFERENCES_KEY = "ReactNativeSystemNotification";
-    public Activity mActivity = null;
     public Context mContext = null;
     public NotificationManager mNotificationManager = null;
 
@@ -51,11 +50,10 @@ public String getName() {
     /**
      * Constructor.
      */
-    public NotificationModule(ReactApplicationContext reactContext, Activity activity) {
+    public NotificationModule(ReactApplicationContext reactContext) {
         super(reactContext);
 
         this.mContext = reactContext;
-        this.mActivity = activity;
         this.mNotificationManager = (NotificationManager) new NotificationManager(reactContext);
 
         listenNotificationEvent();
@@ -242,12 +240,13 @@ private void sendEvent(
 
     @ReactMethod
     public void getInitialSysNotification(Callback cb) {
+        final Activity activity = getCurrentActivity();
 
-        if (mActivity == null) {
+        if (activity == null) {
           return;
         }
 
-        Intent intent = mActivity.getIntent();
+        Intent intent = activity.getIntent();
         Bundle extras = intent.getExtras();
 
         if (extras != null) {
@@ -261,13 +260,15 @@ public void getInitialSysNotification(Callback cb) {
 
     @ReactMethod
     public void removeInitialSysNotification() {
-      if (mActivity == null) {
+        final Activity activity = getCurrentActivity();
+
+      if (activity == null) {
         return;
       }
 
-      mActivity.getIntent().removeExtra("initialSysNotificationId");
-      mActivity.getIntent().removeExtra("initialSysNotificationAction");
-      mActivity.getIntent().removeExtra("initialSysNotificationPayload");
+      activity.getIntent().removeExtra("initialSysNotificationId");
+      activity.getIntent().removeExtra("initialSysNotificationAction");
+      activity.getIntent().removeExtra("initialSysNotificationPayload");
     }
 
     private NotificationAttributes getNotificationAttributesFromReadableMap(

diff --git a/...ive/notification/NotificationPackage.java → ...act/notification/NotificationPackage.java b/...ive/notification/NotificationPackage.java → ...act/notification/NotificationPackage.java
@@ -6,6 +6,7 @@
 import com.facebook.react.bridge.JavaScriptModule;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.uimanager.ViewManager;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -16,18 +17,15 @@
  * The React package.
  */
 public class NotificationPackage implements ReactPackage {
-    private Activity mActivity = null;
-
-    public NotificationPackage(Activity activity) {
-        mActivity = activity;
+    public NotificationPackage() {
     }
 
     @Override
     public List<NativeModule> createNativeModules(
             ReactApplicationContext reactContext) {
         List<NativeModule> modules = new ArrayList<>();
 
-        modules.add(new NotificationModule(reactContext, mActivity));
+        modules.add(new NotificationModule(reactContext));
         return modules;
     }
 

diff --git a/...e/notification/NotificationPublisher.java → ...t/notification/NotificationPublisher.java b/...e/notification/NotificationPublisher.java → ...t/notification/NotificationPublisher.java
diff --git a/...notification/SystemBootEventReceiver.java → ...notification/SystemBootEventReceiver.java b/...notification/SystemBootEventReceiver.java → ...notification/SystemBootEventReceiver.java
diff --git a/...ative/notification/WritableNativeMap.java → ...react/notification/WritableNativeMap.java b/...ative/notification/WritableNativeMap.java → ...react/notification/WritableNativeMap.java
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-system-notification",
-  "version": "0.1.11",
+  "version": "0.2.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/Neson/react-native-system-notification"
@@ -15,6 +15,6 @@
     "notification"
   ],
   "peerDependencies": {
-    "react-native": ">=0.15.0"
+    "react-native": ">=0.29.0"
   }
 }