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

app/src/main/java/kr/co/zumo/app/lifeplus/activity/AppInitializer.java

@@ -9,7 +9,7 @@ import android.util.Log;
 import kr.co.zumo.app.lifeplus.helper.AppShieldHelper;
 import kr.co.zumo.app.lifeplus.helper.ContentsLogManager;
 import kr.co.zumo.app.lifeplus.helper.EventEntryHelper;
-import kr.co.zumo.app.lifeplus.helper.FirebaseHelper;
+import kr.co.zumo.app.lifeplus.helper.FirebaseMessagingHelper;
 import kr.co.zumo.app.lifeplus.model.SuperModel;
 import kr.co.zumo.app.lifeplus.model.SuperModelInit;
 import kr.co.zumo.app.lifeplus.model.module.APIModuleHelper;
@@ -73,7 +73,7 @@ public class AppInitializer {
     MemberInfoModelHelper.getInstance().dispose();
     AnimatorManager.getInstance().dispose();
     PushMessageBroker.getInstance().dispose();
-    FirebaseHelper.getInstance().dispose();
+    FirebaseMessagingHelper.getInstance().dispose();
     BucketListManager.getInstance().dispose();
     BookmarkManager.getInstance().dispose();
     SystemPopupManager.getInstance().dispose();

app/src/main/java/kr/co/zumo/app/lifeplus/activity/SplashPresenter.java

@@ -21,7 +21,7 @@ import kr.co.zumo.app.lifeplus.bean.api.EmergencyBean;
 import kr.co.zumo.app.lifeplus.config.NetworkConfigProvider;
 import kr.co.zumo.app.lifeplus.helper.AppShieldHelper;
 import kr.co.zumo.app.lifeplus.helper.AppVersionHelper;
-import kr.co.zumo.app.lifeplus.helper.FirebaseHelper;
+import kr.co.zumo.app.lifeplus.helper.FirebaseMessagingHelper;
 import kr.co.zumo.app.lifeplus.helper.Helper;
 import kr.co.zumo.app.lifeplus.model.SuperModel;
 import kr.co.zumo.app.lifeplus.model.SuperModelInit;
@@ -254,7 +254,7 @@ public class SplashPresenter implements ISplashContract.Presenter, IModuleEmerge
               AppInitializer.init(context);
 
               // topic 가입
-              FirebaseHelper.getInstance().subscribeToTopic();
+              FirebaseMessagingHelper.getInstance().subscribeToTopic();
 
               view.linkActivity(fragmentFlag);
 

app/src/main/java/kr/co/zumo/app/lifeplus/helper/FirebaseHelper.java

@@ -21,7 +21,7 @@ import kr.co.zumo.app.lifeplus.util.StringUtil;
 import kr.co.zumo.app.lifeplus.view.ToastProvider;
 
 /**
- * FirebaseHelper
+ * FirebaseMessagingHelper
  * <pre>
  * </pre>
  *
@@ -30,15 +30,15 @@ import kr.co.zumo.app.lifeplus.view.ToastProvider;
  * @history 민효동   [2019. 1. 31.]   [최초 작성]
  * @since 2019. 1. 31.
  */
-public class FirebaseHelper {
-  private static FirebaseHelper ourInstance = new FirebaseHelper();
+public class FirebaseMessagingHelper {
+  private static FirebaseMessagingHelper ourInstance = new FirebaseMessagingHelper();
   private Disposable disposable;
 
-  public static FirebaseHelper getInstance() {
+  public static FirebaseMessagingHelper getInstance() {
     return ourInstance;
   }
 
-  private FirebaseHelper() {
+  private FirebaseMessagingHelper() {
   }
 
   /**
@@ -50,7 +50,7 @@ public class FirebaseHelper {
     FirebaseInstanceId.getInstance().getInstanceId()
       .addOnCompleteListener(task -> {
         if (!task.isSuccessful()) {
-          Log.e("APP#  FirebaseHelper | onComplete", "|" + "getInstanceId failed", task.getException());
+          Log.e("APP#  FirebaseMessagingHelper | onComplete", "|" + "getInstanceId failed", task.getException());
           return;
         }
 
@@ -58,7 +58,7 @@ public class FirebaseHelper {
         String token = task.getResult().getToken();
 
         // Log and toast
-        Log.d("APP# FirebaseHelper | onComplete", "|" + " token: " + token);
+        Log.d("APP# FirebaseMessagingHelper | onComplete", "|" + " token: " + token);
         sendRegistrationToServer(token);
       });
     // [END retrieve_current_token]
@@ -69,14 +69,14 @@ public class FirebaseHelper {
    */
   public void subscribeToTopic() {
 
-    Log.d("APP# FirebaseHelper | init", "|" + " topic: " + NetworkConfig.getFcmTopic());
+    Log.d("APP# FirebaseMessagingHelper | init", "|" + " topic: " + NetworkConfig.getFcmTopic());
     FirebaseMessaging.getInstance().subscribeToTopic(NetworkConfig.getFcmTopic())
       .addOnCompleteListener(task -> {
         if (task.isSuccessful()) {
-          Log.d("APP# FirebaseHelper | onComplete", "|" + " topic subscribe success");
+          Log.d("APP# FirebaseMessagingHelper | onComplete", "|" + " topic subscribe success");
         }
         else {
-          Log.e("APP#  FirebaseHelper | onComplete", "|" + " topic subscribe failed");
+          Log.e("APP#  FirebaseMessagingHelper | onComplete", "|" + " topic subscribe failed");
         }
       });
   }
@@ -88,20 +88,20 @@ public class FirebaseHelper {
    */
   public void sendRegistrationToServer(String token) {
     if (StringUtil.isEmpty(SuperModel.getInstance().getUserId())) {
-      Log.d("APP# FirebaseHelper | sendRegistrationToServer", "|" + "guest skip....");
+      Log.d("APP# FirebaseMessagingHelper | sendRegistrationToServer", "|" + "guest skip....");
       return;
     }
     disposable = new LifeplusAPIRepository().saveFcmToken(new ParameterMapper<TokenRequestBean>().map(new BasicParamProvider(), new TokenRequestBean(token)))
       .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread())
       .subscribe(resultBean -> {
         if (resultBean.isSuccess()) {
-          Log.d("APP# FirebaseHelper | sendRegistrationToServer", "|" + "         token saved..");
+          Log.d("APP# FirebaseMessagingHelper | sendRegistrationToServer", "|" + "         token saved..");
         }
         else {
-          Log.d("APP# FirebaseHelper | sendRegistrationToServer", "|" + resultBean.getReturnMessage());
+          Log.d("APP# FirebaseMessagingHelper | sendRegistrationToServer", "|" + resultBean.getReturnMessage());
         }
       }, e -> {
-        Log.e("APP#  FirebaseHelper | sendRegistrationToServer", "|" + "token saving error");
+        Log.e("APP#  FirebaseMessagingHelper | sendRegistrationToServer", "|" + "token saving error");
         ToastProvider.showNative("token saving error");
       });
 

app/src/main/java/kr/co/zumo/app/lifeplus/model/module/APIMemberSelectModule.java

@@ -14,7 +14,7 @@ import kr.co.zumo.app.lifeplus.bean.api.LoginResultBean;
 import kr.co.zumo.app.lifeplus.bean.api.RequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.SettingMemberBean;
 import kr.co.zumo.app.lifeplus.bean.api.SettingMemberResultBean;
-import kr.co.zumo.app.lifeplus.helper.FirebaseHelper;
+import kr.co.zumo.app.lifeplus.helper.FirebaseMessagingHelper;
 import kr.co.zumo.app.lifeplus.model.SuperModel;
 import kr.co.zumo.app.lifeplus.network.api.LifeplusAPIRepository;
 import kr.co.zumo.app.lifeplus.supervisor.ContentsFlagHelper;
@@ -47,7 +47,7 @@ public class APIMemberSelectModule extends LifeplusAPIModule<RequestBean, LoginR
 
         // 로그인 이후 fcm 토큰 저장
         if (loginResultBean.isSuccess()) {
-          FirebaseHelper.getInstance().init();
+          FirebaseMessagingHelper.getInstance().init();
         }
 
         // contents flag
@@ -84,7 +84,7 @@ public class APIMemberSelectModule extends LifeplusAPIModule<RequestBean, LoginR
 //      .doOnSuccess(loginResultBean -> {
 //        // 로그인 이후 fcm 토큰 저장
 //        if (loginResultBean.isSuccess()) {
-//          FirebaseHelper.getInstance().init();
+//          FirebaseMessagingHelper.getInstance().init();
 //        }
 //      });
   }

app/src/main/java/kr/co/zumo/app/lifeplus/push/FirebasePushService.java

@@ -25,7 +25,7 @@ import java.util.Map;
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.activity.PushGateActivity;
 import kr.co.zumo.app.lifeplus.bean.PushBean;
-import kr.co.zumo.app.lifeplus.helper.FirebaseHelper;
+import kr.co.zumo.app.lifeplus.helper.FirebaseMessagingHelper;
 import kr.co.zumo.app.lifeplus.model.SuperModel;
 import kr.co.zumo.app.lifeplus.model.SuperModelInit;
 import kr.co.zumo.app.lifeplus.supervisor.PushMessageManager;
@@ -53,7 +53,7 @@ public class FirebasePushService extends FirebaseMessagingService {
     Log.d("APP# FirebasePushService | onMessageReceived 53", "|" + "Refreshed token: " + token);
 
     SuperModelInit.instant(getApplicationContext());
-    FirebaseHelper.getInstance().sendRegistrationToServer(token);
+    FirebaseMessagingHelper.getInstance().sendRegistrationToServer(token);
   }
 
   // 메시지 수신