Merge pull request #7030 from nextcloud/preventFirebaseCrashes

Prevent firebase crashes
nextcloud · Oct 2, 2020 · 501eb7d · 501eb7d
2 parents b83bf82 + b66adb9
commit 501eb7d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -47,9 +47,6 @@ configurations {
     ktlint
 
     all {
-        exclude group: 'com.google.firebase', module: 'firebase-core'
-        exclude group: 'com.google.firebase', module: 'firebase-analytics'
-        exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'
         exclude group: 'org.jetbrains', module: 'annotations-java5' // via prism4j, already using annotations explicitly
 
         // check for updates every build

diff --git a/gplay.gradle b/gplay.gradle
@@ -1,3 +1,3 @@
 dependencies {
-    implementation "com.google.firebase:firebase-messaging:20.1.3"
+    implementation "com.google.firebase:firebase-messaging:20.2.4"
 }
diff --git a/lint.xml b/lint.xml
@@ -62,5 +62,6 @@
         <ignore path="**/jetified-butterknife-runtime-10.**/**/lint.jar" />
         <ignore path="**/jetified-dagger-lint-aar-2.29.**/**/lint.jar" />
         <ignore path="**/jetified-annotation-experimental-1.**/**/lint.jar" />
+        <ignore path="**/jetified-firebase-installations**/**/lint.jar" />
     </issue>
 </lint>
diff --git a/src/gplay/AndroidManifest.xml b/src/gplay/AndroidManifest.xml
@@ -30,10 +30,13 @@
 
         <meta-data
             android:name="firebase_analytics_collection_deactivated"
-            android:value="true"/>
+            android:value="true" />
         <meta-data
             android:name="google_analytics_adid_collection_enabled"
-            android:value="false"/>
+            android:value="false" />
+        <meta-data
+            android:name="google_analytics_ssaid_collection_enabled"
+            android:value="false" />
 
         <activity
             android:name=".authentication.ModifiedAuthenticatorActivity"