Merge branch 'develop' of https://github.com/swict/LifeplusAndroid into develop

app/build.gradle

@@ -1,5 +1,7 @@
 apply plugin: 'com.android.application'
 apply plugin: 'com.google.gms.google-services'
+apply plugin: 'io.fabric'
+apply plugin: 'com.google.firebase.firebase-perf'
 
 def keystoreProperties = new Properties()
 keystoreProperties.load(new FileInputStream(rootProject.file("keystore.properties")))
@@ -155,7 +157,7 @@ dependencies {
     implementation 'com.google.firebase:firebase-dynamic-links:16.1.8'
     implementation 'com.google.firebase:firebase-core:16.0.8'
     implementation 'com.google.firebase:firebase-config:16.4.1'
-    
+
     /*********************************
      * External lib
      *********************************/
@@ -183,13 +185,23 @@ dependencies {
     implementation 'com.google.android.gms:play-services-auth:16.0.0'
     implementation 'com.kakao.sdk:usermgmt:1.14.0'
     implementation 'com.kakao.sdk:kakaotalk:1.14.0'
+
     // Naver login sdk
     implementation files('libs/3rdparty_login_library_android_4.1.4.jar')
+
+    // Advertise platform
     implementation files('libs/buzzad-android-sdk-advertiser-1.0.1.jar')
     implementation files('libs/cashslide-sdk20170320.jar')
     implementation files('libs/libNswitchSDK_v1.1.2.jar')
     implementation files('libs/tnkad-sdk.jar')
 
+    // Crashlytics
+    implementation 'com.google.firebase:firebase-core:16.0.7'
+    implementation 'com.crashlytics.sdk.android:crashlytics:2.9.9'
+
+    // Performance
+    implementation 'com.google.firebase:firebase-perf:16.2.4'
+
     /*********************************
      * UNIT TEST
      *********************************/

app/src/main/java/kr/co/zumo/app/lifeplus/view/presenter/Presenter.java

@@ -507,7 +507,10 @@ public abstract class Presenter<M extends Model, V extends IView> implements ILi
       if (ScreenID.UTILITY_ACTIVITY == id) {
         // UTILITY_ACTIVITY 는 실제 screenId 로 체크해줌.
         UtilityActivityBean utilityActivityBean = model.getDeliveryPackaging(UtilityActivityBean.class);
-        id = checkId(utilityActivityBean.getScreenId());
+        int replacedId = checkId(utilityActivityBean.getScreenId());
+        if (replacedId != utilityActivityBean.getScreenId()) {
+          id = replacedId;
+        }
       }
       else {
         id = checkId(id);

build.gradle

@@ -6,6 +6,9 @@ buildscript {
         google()
         jcenter()
         mavenCentral()
+        maven {
+            url 'https://maven.fabric.io/public'
+        }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.2.1'
@@ -14,6 +17,9 @@ buildscript {
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
+
+        classpath 'io.fabric.tools:gradle:1.26.1'
+        classpath 'com.google.firebase:firebase-plugins:1.1.5'
     }
 }
 
@@ -23,6 +29,9 @@ allprojects {
         jcenter()
         mavenCentral()
         maven { url 'http://devrepo.kakao.com:8088/nexus/content/groups/public/' }
+        maven {
+            url 'https://maven.google.com/'
+        }
     }
 }