Merge pull request #33 from zoyi/develop

0.4.3

Author: zoyi-jin

CHANGELOG.md

@@ -1,7 +1,12 @@
+# 0.4.3
+## Bug fixes
+* support android channel-io 7.0.7
+* fix notification
+
 # 0.4.2
 ## Bug fixes & support legacy
-# fix language bug
-# Legacy support - language / locale
+* fix language bug
+* Legacy support - language / locale
 
 # 0.4.1
 ## Bug fixes

android/src/main/java/com/zoyi/channel/rn/RNChannelIO.java

@@ -118,7 +118,8 @@ public void initPushToken(String tokenData) {
 
   @ReactMethod
   public void handlePushNotification(ReadableMap userInfo, Promise promise) {
-    Context context = getCurrentActivity();
+    if (reactContext != null) {
+      Context context = reactContext.getApplicationContext();
 
     if (context != null) {
       ChannelIO.showPushNotification(context, ParseUtils.toPushNotification(userInfo));

android/src/main/java/com/zoyi/channel/rn/Utils.java

@@ -1,10 +1,7 @@
 package com.zoyi.channel.rn;
 
-import android.content.Context;
-
 import com.facebook.react.bridge.*;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
-import com.zoyi.channel.plugin.android.global.PrefSupervisor;
 
 /**
  * Created by mika on 2018. 9. 18..
@@ -60,16 +57,6 @@ public static ReadableArray getReadableArray(ReadableMap readableMap, String key
     return null;
   }
 
-  public static String getPluginKey(Context context) {
-    String pluginKey = null;
-
-    if (PrefSupervisor.getPluginSetting(context) != null) {
-      pluginKey = PrefSupervisor.getPluginSetting(context).getPluginKey();
-    }
-
-    return pluginKey;
-  }
-
   public static void sendEvent(ReactContext reactContext, String eventName, WritableMap params) {
     reactContext
         .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-channel-plugin",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "description": "react native module for channel io",
   "main": "index.js",
   "scripts": {