Migrate from GCM to FCM (#760)

android/app/build.gradle

@@ -181,6 +181,21 @@ repositories {
 configurations.all {
     resolutionStrategy {
         force 'org.webkit:android-jsc:r225067'
+
+        eachDependency { DependencyResolveDetails details ->
+            if (details.requested.name == 'play-services-base') {
+                details.useTarget group: details.requested.group, name: details.requested.name, version: '15.0.1'
+            }
+            if (details.requested.name == 'play-services-tasks') {
+                details.useTarget group: details.requested.group, name: details.requested.name, version: '15.0.1'
+            }
+            if (details.requested.name == 'play-services-stats') {
+                details.useTarget group: details.requested.group, name: details.requested.name, version: '15.0.1'
+            }
+            if (details.requested.name == 'play-services-basement') {
+                details.useTarget group: details.requested.group, name: details.requested.name, version: '15.0.1'
+            }
+        }
     }
 }
 
@@ -199,7 +214,7 @@ dependencies {
     implementation project(':react-native-video')
     implementation project(':react-native-vector-icons')
     implementation project(':rn-fetch-blob')
-    implementation project(':@remobile/react-native-toast')
+    implementation project(':react-native-toast')
     implementation project(':react-native-fast-image')
     implementation project(':realm')
     implementation project(':reactnativenotifications')
@@ -213,7 +228,8 @@ dependencies {
     implementation 'com.facebook.fresco:animated-gif:1.10.0'
     implementation 'com.facebook.fresco:animated-webp:1.10.0'
     implementation 'com.facebook.fresco:webpsupport:1.10.0'
-    implementation 'com.google.android.gms:play-services-gcm:16.1.0'
+    implementation "com.google.firebase:firebase-core:16.0.1"
+    implementation "com.google.firebase:firebase-messaging:17.3.4"
     implementation('com.crashlytics.sdk.android:crashlytics:2.9.5@aar') {
         transitive = true;
     }
@@ -225,3 +241,6 @@ task copyDownloadableDepsToLibs(type: Copy) {
     from configurations.compile
     into 'libs'
 }
+
+apply plugin: 'com.google.gms.google-services'
+com.google.gms.googleservices.GoogleServicesPlugin.config.disableVersionCheck = true

android/app/google-services.json

@@ -0,0 +1,245 @@
+{
+  "project_info": {
+    "project_number": "673693445664",
+    "firebase_url": "https://rocketchat-9e9be.firebaseio.com",
+    "project_id": "rocketchat-9e9be",
+    "storage_bucket": "rocketchat-9e9be.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:673693445664:android:6ef4638e500ec958",
+        "android_client_info": {
+          "package_name": "RocketChat"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "673693445664-97s9t777ful7mn2510vuhb48958qd9tb.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyDIkZj1TRz8TmhnMswDwVY5OnWuzFK3rxg"
+        }
+      ],
+      "services": {
+        "analytics_service": {
+          "status": 1
+        },
+        "appinvite_service": {
+          "status": 1,
+          "other_platform_oauth_client": []
+        },
+        "ads_service": {
+          "status": 2
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:673693445664:android:16da2e50aff9f0c9",
+        "android_client_info": {
+          "package_name": "chat.rocket.android"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "673693445664-hrjftksij02vqtd467ln2cubvu48ft5j.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "chat.rocket.android",
+            "certificate_hash": "41cf750df786a6d9da712a98a629d0c8391876d6"
+          }
+        },
+        {
+          "client_id": "673693445664-k0mvosdjoe5dbvqce3b377ckabb5dgu8.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "chat.rocket.android",
+            "certificate_hash": "33fa8582794176014a59054192e261bfad0e5273"
+          }
+        },
+        {
+          "client_id": "673693445664-97s9t777ful7mn2510vuhb48958qd9tb.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyDIkZj1TRz8TmhnMswDwVY5OnWuzFK3rxg"
+        }
+      ],
+      "services": {
+        "analytics_service": {
+          "status": 1
+        },
+        "appinvite_service": {
+          "status": 2,
+          "other_platform_oauth_client": [
+            {
+              "client_id": "673693445664-97s9t777ful7mn2510vuhb48958qd9tb.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "673693445664-dumairnsk1sbkca5nmsq2b5kdglqpc0a.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "chat.rocket.ios",
+                "app_store_id": "1148741252"
+              }
+            }
+          ]
+        },
+        "ads_service": {
+          "status": 2
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:673693445664:android:1551054db195f705",
+        "android_client_info": {
+          "package_name": "chat.rocket.android.dev"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "673693445664-t5aeku0oie010npd40a0tgn27c418vk7.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "chat.rocket.android.dev",
+            "certificate_hash": "41cf750df786a6d9da712a98a629d0c8391876d6"
+          }
+        },
+        {
+          "client_id": "673693445664-iml14ln4vccuu7liclrpt2k671fkjs38.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "chat.rocket.android.dev",
+            "certificate_hash": "33fa8582794176014a59054192e261bfad0e5273"
+          }
+        },
+        {
+          "client_id": "673693445664-97s9t777ful7mn2510vuhb48958qd9tb.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyDIkZj1TRz8TmhnMswDwVY5OnWuzFK3rxg"
+        }
+      ],
+      "services": {
+        "analytics_service": {
+          "status": 1
+        },
+        "appinvite_service": {
+          "status": 2,
+          "other_platform_oauth_client": [
+            {
+              "client_id": "673693445664-97s9t777ful7mn2510vuhb48958qd9tb.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "673693445664-dumairnsk1sbkca5nmsq2b5kdglqpc0a.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "chat.rocket.ios",
+                "app_store_id": "1148741252"
+              }
+            }
+          ]
+        },
+        "ads_service": {
+          "status": 2
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:673693445664:android:8be27b1f7c42a2ed",
+        "android_client_info": {
+          "package_name": "chat.rocket.reactnative"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "673693445664-97s9t777ful7mn2510vuhb48958qd9tb.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyDIkZj1TRz8TmhnMswDwVY5OnWuzFK3rxg"
+        }
+      ],
+      "services": {
+        "analytics_service": {
+          "status": 1
+        },
+        "appinvite_service": {
+          "status": 1,
+          "other_platform_oauth_client": []
+        },
+        "ads_service": {
+          "status": 2
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:673693445664:android:64932c99863e2838",
+        "android_client_info": {
+          "package_name": "com.konecty.rocket.chat"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "673693445664-3ajben08beuco6eout3kpod2gbbm8fij.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.konecty.rocket.chat",
+            "certificate_hash": "cd5806ba3f0141d0f2e47acfe64a485f575108ab"
+          }
+        },
+        {
+          "client_id": "673693445664-97s9t777ful7mn2510vuhb48958qd9tb.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyDIkZj1TRz8TmhnMswDwVY5OnWuzFK3rxg"
+        }
+      ],
+      "services": {
+        "analytics_service": {
+          "status": 1
+        },
+        "appinvite_service": {
+          "status": 2,
+          "other_platform_oauth_client": [
+            {
+              "client_id": "673693445664-97s9t777ful7mn2510vuhb48958qd9tb.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "673693445664-dumairnsk1sbkca5nmsq2b5kdglqpc0a.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "chat.rocket.ios",
+                "app_store_id": "1148741252"
+              }
+            }
+          ]
+        },
+        "ads_service": {
+          "status": 2
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

android/app/src/main/AndroidManifest.xml

@@ -9,15 +9,6 @@
 	<uses-permission android:name="android.permission.WAKE_LOCK" />
 	<uses-permission-sdk-23 android:name="android.permission.VIBRATE"/>
 
-	<permission
-		android:name="${applicationId}.permission.C2D_MESSAGE"
-		android:protectionLevel="signature" />
-	<uses-permission android:name="${applicationId}.permission.C2D_MESSAGE" />
-
-	<uses-sdk
-		android:minSdkVersion="21"
-		android:targetSdkVersion="27" />
-
 	<application
 		android:name=".MainApplication"
 		android:allowBackup="true"
@@ -45,8 +36,6 @@
 			</intent-filter>
 		</activity>
 		<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
-
-		<meta-data android:name="com.wix.reactnativenotifications.gcmSenderId" android:value="673693445664\0"/>
 	</application>
 
 </manifest>

android/build.gradle

@@ -4,12 +4,11 @@ buildscript {
     repositories {
         mavenLocal()
         google()
-        // mavenCentral()
         jcenter()
     }
     dependencies {
-        // classpath 'com.android.tools.build:gradle:2.2.3'
         classpath 'com.android.tools.build:gradle:3.1.0'
+        classpath 'com.google.gms:google-services:4.0.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -19,12 +18,8 @@ buildscript {
 allprojects {
     repositories {
         mavenLocal()
-        // mavenCentral()
         google()
         jcenter()
-        // maven {
-        //     url 'https://maven.google.com'
-        // }
         maven { url "https://jitpack.io" }
         maven {
             // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm

android/settings.gradle

@@ -11,8 +11,8 @@ include ':react-native-device-info'
 project(':react-native-device-info').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-device-info/android')
 include ':react-native-gesture-handler'
 project(':react-native-gesture-handler').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-gesture-handler/android')
-include ':@remobile/react-native-toast'
+include ':react-native-toast'
-project(':@remobile/react-native-toast').projectDir = new File(rootProject.projectDir, '../node_modules/@remobile/react-native-toast/android')
+project(':react-native-toast').projectDir = new File(rootProject.projectDir, '../node_modules/@remobile/react-native-toast/android')
 include ':rn-fetch-blob'
 project(':rn-fetch-blob').projectDir = new File(rootProject.projectDir, '../node_modules/rn-fetch-blob/android')
 include ':react-native-image-crop-picker'

package.json

@@ -49,7 +49,7 @@
     "react-native-keyboard-tracking-view": "^5.5.0",
     "react-native-markdown-renderer": "^3.2.8",
     "react-native-modal": "^7.0.2",
-    "react-native-notifications": "1.1.23",
+    "react-native-notifications": "1.2.6",
     "react-native-optimized-flatlist": "^1.0.4",
     "react-native-orientation-locker": "^1.1.3",
     "react-native-picker-select": "^5.2.3",

yarn.lock

@@ -10225,10 +10225,10 @@ react-native-modal@^7.0.2:
     prop-types "^15.6.1"
     react-native-animatable "^1.2.4"
 
-react-native-notifications@1.1.23:
+react-native-notifications@1.2.6:
-  version "1.1.23"
+  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/react-native-notifications/-/react-native-notifications-1.1.23.tgz#06313aea5d1d9e5ab2716e09ffb76391aaf0ebe2"
+  resolved "https://registry.yarnpkg.com/react-native-notifications/-/react-native-notifications-1.2.6.tgz#04afb4d7be74ede71faa7e05629e2b84986ef8e6"
-  integrity sha512-AVWhPZJ4+pHH7dEvphH2593wv2D+Xp9whNRftVm5xpP7h8XLOuObQBlfZniJDlXd34GLMuYXmtJ44gAg+HwIMQ==
+  integrity sha512-ZInyL8zpV/ZhK9IJwpuRCyJ8bzu7Agcj3o95Ux7t7Q6BVzjEQ4diShgrxVXNC9CHZ/4U52ILu4kF7r2KTavmLA==
   dependencies:
     core-js "^1.0.0"
     uuid "^2.0.3"