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

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

@@ -24,8 +24,6 @@ public class ContentsActivity extends ActivityBaseScreen {
   @Override
   protected void render() {
 
-    // fixme 호환되는지 테스트
-
     ActivityDeliveryHelper.getInstance().shipTo(getHelper(DeliveryHelper.class));
 
 //    ContentsDeliveryBean contentsDeliveryBean = ActivityDeliveryHelper.getInstance().getPackaging(ContentsDeliveryBean.class);

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

@@ -24,8 +24,6 @@ public class ContentsOverviewActivity extends ActivityBaseScreen {
   @Override
   protected void render() {
 
-    // fixme 호환되는지 테스트
-
     ActivityDeliveryHelper.getInstance().shipTo(getHelper(DeliveryHelper.class));
 
 //    ContentsDeliveryBean contentsDeliveryBean = ActivityDeliveryHelper.getInstance().getPackaging(ContentsDeliveryBean.class);

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

@@ -24,7 +24,6 @@ public class ContentsWebActivity extends ActivityBaseScreen {
   @Override
   protected void render() {
 
-    // fixme 호환되는지 테스트
     ActivityDeliveryHelper.getInstance().shipTo(getHelper(DeliveryHelper.class));
 
 //    ContentsDeliveryBean contentsDeliveryBean = ActivityDeliveryHelper.getInstance().getPackaging(ContentsDeliveryBean.class);

app/src/main/java/kr/co/zumo/app/lifeplus/model/Model.java

@@ -17,7 +17,6 @@ import kr.co.zumo.app.lifeplus.helper.Helper;
 import kr.co.zumo.app.lifeplus.helper.IHelperProvider;
 import kr.co.zumo.app.lifeplus.network.INetworkReceiverListener;
 import kr.co.zumo.app.lifeplus.network.NetworkWatcher;
-import kr.co.zumo.app.lifeplus.supervisor.ActivityDeliveryHelper;
 import kr.co.zumo.app.lifeplus.util.StringUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
 
@@ -234,14 +233,6 @@ public abstract class Model extends ViewModel implements ILifeCycle, IHelperProv
     helper.clearPackaging();
   }
 
-  /**
-   * DeliveryHelper 의 객체를 ActivityDeliveryHelper 로 전달한다.
-   */
-  public void shipToActivity() {
-    DeliveryHelper helper = getHelper(DeliveryHelper.class);
-    helper.shipTo(ActivityDeliveryHelper.getInstance());
-  }
-
   /***********************************
    * ILifeCycle
    ***********************************/

app/src/main/java/kr/co/zumo/app/lifeplus/supervisor/screen/ActivityScreen.java

@@ -18,6 +18,7 @@ import kr.co.zumo.app.lifeplus.activity.MyCoinActivity;
 import kr.co.zumo.app.lifeplus.activity.NotiActivity;
 import kr.co.zumo.app.lifeplus.activity.SignUpActivity;
 import kr.co.zumo.app.lifeplus.bean.CategoryDeliveryBean;
+import kr.co.zumo.app.lifeplus.helper.DeliveryHelper;
 import kr.co.zumo.app.lifeplus.helper.ScreenManagerHelper;
 import kr.co.zumo.app.lifeplus.supervisor.ActivityDeliveryHelper;
 import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
@@ -122,7 +123,7 @@ public class ActivityScreen extends Screen {
   }
 
   private void shipToActivity() {
-    helper.getModel().shipToActivity();
+    helper.getModel().getHelper(DeliveryHelper.class).shipTo(ActivityDeliveryHelper.getInstance());
   }
 
   private void shipToActivity(Object packaging) {