diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/exchange_rate/presenter/ExchangeRateV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/exchange_rate/presenter/ExchangeRateV2Presenter.java index 3da95e57..44f5c55a 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/exchange_rate/presenter/ExchangeRateV2Presenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/exchange_rate/presenter/ExchangeRateV2Presenter.java @@ -75,7 +75,7 @@ public class ExchangeRateV2Presenter extends BasePresenter implements ExchangeRa public void onViewDestroyed() { super.onViewDestroyed(); if (compositeDisposables != null && !compositeDisposables.isDisposed()) - compositeDisposables.dispose(); + compositeDisposables.clear(); } private boolean validateAmount(String amount) { diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/exchange_rate/view/ExchangeMethodV2Activity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/exchange_rate/view/ExchangeMethodV2Activity.java index a1984ab4..f40bf609 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/exchange_rate/view/ExchangeMethodV2Activity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/exchange_rate/view/ExchangeMethodV2Activity.java @@ -218,6 +218,7 @@ public class ExchangeMethodV2Activity extends BaseActivity implements PaymentMod @Override protected void onDestroy() { super.onDestroy(); + presenter.onViewDestroyed(); registerTextWatchers(false); } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2Presenter.java index b3d6c7a8..890839f2 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2Presenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2Presenter.java @@ -98,6 +98,15 @@ public class HomeV2Presenter extends BasePresenter implements HomeV2PresenterInt } + @Override + public void onViewDestroyed() { + super.onViewDestroyed(); + if (compositeDisposable != null && !compositeDisposable.isDisposed()) + compositeDisposable.clear(); + + } + + public class UserInfoObserver extends UserSessionObserverResponse { @Override diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeActivityV2.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeActivityV2.java index 06ab9da8..0265469d 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeActivityV2.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeActivityV2.java @@ -348,6 +348,13 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra } + @Override + protected void onDestroy() { + super.onDestroy(); + presenter.onViewDestroyed(); + } + + private void showFetaureComingSoon() { CustomAlertDialog customAlertDialog = new CustomAlertDialog(); customAlertDialog.setAlertType(CustomAlertDialog.AlertType.ALERT);