diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/exrate/presenter/ExchangeRatePresenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/exrate/presenter/ExchangeRatePresenter.java index 77b18245..bc7fc4ff 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/exrate/presenter/ExchangeRatePresenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/exrate/presenter/ExchangeRatePresenter.java @@ -1,7 +1,6 @@ package com.gmeremit.online.gmeremittance_native.exrate.presenter; import android.os.Handler; -import android.util.Log; import com.gmeremit.online.gmeremittance_native.GmeApplication; import com.gmeremit.online.gmeremittance_native.R; @@ -29,6 +28,8 @@ import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.CompositeDisposable; import io.reactivex.schedulers.Schedulers; +import static com.gmeremit.online.gmeremittance_native.utils.https.HTTPConstants.HTTP_INVALID_REQUEST; + public class ExchangeRatePresenter extends BasePresenter implements ExchangeRatePresenterInterface { private final ExchangeRatePresenterInterface.ExchangeRateContractInterfacee view; @@ -312,6 +313,11 @@ public class ExchangeRatePresenter extends BasePresenter implements ExchangeRate view.showPayoutAmount(Utils.formatCurrencyWithoutTruncatingDecimal(pAmount)); view.showCollectionAmount(Utils.formatCurrency(cAmount)); } + else + { + clearExistingRateOnFailure(); + view.showPopUpMessage(HTTP_INVALID_REQUEST, CustomAlertDialog.AlertType.FAILED, null); + } } else { clearExistingRateOnFailure(); diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/notice/presenter/NoticeViewModel.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/notice/presenter/NoticeViewModel.java index 868644ec..2a9baf29 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/notice/presenter/NoticeViewModel.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/notice/presenter/NoticeViewModel.java @@ -96,11 +96,10 @@ public class NoticeViewModel extends BaseViewModel implements NoticePresenterInt @Override protected void onSuccess(GenericResponseDataModel> t) { if (t.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) { - if(t.getData()!=null&&t.getData().size()>0) { + if (t.getData() != null && t.getData().size() > 0) { view.lazyInitViews(); sortNoticeList(t.getData()); - } - else + } else view.showPopUpMessage("You don't have any notification at the moment.", CustomAlertDialog.AlertType.FAILED, alertType -> view.exitView()); } else { @@ -136,7 +135,8 @@ public class NoticeViewModel extends BaseViewModel implements NoticePresenterInt // } // return 0; // }); - Collections.reverse(data); + if (data != null) + Collections.reverse(data); noticeListLiveData.setValue(data); } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/presenter/resend/ReSendMoneyV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/presenter/resend/ReSendMoneyV2Presenter.java index c8a09396..c87bd47d 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/presenter/resend/ReSendMoneyV2Presenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/presenter/resend/ReSendMoneyV2Presenter.java @@ -163,7 +163,7 @@ public class ReSendMoneyV2Presenter extends BasePresenter implements ReSendMoney @Override public void getPrepData() { if (previousTransactionRelatedData == null) - view.showPopUpMessage(HTTPConstants.HTTP_BAD_URL, CustomAlertDialog.AlertType.FAILED, alertType -> view.exitView()); + view.showPopUpMessage(HTTPConstants.HTTP_INVALID_REQUEST, CustomAlertDialog.AlertType.FAILED, alertType -> view.exitView()); else { compositeObservable.add( this.gateway.getResendRelatedData(this.gateway.getAuth(), previousTransactionRelatedData.getSelectedTransaction().getTranId()) diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/HTTPConstants.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/HTTPConstants.java index 0f3e8f15..d79603b2 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/HTTPConstants.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/HTTPConstants.java @@ -8,7 +8,7 @@ public class HTTPConstants { public static final String HTTP_RESPONSE_NO_INTERNET = "No internet"; public static final String HTTP_RESPONSE_UNKNOWN = "Unknown Error"; public static final String APPLICATION_WISE_ERROR_KEY = "1"; - public static final String HTTP_BAD_URL = "Bad Request. Please contact GME Support."; + public static final String HTTP_INVALID_REQUEST = "Invalid Request. Please contact GME Support."; private static final String HTTP_RESPONSE_405 = "405"; diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/webbrowserV2/WebBrowserFragmentV2.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/webbrowserV2/WebBrowserFragmentV2.java index 22924eb8..d1f55964 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/webbrowserV2/WebBrowserFragmentV2.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/webbrowserV2/WebBrowserFragmentV2.java @@ -180,7 +180,7 @@ public abstract class WebBrowserFragmentV2 extends BaseFragment { return HTTPConstants.HTTP_RESPONSE_NO_INTERNET; case WebViewClient.ERROR_BAD_URL: - return HTTPConstants.HTTP_BAD_URL; + return HTTPConstants.HTTP_INVALID_REQUEST; default: return HTTPConstants.HTTP_RESPONSE_UNKNOWN; diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/webbrowserV2/WebBrowserV2Activity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/webbrowserV2/WebBrowserV2Activity.java index dfc46882..87ab53c4 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/webbrowserV2/WebBrowserV2Activity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/webbrowserV2/WebBrowserV2Activity.java @@ -385,7 +385,7 @@ public abstract class WebBrowserV2Activity extends BaseActivity implements View return HTTPConstants.HTTP_RESPONSE_NO_INTERNET; case WebViewClient.ERROR_BAD_URL: - return HTTPConstants.HTTP_BAD_URL; + return HTTPConstants.HTTP_INVALID_REQUEST; default: return HTTPConstants.HTTP_RESPONSE_UNKNOWN;