combine getRegistrationId and addGetRegistrationIdListener

KenChoi · KenChoi · commit 43d571a668a5 · 2017-12-15T14:26:33.000+08:00
diff --git a/android/build.gradle b/android/build.gradle
@@ -1,13 +1,3 @@
-buildscript {
-    repositories {
-        jcenter()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.1'
-    }
-}
-
 apply plugin: 'com.android.library'
 
 android {
diff --git a/android/src/main/java/cn/jpush/reactnativejpush/JPushModule.java b/android/src/main/java/cn/jpush/reactnativejpush/JPushModule.java
@@ -28,7 +28,6 @@
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
@@ -55,6 +54,7 @@ public class JPushModule extends ReactContextBaseJavaModule {
     private final static String CONNECTION_CHANGE = "connectionChange";
 
     private static HashMap<Integer, Callback> sCacheMap = new HashMap<Integer, Callback>();
+    private static Callback mGetRidCallback;
 
     public JPushModule(ReactApplicationContext reactContext) {
         super(reactContext);
@@ -81,7 +81,10 @@ public void onCatalystInstanceDestroy() {
         mCachedBundle = null;
         if (null != sCacheMap) {
             sCacheMap.clear();
+            sCacheMap = null;
         }
+        mEvent = null;
+        mGetRidCallback = null;
     }
 
     @ReactMethod
@@ -157,6 +160,10 @@ private static void sendEvent() {
                             .emit(mEvent, map);
                     break;
                 case RECEIVE_REGISTRATION_ID:
+                    if (mGetRidCallback != null) {
+                        mGetRidCallback.invoke(mCachedBundle.getString(JPushInterface.EXTRA_REGISTRATION_ID));
+                        mGetRidCallback = null;
+                    }
                     mRAC.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
                             .emit(mEvent, mCachedBundle.getString(JPushInterface.EXTRA_REGISTRATION_ID));
                     break;
@@ -375,7 +382,11 @@ public void getRegistrationID(Callback callback) {
         try {
             mContext = getCurrentActivity();
             String id = JPushInterface.getRegistrationID(mContext);
-            callback.invoke(id);
+            if (id != null) {
+                callback.invoke(id);
+            } else {
+                mGetRidCallback = callback;
+            }
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -656,6 +667,7 @@ public void jumpToPushActivity(String activityName) {
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             intent.setClassName(mRAC, mRAC.getPackageName() + "." + activityName);
             mRAC.startActivity(intent);
+
         } catch (Exception e) {
             e.printStackTrace();
         }
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
@@ -78,7 +78,7 @@ def enableSeparateBuildPerCPUArchitecture = false
 def enableProguardInReleaseBuilds = false
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    buildToolsVersion "26.0.2"
 
     defaultConfig {
         applicationId "com.pushdemo"
diff --git a/example/android/build.gradle b/example/android/build.gradle
@@ -3,18 +3,10 @@
 buildscript {
     repositories {
         jcenter()
-        maven {
-            url 'https://oss.sonatype.org/content/repositories/snapshots/'
-        }
-        maven {
-            url 'https://maven.google.com'
-        }
-        maven {
-            url 'https://dl.google.com/dl/android/maven2/'
-        }
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-beta4'
+        classpath 'com.android.tools.build:gradle:3.0.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/example/documents/APIs.md b/example/documents/APIs.md
@@ -102,9 +102,9 @@ reset  tags.
 - sendLocalNotification(notification)
 
   - **buildId** : Number         // set local notification styles，1 defoult style，2 custom style( you should call setStyleCustom frist) (Android Only)
-  - **id** : Number    	       	// local notification identify,l you can use it to cancel local notification
-  - **title** : String 		        // local notification title
-  - **content** : String  	        // local notification content
+   - **id** : Number           	// local notification identify,l you can use it to cancel local notification
+    - **title** : String         // local notification title
+   - **content** : String          // local notification content
   - **extra** : Object                // local notification extra (key-value)
   - **fireTime** : Number       // show local notification time（ms）
   - **badge** : Number           // when local notification fire, application icon will set badge with this value  （iOS Only）
@@ -405,15 +405,15 @@ setLocalNotification(  Date,    		// date  local notification fire data
 
   ​
 
-- #### addGetRegistrationIdListener
+- #### addGetRegistrationIdListener(^2.1.4 Deprecated, use [getRegistrationId](#getregistrationid) instead)
 
   If add this listener, when finished registering device, open app will invoke this callback.
 
   ```
   JPushModule.addGetRegistrationIdListener(cb)
   ```
 
-- #### removeGetRegistrationIdListener
+- #### removeGetRegistrationIdListener(^2.1.4 Deprecated)
 
   Remove listener. `removeGetRegistrationIdListener` and  `addGetRegistrationIdListener`  should used in pairs.
 
diff --git a/example/documents/APIs_zh.md b/example/documents/APIs_zh.md
@@ -133,9 +133,9 @@ Android 和 iOS 通用 API。
 - sendLocalNotification(notification)
 
   - **buildId** : Number         // 设置通知样式，1 为基础样式，2 为自定义样式。自定义样式需要先调用 setStyleCustom 接口设置自定义样式。(Android Only)
-  - **id** : Number    	       	// 通知的 id, 可用于取消通知
-  - **title** : String 		        // 通知标题
-  - **content** : String  	        // 通知内容
+   - **id** : Number           	// 通知的 id, 可用于取消通知
+    - **title** : String         // 通知标题
+   - **content** : String          // 通知内容
   - **extra** : Object                // extra 字段
   - **fireTime** : Number       // 通知触发时间的时间戳（毫秒）
   - **badge** : Number           // 本地推送触发后应用角标的 badge 值  （iOS Only）
@@ -434,15 +434,15 @@ setLocalNotification(  Date,    		// date  触发本地推送的时间
 
   ​
 
-- #### addGetRegistrationIdListener
+- #### addGetRegistrationIdListener (^2.1.4 Deprecated, 使用 [getRegistrationId](#getregistrationid) 代替)
 
   如果添加这个监听，设备注册成功后，打开应用将会回调这个事件。
 
   ```
   JPushModule.addGetRegistrationIdListener(cb)
   ```
 
-- #### removeGetRegistrationIdListener
+- #### removeGetRegistrationIdListener (^2.1.4 Deprecated)
 
   移除监听 registrationId 事件，与 `addGetRegistrationIdListener` 成对使用。
 
diff --git a/example/react-native-android/push_activity.js b/example/react-native-android/push_activity.js
@@ -79,7 +79,7 @@ export default class PushActivity extends React.Component {
 		});
 	}
 
-	componentWillMount() {}
+	componentWillMount() { }
 
 	componentDidMount() {
 		JPushModule.getInfo((map) => {
@@ -92,7 +92,7 @@ export default class PushActivity extends React.Component {
 			});
 		});
 		JPushModule.notifyJSDidLoad((resultCode) => {
-			if (resultCode === 0) {}
+			if (resultCode === 0) { }
 		});
 		JPushModule.addReceiveCustomMsgListener((map) => {
 			this.setState({
@@ -140,84 +140,84 @@ export default class PushActivity extends React.Component {
 
 	render() {
 		return (
-			<ScrollView style={ styles.parent }>
+			<ScrollView style={styles.parent}>
 
-                <Text style={ styles.textStyle }>
-                    { this.state.appkey }
-                </Text>
-                <Text style={ styles.textStyle }>
-                    { this.state.imei }
-                </Text>
-                <Text style={ styles.textStyle }>
-                    { this.state.package }
-                </Text>
-                <Text style={ styles.textStyle }>
-                    { this.state.deviceId }
-                </Text>
-                <Text style={ styles.textStyle }>
-                    { this.state.version }
-                </Text>
-                <TouchableHighlight
-                    underlayColor='#0866d9'
-                    activeOpacity={ 0.5 }
-                    style={ styles.btnStyle }
-                    onPress={ this.jumpSetActivity }>
-                    <Text style={ styles.btnTextStyle }>
-                        设置
+				<Text style={styles.textStyle}>
+					{this.state.appkey}
+				</Text>
+				<Text style={styles.textStyle}>
+					{this.state.imei}
+				</Text>
+				<Text style={styles.textStyle}>
+					{this.state.package}
+				</Text>
+				<Text style={styles.textStyle}>
+					{this.state.deviceId}
+				</Text>
+				<Text style={styles.textStyle}>
+					{this.state.version}
+				</Text>
+				<TouchableHighlight
+					underlayColor='#0866d9'
+					activeOpacity={0.5}
+					style={styles.btnStyle}
+					onPress={this.jumpSetActivity}>
+					<Text style={styles.btnTextStyle}>
+						设置
                     </Text>
-                </TouchableHighlight>
-                <TouchableHighlight
-                    underlayColor='#0866d9'
-                    activeOpacity={ 0.5 }
-                    style={ styles.btnStyle }
-                    onPress={ this.onInitPress }>
-                    <Text style={ styles.btnTextStyle }>
-                        INITPUSH
+				</TouchableHighlight>
+				<TouchableHighlight
+					underlayColor='#0866d9'
+					activeOpacity={0.5}
+					style={styles.btnStyle}
+					onPress={this.onInitPress}>
+					<Text style={styles.btnTextStyle}>
+						INITPUSH
                     </Text>
-                </TouchableHighlight>
-                <TouchableHighlight
-                    underlayColor='#e4083f'
-                    activeOpacity={ 0.5 }
-                    style={ styles.btnStyle }
-                    onPress={ this.onStopPress }>
-                    <Text style={ styles.btnTextStyle }>
-                        STOPPUSH
+				</TouchableHighlight>
+				<TouchableHighlight
+					underlayColor='#e4083f'
+					activeOpacity={0.5}
+					style={styles.btnStyle}
+					onPress={this.onStopPress}>
+					<Text style={styles.btnTextStyle}>
+						STOPPUSH
                     </Text>
-                </TouchableHighlight>
-                <TouchableHighlight
-                    underlayColor='#f5a402'
-                    activeOpacity={ 0.5 }
-                    style={ styles.btnStyle }
-                    onPress={ this.onResumePress }>
-                    <Text style={ styles.btnTextStyle }>
-                        RESUMEPUSH
+				</TouchableHighlight>
+				<TouchableHighlight
+					underlayColor='#f5a402'
+					activeOpacity={0.5}
+					style={styles.btnStyle}
+					onPress={this.onResumePress}>
+					<Text style={styles.btnTextStyle}>
+						RESUMEPUSH
                     </Text>
-                </TouchableHighlight>
-                <TouchableHighlight
-                    underlayColor='#f5a402'
-                    activeOpacity={ 0.5 }
-                    style={ styles.btnStyle }
-                    onPress={ this.onGetRegistrationIdPress }>
-                    <Text style={ styles.btnTextStyle }>
-                        GET REGISTRATIONID
+				</TouchableHighlight>
+				<TouchableHighlight
+					underlayColor='#f5a402'
+					activeOpacity={0.5}
+					style={styles.btnStyle}
+					onPress={this.onGetRegistrationIdPress}>
+					<Text style={styles.btnTextStyle}>
+						GET REGISTRATIONID
                     </Text>
-                </TouchableHighlight>
-                <TouchableHighlight
-                    underlayColor='#f5a402'
-                    activeOpacity={ 0.5 }
-                    style={ styles.btnStyle }
-                    onPress={ this.jumpSecondActivity }>
-                    <Text style={ styles.btnTextStyle }>
-                        Go to SecondActivity
+				</TouchableHighlight>
+				<TouchableHighlight
+					underlayColor='#f5a402'
+					activeOpacity={0.5}
+					style={styles.btnStyle}
+					onPress={this.jumpSecondActivity}>
+					<Text style={styles.btnTextStyle}>
+						Go to SecondActivity
                     </Text>
-                </TouchableHighlight>
-                <Text style={ styles.textStyle }>
-                    { this.state.pushMsg }
-                </Text>
-                <Text style={styles.textStyle}>
-                    { this.state.registrationId }
-                </Text>
-            </ScrollView>
+				</TouchableHighlight>
+				<Text style={styles.textStyle}>
+					{this.state.pushMsg}
+				</Text>
+				<Text style={styles.textStyle}>
+					{this.state.registrationId}
+				</Text>
+			</ScrollView>
 
 		)
 	}
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jpush-react-native",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "description": "a jpush plugin for react native application",
   "main": "index.js",
   "scripts": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "jpush-react-native",`
`3`		`- "version": "2.1.3",`
	`3`	`+ "version": "2.1.4",`
`4`	`4`	`"description": "a jpush plugin for react native application",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"scripts": {`