Merge pull request #2664 from BlueBubblesApp/tanay/1.13.0

Tanay/1.13.0

android/app/src/main/AndroidManifest.xml

@@ -49,6 +49,7 @@
 
     <!-- Permission added by external package - remove it here -->
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" tools:node="remove" />
+    <uses-permission android:name="com.google.android.gms.permission.AD_ID" tools:node="remove" />
 
     <application
         tools:replace="android:label"

android/app/src/main/kotlin/com/bluebubbles/messaging/services/firebase/FirebaseAuthHandler.kt

@@ -25,7 +25,13 @@ class FirebaseAuthHandler: MethodCallHandlerImpl() {
         context: Context
     ) {
         // Don't auth multiple times
-        if (firebaseApp != null) result.success(null)
+        try {
+            FirebaseApp.getInstance()
+            Log.d(Constants.logTag, "Firebase has already been initialized!")
+            result.success(null)
+            return
+        } catch (_: IllegalStateException) {}
+        // Make sure Google Services are available
         if (GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(context) != ConnectionResult.SUCCESS) {
             val error = "Google Play Services is not available!"
             Log.e(Constants.logTag, error)

pubspec.yaml

@@ -12,7 +12,7 @@ description: Send iMessages on Android using BlueBubbles!
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 
-version: 1.13.0+62
+version: 1.13.0+63
 publish_to: none
 
 environment: