diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index 7cfd42ac..8864dce1 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -13,7 +13,7 @@ "attributes": [], "versionCode": 15, "versionName": "1.2", - "outputFile": "JME_NEW_May_28_v15(1.2)-release.apk" + "outputFile": "JME_NEW_May_29_v15(1.2)-release.apk" } ], "elementType": "File" diff --git a/app/src/main/java/com/remit/jmecustomer/features/home/presenter/HomeViewModel.java b/app/src/main/java/com/remit/jmecustomer/features/home/presenter/HomeViewModel.java index 7686bd9f..bc0524db 100644 --- a/app/src/main/java/com/remit/jmecustomer/features/home/presenter/HomeViewModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/home/presenter/HomeViewModel.java @@ -24,6 +24,7 @@ import com.remit.jmecustomer.utils.https.MessageResponseDataModel; import com.remit.jmecustomer.utils.https.SessionExpiredException; import com.remit.jmecustomer.utils.https.UserSessionObserverResponse; +import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; @@ -78,8 +79,12 @@ public class HomeViewModel extends BaseViewModel implements HomeV2PresenterInter public ObservableSource apply(Throwable throwable) throws Exception { if (throwable instanceof SessionExpiredException) return Observable.error(throwable); + else if (throwable instanceof IOException) + return Observable.error(throwable); else if (throwable instanceof HttpException && ((HttpException) throwable).code() == 401) return Observable.error(new SessionExpiredException(HTTPConstants.getErrorMessageFromCode(((HttpException) throwable).code()))); + else if (throwable instanceof HttpException && ((HttpException) throwable).code() == 404) + return Observable.error(throwable); else return Observable.empty(); } @@ -346,10 +351,12 @@ public class HomeViewModel extends BaseViewModel implements HomeV2PresenterInter @Override public void onFailed(String message) { Log.d("DashBoardError", "Recieved Error : " + message); + view.showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, alertType -> view.exitView()); } @Override protected void onConnectionNotEstablished(String message) { + view.showPopUpMessage(message, CustomAlertDialog.AlertType.NO_INTERNET, null); Log.d("DashBoardError", "Recieved Error : " + message); } diff --git a/app/src/main/java/com/remit/jmecustomer/features/myTransfers/view/MyTransfersFragment.kt b/app/src/main/java/com/remit/jmecustomer/features/myTransfers/view/MyTransfersFragment.kt index 61efbeb1..81415e80 100644 --- a/app/src/main/java/com/remit/jmecustomer/features/myTransfers/view/MyTransfersFragment.kt +++ b/app/src/main/java/com/remit/jmecustomer/features/myTransfers/view/MyTransfersFragment.kt @@ -94,8 +94,12 @@ class MyTransfersFragment : BaseFragment(), _binding = FragmentMyTransfersBinding.inflate(inflater, container, false) init() Handler().postDelayed({ - if (!(requireActivity() as HomeActivityV3).isNotificaitonViewActive()) { - performDefaultAction("", true) + try { + if (!(requireActivity() as HomeActivityV3).isNotificaitonViewActive()) { + performDefaultAction("", true) + } + } catch (ex: java.lang.Exception) { + ex.printStackTrace() } }, 2000) setUpData() @@ -495,7 +499,7 @@ class MyTransfersFragment : BaseFragment(), override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { super.onActivityResult(requestCode, resultCode, data) - performDefaultAction("", true) + performDefaultAction("", true) } inner class SearchEditTextTextWatcher : TextWatcherAdapter() {