Merge pull request #1312 from RocketChat/googbye-gcm

[IMPROVEMENT] FCM in place of GCM

app/build.gradle

@@ -26,6 +26,13 @@ android {
             keyAlias System.getenv("KEY_ALIAS")
             keyPassword System.getenv("KEY_PASSWORD")
         }
+
+        debug {
+            storeFile project.rootProject.file('debug.keystore').getCanonicalFile()
+            storePassword "android"
+            keyAlias "androiddebugkey"
+            keyPassword "android"
+        }
     }
 
     buildTypes {
@@ -40,6 +47,7 @@ android {
         debug {
             buildConfigField "String", "REQUIRED_SERVER_VERSION", '"0.62.0"'
             buildConfigField "String", "RECOMMENDED_SERVER_VERSION", '"0.63.0"'
+            signingConfig signingConfigs.debug
             applicationIdSuffix ".dev"
         }
     }
@@ -73,7 +81,7 @@ dependencies {
     kapt libraries.daggerProcessor
     kapt libraries.daggerAndroidApt
 
-    implementation libraries.playServicesGcm
+    implementation libraries.fcm
 
     implementation libraries.room
     kapt libraries.roomProcessor

app/src/main/AndroidManifest.xml

@@ -3,25 +3,17 @@
     package="chat.rocket.android">
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
-    <permission
-        android:name="${applicationId}.permission.C2D_MESSAGE"
-        android:protectionLevel="signature" />
-
-    <uses-permission android:name="${applicationId}.permission.C2D_MESSAGE" />
-
     <application
         android:name=".app.RocketChatApplication"
         android:allowBackup="true"
         android:fullBackupContent="@xml/backup_config"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
         android:networkSecurityConfig="@xml/network_security_config"
+        android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true">
 
         <activity
@@ -39,8 +31,10 @@
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.BROWSABLE" />
                 <category android:name="android.intent.category.DEFAULT" />
+
                 <data
                     android:host="auth"
                     android:scheme="rocketchat" />
@@ -90,18 +84,6 @@
             android:name=".settings.about.ui.AboutActivity"
             android:theme="@style/AppTheme" />
 
-        <receiver
-            android:name="com.google.android.gms.gcm.GcmReceiver"
-            android:exported="true"
-            android:permission="com.google.android.c2dm.permission.SEND">
-            <intent-filter>
-                <action android:name="com.google.android.c2dm.intent.RECEIVE" />
-                <action android:name="com.google.android.c2dm.intent.REGISTRATION" />
-
-                <category android:name="${applicationId}" />
-            </intent-filter>
-        </receiver>
-
         <receiver
             android:name=".push.DirectReplyReceiver"
             android:enabled="true"
@@ -118,13 +100,16 @@
                 <action android:name="com.google.firebase.INSTANCE_ID_EVENT" />
             </intent-filter>
         </service>
+
         <service
-            android:name=".push.GcmListenerService"
-            android:exported="false">
+            android:name=".push.FirebaseMessagingService"
+            android:enabled="true"
+            android:exported="true">
             <intent-filter>
-                <action android:name="com.google.android.c2dm.intent.RECEIVE" />
+                <action android:name="com.google.firebase.MESSAGING_EVENT" />
             </intent-filter>
         </service>
+
         <service
             android:name=".chatroom.service.MessageService"
             android:exported="true"

app/src/main/java/chat/rocket/android/dagger/module/ServiceBuilder.kt

@@ -2,10 +2,10 @@ package chat.rocket.android.dagger.module
 
 import chat.rocket.android.chatroom.di.MessageServiceProvider
 import chat.rocket.android.chatroom.service.MessageService
+import chat.rocket.android.push.FirebaseMessagingService
 import chat.rocket.android.push.FirebaseTokenService
-import chat.rocket.android.push.GcmListenerService
+import chat.rocket.android.push.di.FirebaseMessagingServiceProvider
 import chat.rocket.android.push.di.FirebaseTokenServiceProvider
-import chat.rocket.android.push.di.GcmListenerServiceProvider
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
 
@@ -14,8 +14,8 @@ import dagger.android.ContributesAndroidInjector
     @ContributesAndroidInjector(modules = [FirebaseTokenServiceProvider::class])
     abstract fun bindFirebaseTokenService(): FirebaseTokenService
 
-    @ContributesAndroidInjector(modules = [GcmListenerServiceProvider::class])
-    abstract fun bindGcmListenerService(): GcmListenerService
+    @ContributesAndroidInjector(modules = [FirebaseMessagingServiceProvider::class])
+    abstract fun bindGcmListenerService(): FirebaseMessagingService
 
     @ContributesAndroidInjector(modules = [MessageServiceProvider::class])
     abstract fun bindMessageService(): MessageService

app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt

 package chat.rocket.android.main.ui
 
+import DrawableHelper
 import android.app.Activity
 import android.app.AlertDialog
 import android.os.Bundle
@@ -11,8 +12,8 @@ import android.view.MenuItem
 import android.view.View
 import chat.rocket.android.BuildConfig
 import chat.rocket.android.R
-import chat.rocket.android.main.adapter.Selector
 import chat.rocket.android.main.adapter.AccountsAdapter
+import chat.rocket.android.main.adapter.Selector
 import chat.rocket.android.main.presentation.MainPresenter
 import chat.rocket.android.main.presentation.MainView
 import chat.rocket.android.main.viewmodel.NavHeaderViewModel
@@ -22,8 +23,8 @@ import chat.rocket.android.util.extensions.fadeOut
 import chat.rocket.android.util.extensions.rotateBy
 import chat.rocket.android.util.extensions.showToast
 import chat.rocket.common.model.UserStatus
-import com.google.android.gms.gcm.GoogleCloudMessaging
-import com.google.android.gms.iid.InstanceID
+import com.google.firebase.iid.FirebaseInstanceId
+import com.google.firebase.messaging.FirebaseMessaging
 import dagger.android.AndroidInjection
 import dagger.android.AndroidInjector
 import dagger.android.DispatchingAndroidInjector
@@ -52,8 +53,8 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector, HasSupp
 
         launch(CommonPool) {
             try {
-                val token = InstanceID.getInstance(this@MainActivity).getToken(getString(R.string.gcm_sender_id), GoogleCloudMessaging.INSTANCE_ID_SCOPE, null)
-                Timber.d("GCM token: $token")
+                val token = FirebaseInstanceId.getInstance().token
+                Timber.d("FCM token: $token")
                 presenter.refreshToken(token)
             } catch (ex: Exception) {
                 Timber.d(ex, "Missing play services...")
@@ -135,7 +136,7 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector, HasSupp
     }
 
     override fun invalidateToken(token: String) {
-        InstanceID.getInstance(this).deleteToken(token, GoogleCloudMessaging.INSTANCE_ID_SCOPE)
+        FirebaseInstanceId.getInstance().deleteToken(token, FirebaseMessaging.INSTANCE_ID_SCOPE)
     }
 
     private fun setupAccountsList(header: View, accounts: List<Account>) {

app/src/main/java/chat/rocket/android/push/GcmListenerService.kt → app/src/main/java/chat/rocket/android/push/FirebaseMessagingService.kt

 package chat.rocket.android.push
 
-import android.os.Bundle
-import com.google.android.gms.gcm.GcmListenerService
+import androidx.core.os.bundleOf
+import com.google.firebase.messaging.FirebaseMessagingService
+import com.google.firebase.messaging.RemoteMessage
 import dagger.android.AndroidInjection
 import javax.inject.Inject
 
-class GcmListenerService : GcmListenerService() {
+class FirebaseMessagingService : FirebaseMessagingService() {
 
     @Inject
     lateinit var pushManager: PushManager
@@ -15,9 +16,9 @@ class GcmListenerService : GcmListenerService() {
         AndroidInjection.inject(this)
     }
 
-    override fun onMessageReceived(from: String?, data: Bundle?) {
-        data?.let {
-            pushManager.handle(data)
+    override fun onMessageReceived(message: RemoteMessage) {
+        message.data?.let {
+            pushManager.handle(bundleOf(*(it.map { Pair(it.key, it.value) }).toTypedArray()))
         }
     }
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/push/FirebaseTokenService.kt

 package chat.rocket.android.push
 
-import chat.rocket.android.R
 import chat.rocket.android.infrastructure.LocalRepository
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
 import chat.rocket.android.util.retryIO
 import chat.rocket.common.RocketChatException
 import chat.rocket.core.internal.rest.registerPushToken
-import com.google.android.gms.gcm.GoogleCloudMessaging
-import com.google.android.gms.iid.InstanceID
+import com.google.firebase.iid.FirebaseInstanceId
 import com.google.firebase.iid.FirebaseInstanceIdService
 import dagger.android.AndroidInjection
 import kotlinx.coroutines.experimental.launch
@@ -31,21 +29,18 @@ class FirebaseTokenService : FirebaseInstanceIdService() {
     }
 
     override fun onTokenRefresh() {
-        //TODO: We need to use the Cordova Project gcm_sender_id since it's the one configured on RC
-        // default push gateway. We should register this project's own project sender id into it.
         try {
-            val gcmToken = InstanceID.getInstance(this)
-                    .getToken(getString(R.string.gcm_sender_id), GoogleCloudMessaging.INSTANCE_ID_SCOPE, null)
+            val fcmToken = FirebaseInstanceId.getInstance().token
             val currentServer = getCurrentServerInteractor.get()
             val client = currentServer?.let { factory.create(currentServer) }
 
-            gcmToken?.let {
-                localRepository.save(LocalRepository.KEY_PUSH_TOKEN, gcmToken)
+            fcmToken?.let {
+                localRepository.save(LocalRepository.KEY_PUSH_TOKEN, fcmToken)
                 client?.let {
                     launch {
                         try {
-                            Timber.d("Registering push token: $gcmToken for ${client.url}")
-                            retryIO("register push token") { client.registerPushToken(gcmToken)  }
+                            Timber.d("Registering push token: $fcmToken for ${client.url}")
+                            retryIO("register push token") { client.registerPushToken(fcmToken) }
                         } catch (ex: RocketChatException) {
                             Timber.e(ex, "Error registering push token")
                         }
@@ -53,7 +48,7 @@ class FirebaseTokenService : FirebaseInstanceIdService() {
                 }
             }
         } catch (ex: Exception) {
-            Timber.d(ex, "Error refreshing Firebase TOKEN")
+            Timber.e(ex, "Error refreshing Firebase TOKEN")
         }
     }
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/push/PushManager.kt

@@ -250,11 +250,14 @@ class PushManager @Inject constructor(
                 .setContentIntent(contentIntent)
                 .setMessageNotification()
 
+            if (host.isEmpty()) {
+                builder.setContentIntent(deleteIntent)
+            }
+
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 val channelId: String
                 val channelName: String
                 if (host.isEmpty()) {
-                    builder.setContentIntent(deleteIntent)
                     channelName = "Test Notification"
                     channelId = "test-channel"
                 } else {

app/src/main/java/chat/rocket/android/push/di/GcmListenerServiceProvider.kt → app/src/main/java/chat/rocket/android/push/di/FirebaseMessagingServiceProvider.kt

 package chat.rocket.android.push.di
 
 import chat.rocket.android.dagger.module.AppModule
-import chat.rocket.android.push.GcmListenerService
+import chat.rocket.android.push.FirebaseMessagingService
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
 
-@Module abstract class GcmListenerServiceProvider {
+@Module abstract class FirebaseMessagingServiceProvider {
     @ContributesAndroidInjector(modules = [AppModule::class])
-    abstract fun provideGcmListenerService(): GcmListenerService
+    abstract fun provideFirebaseMessagingService(): FirebaseMessagingService
 }
\ No newline at end of file

app/src/main/res/values/api_keys.xml

-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- This is the Cordova GCM sender id-->
-    <string name="gcm_sender_id" translatable="false">673693445664</string>
-</resources>
\ No newline at end of file

dependencies.gradle

@@ -15,6 +15,7 @@ ext {
             dagger                : '2.14.1',
             exoPlayer             : '2.6.0',
             playServices          : '11.8.0',
+            firebase              : '15.0.0',
             room                  : '1.0.0',
             lifecycle             : '1.1.1',
             rxKotlin              : '2.2.0',
@@ -58,7 +59,7 @@ ext {
             daggerSupport         : "com.google.dagger:dagger-android-support:${versions.dagger}",
             daggerProcessor       : "com.google.dagger:dagger-compiler:${versions.dagger}",
             daggerAndroidApt      : "com.google.dagger:dagger-android-processor:${versions.dagger}",
-            playServicesGcm       : "com.google.android.gms:play-services-gcm:${versions.playServices}",
+            fcm                   : "com.google.firebase:firebase-messaging:${versions.firebase}",
             exoPlayer             : "com.google.android.exoplayer:exoplayer:${versions.exoPlayer}",
 
             room                  : "android.arch.persistence.room:runtime:${versions.room}",