[푸시][New] 리팩토링

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

@@ -12,13 +12,11 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;
 import kr.co.zumo.app.lifeplus.bean.api.TokenRequestBean;
-import kr.co.zumo.app.lifeplus.config.INetworkConfig;
-import kr.co.zumo.app.lifeplus.config.NetworkConfigProvider;
+import kr.co.zumo.app.lifeplus.config.NetworkConfig;
 import kr.co.zumo.app.lifeplus.model.BasicParamProvider;
 import kr.co.zumo.app.lifeplus.model.SuperModel;
 import kr.co.zumo.app.lifeplus.network.api.LifeplusAPIRepository;
 import kr.co.zumo.app.lifeplus.network.api.ParameterMapper;
-import kr.co.zumo.app.lifeplus.util.AppUtil;
 import kr.co.zumo.app.lifeplus.util.StringUtil;
 import kr.co.zumo.app.lifeplus.view.ToastProvider;
 
@@ -65,10 +63,8 @@ public class FirebaseHelper {
       });
     // [END retrieve_current_token]
 
-    INetworkConfig networkConfig = NetworkConfigProvider.getNetworkConfig(AppUtil.isDebug());
-    Log.d("APP# FirebaseHelper | init", "|" + " topic: " + networkConfig.getFcmTopic());
-
-    FirebaseMessaging.getInstance().subscribeToTopic(networkConfig.getFcmTopic())
+    Log.d("APP# FirebaseHelper | init", "|" + " topic: " + NetworkConfig.getFcmTopic());
+    FirebaseMessaging.getInstance().subscribeToTopic(NetworkConfig.getFcmTopic())
       .addOnCompleteListener(task -> {
         if (task.isSuccessful()) {
           Log.d("APP# FirebaseHelper | onComplete", "|" + " topic subscribe success");

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

@@ -40,7 +40,7 @@ public class APIMemberSelectModule extends LifeplusAPIModule<RequestBean, LoginR
         // 로그인 결과를 파싱 -> 상태를 저장
         new LoginModuleParser(SuperModel.getInstance()).parse(loginResultBean);
 
-        // 로그인 이후 fcm 토근 저장
+        // 로그인 이후 fcm 토큰 저장
         if (loginResultBean.isSuccess()) {
           FirebaseHelper.getInstance().init();
         }
@@ -61,7 +61,7 @@ public class APIMemberSelectModule extends LifeplusAPIModule<RequestBean, LoginR
 
 //    return Single.fromObservable(Observable.combineLatest(login.toObservable(), flags.toObservable(), (loginResultBean, flagResultBean) -> loginResultBean))
 //      .doOnSuccess(loginResultBean -> {
-//        // 로그인 이후 fcm 토근 저장
+//        // 로그인 이후 fcm 토큰 저장
 //        if (loginResultBean.isSuccess()) {
 //          FirebaseHelper.getInstance().init();
 //        }

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

@@ -52,6 +52,7 @@ public class FirebasePushService extends FirebaseMessagingService {
   public void onNewToken(String token) {
     Log.d("APP# FirebasePushService | onMessageReceived", "|" + "Refreshed token: " + token);
 
+    SuperModelInit.instant(getApplicationContext());
     FirebaseHelper.getInstance().sendRegistrationToServer(token);
   }