Remove deprecated FirebaseInstanceIdService

This replaces the deprecated usage with FirebaseMessagingService#onNewToken

PiperOrigin-RevId: 242530618

Author: Googler

messaging/AndroidManifest.xml

@@ -21,13 +21,6 @@
       </intent-filter>
     </service>
 
-    <service android:name="com.google.firebase.messaging.cpp.FcmInstanceIDListenerService"
-             android:exported="false" >
-      <intent-filter>
-        <action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
-      </intent-filter>
-    </service>
-
     <service android:name="com.google.firebase.messaging.cpp.RegistrationIntentService"
              android:exported="false" >
     </service>

messaging/messaging_additional.pro

@@ -1,5 +1,4 @@
 # Additional Proguard rules for Messaging.
 -keep,includedescriptorclasses public class com.google.android.gms.messaging.cpp.DebugLogging { *; }
--keep,includedescriptorclasses public class com.google.android.gms.messaging.cpp.FcmInstanceIDListenerService { *; }
 -keep,includedescriptorclasses public class com.google.android.gms.messaging.cpp.ListenerService { *; }
 -keep,includedescriptorclasses public class com.google.android.gms.messaging.cpp.RegistrationIntentService { *; }

messaging/src/android/java/com/google/firebase/messaging/cpp/FcmInstanceIDListenerService.java

@@ -67,4 +67,10 @@ public void onSendError(String messageId, Exception exception) {
     messageWriter.writeMessageEventToInternalStorage(
         this, messageId, MESSAGE_TYPE_SEND_ERROR, exception.toString());
   }
+
+  @Override
+  public void onNewToken(String token) {
+    DebugLogging.log(TAG, String.format("onNewToken token=%s", token));
+    RegistrationIntentService.writeTokenToInternalStorage(this, token);
+  }
 }

messaging/src/android/java/com/google/firebase/messaging/cpp/ListenerService.java

@@ -40,20 +40,15 @@ public RegistrationIntentService() {
   // Fetch the latest registration token and notify the C++ layer.
   @Override
   protected void onHandleIntent(Intent intent) {
-    refreshToken(this);
-  }
-
-  // Get the current instance ID token and send it to the C++ layer.
-  // This is public so that it can be called by FcmInstanceIDListenerService.
-  public static void refreshToken(Context context) {
     String token = FirebaseInstanceId.getInstance().getToken();
     DebugLogging.log(TAG, String.format("onHandleIntent token=%s", token));
     if (token != null) {
-      writeTokenToInternalStorage(context, token);
+      writeTokenToInternalStorage(this, token);
     }
   }
 
-  private static void writeTokenToInternalStorage(Context context, String token) {
+  /** Write token to internal storage so it can be accessed by the C++ layer. */
+  public static void writeTokenToInternalStorage(Context context, String token) {
     byte[] buffer = generateTokenByteBuffer(token);
     ByteBuffer sizeBuffer = ByteBuffer.allocate(4);
     // Write out the buffer length into the first four bytes.