Skip to content
This repository was archived by the owner on May 5, 2021. It is now read-only.

Commit 2ac3702

Browse files
Merge pull request SORMAS-Foundation#3907 from AxelNennker/newest_Firebase_#3356
SORMAS-Foundation#3356 Migrate to the newest Firebase version
2 parents 58e8b0f + 1016fbd commit 2ac3702

4 files changed

Lines changed: 21 additions & 25 deletions

File tree

sormas-app/app/build.gradle

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
apply plugin: 'com.android.application'
2+
apply plugin: 'com.google.gms.google-services'
3+
apply plugin: 'com.google.firebase.crashlytics'
24
apply plugin: 'com.google.firebase.firebase-perf'
35

46
ext.sormasVersion = getVersionName()
@@ -86,11 +88,12 @@ dependencies {
8688
implementation 'com.j256.ormlite:ormlite-core:5.1'
8789
implementation 'com.j256.ormlite:ormlite-android:5.1'
8890
implementation 'javax.persistence:persistence-api:1.0.2'
89-
implementation 'com.google.firebase:firebase-core:17.2.2'
90-
implementation 'com.google.firebase:firebase-perf:19.0.5'
91-
implementation 'com.google.firebase:firebase-config:19.1.1'
92-
implementation 'com.google.firebase:firebase-analytics:17.2.2'
93-
implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'
91+
implementation 'com.google.firebase:firebase-crashlytics:17.3.0'
92+
implementation 'com.google.firebase:firebase-analytics:18.0.0'
93+
94+
implementation 'com.google.firebase:firebase-core:18.0.0'
95+
implementation 'com.google.firebase:firebase-perf:19.0.10'
96+
implementation 'com.google.firebase:firebase-config:20.0.1'
9497
implementation("de.symeda.sormas:sormas-api:$sormasVersion") { changing = true }
9598
implementation 'com.github.mpkorstanje:simmetrics-core:4.1.1'
9699
implementation 'com.google.guava:guava:19.0'
@@ -126,9 +129,6 @@ dependencies {
126129
implementation 'me.dm7.barcodescanner:zxing:1.9.13'
127130
}
128131

129-
apply plugin: 'com.google.gms.google-services'
130-
apply plugin: 'io.fabric'
131-
132132
apply plugin: "jacoco"
133133

134134
jacoco {

sormas-app/app/src/main/java/de/symeda/sormas/app/login/LoginActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
package de.symeda.sormas.app.login;
1717

18-
import com.crashlytics.android.Crashlytics;
18+
import com.google.firebase.crashlytics.FirebaseCrashlytics;
1919

2020
import android.app.Activity;
2121
import android.app.ProgressDialog;
@@ -265,7 +265,7 @@ private void checkLoginAndDoUpdateAndInitialSync() {
265265

266266
private void initializeFirebase() {
267267
((SormasApplication) getApplication()).getFirebaseAnalytics().setUserId(ConfigProvider.getUser().getUuid());
268-
Crashlytics.setUserIdentifier(ConfigProvider.getUser().getUuid());
268+
FirebaseCrashlytics.getInstance().setUserId(ConfigProvider.getUser().getUuid());
269269
}
270270

271271
private void openLandingActivity() {

sormas-app/app/src/main/java/de/symeda/sormas/app/util/ErrorReportingHelper.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
package de.symeda.sormas.app.util;
1717

18-
import com.crashlytics.android.Crashlytics;
18+
import com.google.firebase.crashlytics.FirebaseCrashlytics;
1919

2020
import de.symeda.sormas.app.backend.common.AbstractDomainObject;
2121
import de.symeda.sormas.app.backend.config.ConfigProvider;
@@ -28,9 +28,10 @@ public class ErrorReportingHelper {
2828
* Sends an exception report to Firebase Analytics.
2929
*/
3030
public static void sendCaughtException(Exception e) {
31-
Crashlytics.setString(FirebaseParameter.CONNECTION_ID, String.valueOf(RetroProvider.getLastConnectionId()));
32-
Crashlytics.setString(FirebaseParameter.SERVER_URL, ConfigProvider.getServerRestUrl());
33-
Crashlytics.logException(e);
31+
FirebaseCrashlytics crashlytics = FirebaseCrashlytics.getInstance();
32+
crashlytics.setCustomKey(FirebaseParameter.CONNECTION_ID, String.valueOf(RetroProvider.getLastConnectionId()));
33+
crashlytics.setCustomKey(FirebaseParameter.SERVER_URL, ConfigProvider.getServerRestUrl());
34+
crashlytics.recordException(e);
3435
}
3536

3637
/**
@@ -41,8 +42,9 @@ public static void sendCaughtException(Exception e) {
4142
*/
4243
public static void sendCaughtException(Exception e, AbstractDomainObject entity) {
4344
if (entity != null) {
44-
Crashlytics.setString(FirebaseParameter.ENTITY_TYPE, entity.getClass().getSimpleName());
45-
Crashlytics.setString(FirebaseParameter.ENTITY_UUID, entity.getUuid());
45+
FirebaseCrashlytics crashlytics = FirebaseCrashlytics.getInstance();
46+
crashlytics.setCustomKey(FirebaseParameter.ENTITY_TYPE, entity.getClass().getSimpleName());
47+
crashlytics.setCustomKey(FirebaseParameter.ENTITY_UUID, entity.getUuid());
4648
}
4749
sendCaughtException(e);
4850
}

sormas-app/build.gradle

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,12 @@ buildscript {
44
repositories {
55
google()
66
jcenter()
7-
maven {
8-
url 'https://maven.fabric.io/public'
9-
}
107
}
118
dependencies {
129
classpath 'com.android.tools.build:gradle:3.5.3'
13-
classpath 'io.fabric.tools:gradle:1.31.0'
14-
classpath 'com.google.gms:google-services:4.3.3'
15-
classpath 'com.google.firebase:perf-plugin:1.3.1'
10+
classpath 'com.google.gms:google-services:4.3.4'
11+
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.4.1'
12+
classpath 'com.google.firebase:perf-plugin:1.3.4'
1613
classpath 'org.jacoco:org.jacoco.core:0.8.5'
1714
classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.8'
1815

@@ -25,9 +22,6 @@ allprojects {
2522
repositories {
2623
google()
2724
jcenter()
28-
maven {
29-
url 'https://maven.fabric.io/public'
30-
}
3125
mavenLocal()
3226
flatDir {
3327
dirs 'libs'

0 commit comments

Comments
 (0)