Commit 38bb34f9 authored by Tiago Cunha's avatar Tiago Cunha

Assert should only assert something

Not change state
parent 78a53a1f
...@@ -66,25 +66,18 @@ abstract class AbstractAuthedActivity extends AbstractFragmentActivity { ...@@ -66,25 +66,18 @@ abstract class AbstractAuthedActivity extends AbstractFragmentActivity {
private void updateHostnameIfNeeded(SharedPreferences prefs) { private void updateHostnameIfNeeded(SharedPreferences prefs) {
String newHostname = prefs.getString(RocketChatCache.KEY_SELECTED_SERVER_HOSTNAME, null); String newHostname = prefs.getString(RocketChatCache.KEY_SELECTED_SERVER_HOSTNAME, null);
if (hostname == null) { if (hostname == null) {
if (newHostname != null && assertServerRealmStoreExists(newHostname, prefs)) { if (newHostname != null && assertServerRealmStoreExists(newHostname)) {
updateHostname(newHostname); updateHostname(newHostname);
} }
} else { } else {
if (!hostname.equals(newHostname) && assertServerRealmStoreExists(newHostname, prefs)) { if (!hostname.equals(newHostname) && assertServerRealmStoreExists(newHostname)) {
updateHostname(newHostname); updateHostname(newHostname);
} }
} }
} }
private boolean assertServerRealmStoreExists(String hostname, SharedPreferences prefs) { private boolean assertServerRealmStoreExists(String hostname) {
if (RealmStore.get(hostname) == null) { return RealmStore.get(hostname) != null;
prefs.edit()
.remove(RocketChatCache.KEY_SELECTED_SERVER_HOSTNAME)
.remove(RocketChatCache.KEY_SELECTED_ROOM_ID)
.apply();
return false;
}
return true;
} }
private void updateHostname(String hostname) { private void updateHostname(String hostname) {
...@@ -106,7 +99,7 @@ abstract class AbstractAuthedActivity extends AbstractFragmentActivity { ...@@ -106,7 +99,7 @@ abstract class AbstractAuthedActivity extends AbstractFragmentActivity {
} }
private boolean assertRoomSubscriptionExists(String roomId, SharedPreferences prefs) { private boolean assertRoomSubscriptionExists(String roomId, SharedPreferences prefs) {
if (!assertServerRealmStoreExists(hostname, prefs)) { if (!assertServerRealmStoreExists(hostname)) {
return false; return false;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment