Browse Source

[공통][Common] api 통신 후 예외 발생 시 디버그 모드에서는 노출

hyodong.min 7 years ago
parent
commit
52e0abf16d
1 changed files with 19 additions and 12 deletions
  1. 19 12
      app/src/main/java/kr/co/zumo/app/lifeplus/model/module/APIModule.java

+ 19 - 12
app/src/main/java/kr/co/zumo/app/lifeplus/model/module/APIModule.java

@@ -23,6 +23,7 @@ import kr.co.zumo.app.lifeplus.model.BasicParamProvider;
 import kr.co.zumo.app.lifeplus.model.IParamProvider;
 import kr.co.zumo.app.lifeplus.model.IParamProvider;
 import kr.co.zumo.app.lifeplus.util.AppUtil;
 import kr.co.zumo.app.lifeplus.util.AppUtil;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
+import kr.co.zumo.app.lifeplus.util.StringUtil;
 import okhttp3.ResponseBody;
 import okhttp3.ResponseBody;
 import retrofit2.HttpException;
 import retrofit2.HttpException;
 
 
@@ -133,17 +134,7 @@ public abstract class APIModule<T extends JsonBeanBase, B extends APIBean> imple
     public void accept(Throwable e) throws Exception {
     public void accept(Throwable e) throws Exception {
       Log.e("APP#  APIErrorConsumer | accept", "| ############################## " + e.toString());
       Log.e("APP#  APIErrorConsumer | accept", "| ############################## " + e.toString());
       e.printStackTrace();
       e.printStackTrace();
-      String message = e.getLocalizedMessage();
-//      if (StringUtil.isEmpty(message)) {
-//        message = e.getMessage();
-//      }
-//      if (StringUtil.isEmpty(message)) {
-//        message = e.toString();
-//      }
-
-//      if (AppUtil.isRelease()) {
-//      message = ResourceUtil.getString(R.string.network_error_message_detail_dialog);
-//      }
+      String message;
 
 
       APIError apiError;
       APIError apiError;
       if (e instanceof HttpException) {
       if (e instanceof HttpException) {
@@ -162,7 +153,23 @@ public abstract class APIModule<T extends JsonBeanBase, B extends APIBean> imple
         apiError = new APIError(APIError.ERROR_HTTP);
         apiError = new APIError(APIError.ERROR_HTTP);
       }
       }
       else {
       else {
-        message = ResourceUtil.getString(R.string.network_error_message_detail_dialog);
+        if (AppUtil.isRelease()) {
+          message = ResourceUtil.getString(R.string.network_error_message_detail_dialog);
+        }
+        else {
+          // fixme 디버그용 에러 메세지
+          // 기타 에러
+          message = e.getLocalizedMessage();
+          if (StringUtil.isEmpty(message)) {
+            message = e.getMessage();
+          }
+          if (StringUtil.isEmpty(message)) {
+            message = e.toString();
+          }
+          if (AppUtil.isRelease()) {
+            message = ResourceUtil.getString(R.string.network_error_message_detail_dialog);
+          }
+        }
         apiError = new APIError(APIError.ERROR_HTTP);
         apiError = new APIError(APIError.ERROR_HTTP);
       }
       }