diff --git a/ring-android/app/src/main/java/cx/ring/client/HomeActivity.java b/ring-android/app/src/main/java/cx/ring/client/HomeActivity.java index d93538d5a74e8cb0e1e3ad674a15a4e99cbafb36..59b1eff24924f13063391a8e9782f3d3f5e2ccb8 100644 --- a/ring-android/app/src/main/java/cx/ring/client/HomeActivity.java +++ b/ring-android/app/src/main/java/cx/ring/client/HomeActivity.java @@ -327,10 +327,9 @@ public class HomeActivity extends AppCompatActivity implements BottomNavigationV e -> Log.e(TAG, "Error loading avatar", e))); } - /* activity gets back to the foreground and user input */ @Override - protected void onResume() { - super.onResume(); + protected void onStart() { + super.onStart(); mAccountCheckDisposable.clear(); mAccountCheckDisposable.add(mAccountService.getObservableAccountList() .firstElement() @@ -379,6 +378,12 @@ public class HomeActivity extends AppCompatActivity implements BottomNavigationV } } + @Override + protected void onStop() { + super.onStop(); + mDisposable.clear(); + } + public void startConversationTablet(Bundle bundle) { fConversation = new ConversationFragment(); fConversation.setArguments(bundle); @@ -414,12 +419,6 @@ public class HomeActivity extends AppCompatActivity implements BottomNavigationV .addToBackStack(CONTACT_REQUESTS_TAG).commit(); } - @Override - protected void onPause() { - super.onPause(); - mDisposable.clear(); - } - @Override public void onBackPressed() { if (mAccountFragmentBackHandlerInterface != null && mAccountFragmentBackHandlerInterface.onBackPressed()) {