Merge pull request #170 from jwfing/master

upgrade fcm/hms dependencies

Author: jwfing

android-sdk/build.gradle

@@ -10,7 +10,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.6.3'
-        classpath 'com.huawei.agconnect:agcp:1.2.1.301'
+        classpath 'com.huawei.agconnect:agcp:1.4.2.300'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -30,7 +30,7 @@ allprojects {
 }
 
 ext {
-    sdkVersion = "7.2.4"
+    sdkVersion = "7.2.5"
     supportLibVersion = "26.1.0"
     converterVersion = "2.1.0"
     rxandroidVersion = "2.1.1"

android-sdk/gradle.properties

@@ -15,7 +15,7 @@ org.gradle.jvmargs=-Xmx1536m
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-VERSION_NAME=7.2.4
+VERSION_NAME=7.2.5
 VERSION_CODE=2695
 GROUP=cn.leancloud
 

android-sdk/leancloud-fcm/build.gradle

@@ -5,7 +5,7 @@ android {
     buildToolsVersion "28.0.3"
 
     defaultConfig {
-        minSdkVersion 14
+        minSdkVersion 16
         targetSdkVersion 26
         versionCode 1
         versionName "1.0"
@@ -59,10 +59,12 @@ dependencies {
 
     implementation("cn.leancloud:realtime-core:${rootProject.ext.sdkVersion}")
 
-    implementation 'com.google.firebase:firebase-core:15.0.2'
-    implementation 'com.google.firebase:firebase-iid:15.0.2'
-    implementation 'com.google.firebase:firebase-messaging:15.0.2'
-    implementation 'com.firebase:firebase-jobdispatcher:0.8.5'
+    // Import the BoM for the Firebase platform
+    implementation platform('com.google.firebase:firebase-bom:27.0.0')
+
+    // Declare the dependencies for the Firebase Cloud Messaging and Analytics libraries
+    // When using the BoM, you don't specify versions in Firebase library dependencies
+    implementation 'com.google.firebase:firebase-messaging'
 
     implementation 'androidx.appcompat:appcompat:1.0.0'
     testImplementation 'junit:junit:4.12'

android-sdk/leancloud-fcm/src/main/java/cn/leancloud/AVFCMJobService.java

@@ -1,5 +1,7 @@
 package cn.leancloud;
 
+import cn.leancloud.callback.SaveCallback;
+import cn.leancloud.convertor.ObserverBuilder;
 import cn.leancloud.json.JSON;
 import cn.leancloud.json.JSONObject;
 
@@ -8,16 +10,17 @@
 
 import java.util.Map;
 
-import cn.leancloud.push.AVPushMessageListener;
 import cn.leancloud.push.AndroidNotificationManager;
 import cn.leancloud.utils.LogUtil;
+import cn.leancloud.utils.StringUtil;
 
 /**
  * Created by fengjunwen on 2018/8/28.
  */
 
 public class AVFirebaseMessagingService extends FirebaseMessagingService {
   private final static AVLogger LOGGER = LogUtil.getLogger(AVFirebaseMessagingService.class);
+  private final String VENDOR = "fcm";
 
   /**
    * FCM 有两种消息：通知消息与数据消息。
@@ -62,6 +65,42 @@ public void onMessageReceived(RemoteMessage remoteMessage) {
     }
   }
 
+  @Override
+  public void onNewToken(String token) {
+    LOGGER.d("refreshed token: " + token);
+
+    // If you want to send messages to this application instance or
+    // manage this apps subscriptions on the server side, send the
+    // FCM registration token to your app server.
+    sendRegistrationToServer(token);
+  }
+
+  private void sendRegistrationToServer(String refreshedToken) {
+    if (StringUtil.isEmpty(refreshedToken)) {
+      return;
+    }
+    AVInstallation installation = AVInstallation.getCurrentInstallation();
+    if (!VENDOR.equals(installation.getString(AVInstallation.VENDOR))) {
+      installation.put(AVInstallation.VENDOR, VENDOR);
+    }
+    if (!refreshedToken.equals(installation.getString(AVInstallation.REGISTRATION_ID))) {
+      installation.put(AVInstallation.REGISTRATION_ID, refreshedToken);
+    }
+    installation.saveInBackground().subscribe(
+      ObserverBuilder.buildSingleObserver(new SaveCallback() {
+      @Override
+      public void done(AVException e) {
+        if (null != e) {
+          LOGGER.e("failed to update installation.", e);
+        } else {
+          LOGGER.d("succeed to update installation.");
+        }
+      }
+    }));
+
+    LOGGER.d("FCM registration success! registrationId=" + refreshedToken);
+  }
+
   @Override
   public void onDeletedMessages() {
     super.onDeletedMessages();

android-sdk/leancloud-fcm/src/main/java/cn/leancloud/AVFirebaseInstanceIDService.java

@@ -15,7 +15,7 @@
             <action android:name="android.intent.action.VIEW" />
             <category android:name="android.intent.category.DEFAULT" />
             <category android:name="android.intent.category.BROWSABLE" />
-            <data android:scheme="cn.leancloud.qJnLgVRA9mnzVSw4Ho3HtIaI-gzGzoHsz" />
+            <data android:scheme="cn.leancloud.qjnlgvra9mnzvsw4ho3htiai-gzgzohsz" />
             <data android:host="leancloud" />
             <data android:pathPrefix="/classes/Reply/" />
             </intent-filter>

android-sdk/leancloud-fcm/src/main/java/cn/leancloud/AVFirebaseMessagingService.java

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
     buildToolsVersion "28.0.3"
 
 

android-sdk/leancloud-search-sample/src/main/AndroidManifest.xml

@@ -2,12 +2,12 @@ apply plugin: 'com.android.library'
 apply plugin: 'com.huawei.agconnect'
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion "28.0.3"
+    compileSdkVersion 29
+    buildToolsVersion "29.0.3"
 
     defaultConfig {
-        minSdkVersion 17
-        targetSdkVersion 26
+        minSdkVersion 19
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
 
@@ -61,7 +61,7 @@ dependencies {
 
     implementation("cn.leancloud:realtime-core:${rootProject.ext.sdkVersion}")
 
-    implementation 'com.huawei.hms:push:4.0.2.300'
+    implementation 'com.huawei.hms:push:5.1.1.301'
 
     implementation 'androidx.appcompat:appcompat:1.0.0'
     testImplementation 'junit:junit:4.12'

android-sdk/leancloud-search/build.gradle

@@ -26,6 +26,7 @@ public AVHMSMessageService() {
    *
    * @param remoteMessage
    */
+  @Override
   public void onMessageReceived(RemoteMessage remoteMessage) {
     try {
       AndroidNotificationManager androidNotificationManager = AndroidNotificationManager.getInstance();
@@ -46,9 +47,6 @@ public void onMessageReceived(RemoteMessage remoteMessage) {
     }
   }
 
-  public void onDeletedMessages() {
-  }
-
   /**
    * 服务端更新token回调方法。
    * 参考文档：https://developer.huawei.com/consumer/cn/doc/development/HMS-References/push-HmsMessageService-cls#onMessageReceived
@@ -59,6 +57,7 @@ public void onDeletedMessages() {
    *
    * @param token
    */
+  @Override
   public void onNewToken(String token) {
     updateAVInstallation(token);
   }
@@ -67,6 +66,7 @@ public void onNewToken(String token) {
    * 申请token失败回调方法
    * @param exception
    */
+  @Override
   public void onTokenError(Exception exception) {
     LOGGER.w("failed to apply token. cause: " + exception.getMessage());
   }