Browse Source

minor flow changes

new_design
Mohan Shiwakoti 1 year ago
parent
commit
3705d31eb7
  1. 2
      app/release/output-metadata.json
  2. 7
      app/src/main/java/com/remit/jmecustomer/features/home/presenter/HomeViewModel.java
  3. 10
      app/src/main/java/com/remit/jmecustomer/features/myTransfers/view/MyTransfersFragment.kt

2
app/release/output-metadata.json

@ -13,7 +13,7 @@
"attributes": [], "attributes": [],
"versionCode": 15, "versionCode": 15,
"versionName": "1.2", "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" "elementType": "File"

7
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.SessionExpiredException;
import com.remit.jmecustomer.utils.https.UserSessionObserverResponse; import com.remit.jmecustomer.utils.https.UserSessionObserverResponse;
import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@ -78,8 +79,12 @@ public class HomeViewModel extends BaseViewModel implements HomeV2PresenterInter
public ObservableSource<? extends UserInfoModelV2> apply(Throwable throwable) throws Exception { public ObservableSource<? extends UserInfoModelV2> apply(Throwable throwable) throws Exception {
if (throwable instanceof SessionExpiredException) if (throwable instanceof SessionExpiredException)
return Observable.error(throwable); return Observable.error(throwable);
else if (throwable instanceof IOException)
return Observable.error(throwable);
else if (throwable instanceof HttpException && ((HttpException) throwable).code() == 401) else if (throwable instanceof HttpException && ((HttpException) throwable).code() == 401)
return Observable.error(new SessionExpiredException(HTTPConstants.getErrorMessageFromCode(((HttpException) throwable).code()))); return Observable.error(new SessionExpiredException(HTTPConstants.getErrorMessageFromCode(((HttpException) throwable).code())));
else if (throwable instanceof HttpException && ((HttpException) throwable).code() == 404)
return Observable.error(throwable);
else else
return Observable.empty(); return Observable.empty();
} }
@ -346,10 +351,12 @@ public class HomeViewModel extends BaseViewModel implements HomeV2PresenterInter
@Override @Override
public void onFailed(String message) { public void onFailed(String message) {
Log.d("DashBoardError", "Recieved Error : " + message); Log.d("DashBoardError", "Recieved Error : " + message);
view.showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, alertType -> view.exitView());
} }
@Override @Override
protected void onConnectionNotEstablished(String message) { protected void onConnectionNotEstablished(String message) {
view.showPopUpMessage(message, CustomAlertDialog.AlertType.NO_INTERNET, null);
Log.d("DashBoardError", "Recieved Error : " + message); Log.d("DashBoardError", "Recieved Error : " + message);
} }

10
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) _binding = FragmentMyTransfersBinding.inflate(inflater, container, false)
init() init()
Handler().postDelayed({ 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) }, 2000)
setUpData() setUpData()
@ -495,7 +499,7 @@ class MyTransfersFragment : BaseFragment(),
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data) super.onActivityResult(requestCode, resultCode, data)
performDefaultAction("", true)
performDefaultAction("", true)
} }
inner class SearchEditTextTextWatcher : TextWatcherAdapter() { inner class SearchEditTextTextWatcher : TextWatcherAdapter() {

Loading…
Cancel
Save