Merge pull request #140 from pusher/revert-136-firebase

Revert "Remove firebaseiid (#136)"
pusher · Feb 22, 2023 · f5e3e70 · f5e3e70
2 parents b2252d2 + f66b036
commit f5e3e70
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/.../androidTest/java/com/example/pushnotificationsintegrationtests/DeviceRegistrationTest.kt b/.../androidTest/java/com/example/pushnotificationsintegrationtests/DeviceRegistrationTest.kt
@@ -2,7 +2,7 @@ package com.example.pushnotificationsintegrationtests
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.google.firebase.installations.FirebaseInstallations
+import com.google.firebase.iid.FirebaseInstanceId
 import com.pusher.pushnotifications.PushNotificationsInstance
 import com.pusher.pushnotifications.SubscriptionsChangedListener
 import com.pusher.pushnotifications.fcm.MessagingService
@@ -166,7 +166,7 @@ class DeviceRegistrationTest {
     val oldToken = errol.getInstanceStorage(instanceId).devices[storedDeviceId]?.token
     assertThat(oldToken, `is`(not(equalTo(""))))
 
-    Tasks.await(FirebaseInstallations.getInstance().delete());
+    FirebaseInstanceId.getInstance().deleteInstanceId()
 
     await.atMost(DEVICE_REGISTRATION_WAIT_SECS, TimeUnit.SECONDS) until {
       // The server should have the new token now

diff --git a/pushnotifications/build.gradle b/pushnotifications/build.gradle
@@ -49,9 +49,8 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}"
     implementation "org.jetbrains.kotlin:kotlin-reflect:1.5.0"
 
-
-    implementation 'com.google.firebase:firebase-installations:17.1.0'
     compileOnly "com.google.firebase:firebase-messaging:22.0.0"
+    compileOnly "com.google.firebase:firebase-iid:21.1.0"
 
     implementation("androidx.work:work-runtime-ktx:2.7.0")
     implementation 'androidx.concurrent:concurrent-futures:1.1.0'

diff --git a/pushnotifications/src/main/java/com/pusher/pushnotifications/PushNotificationsInstance.kt b/pushnotifications/src/main/java/com/pusher/pushnotifications/PushNotificationsInstance.kt
@@ -3,7 +3,7 @@ package com.pusher.pushnotifications
 import java.util.regex.Pattern
 import android.content.Context
 import android.os.*
-import com.google.firebase.installations.FirebaseInstallations
+import com.google.firebase.iid.FirebaseInstanceId
 import com.pusher.pushnotifications.api.DeviceMetadata
 import com.pusher.pushnotifications.api.PushNotificationsAPI
 import com.pusher.pushnotifications.auth.TokenProvider
@@ -184,7 +184,7 @@ class PushNotificationsInstance @JvmOverloads constructor(
     }
 
     MessagingService.onRefreshToken = handleFcmToken
-    FirebaseInstallations.getInstance().getToken(false).addOnCompleteListener { task ->
+    FirebaseInstanceId.getInstance().instanceId.addOnCompleteListener { task ->
       if (!task.isSuccessful) {
         log.w("Failed to get the token from FCM", task.exception)
       } else {