Merge pull request #596 from RocketChat/fix/logout-and-login-same-user

[FIX] Logout and login with the same user

app/build.gradle

@@ -3,7 +3,8 @@ apply plugin: 'io.fabric'
 
 repositories {
     maven { url 'https://maven.fabric.io/public' }
-    maven { url 'https://github.com/uPhyca/stetho-realm/raw/master/maven-repo' }
+//    maven { url 'https://github.com/uPhyca/stetho-realm/raw/master/maven-repo' }
+    maven { url 'https://github.com/WickeDev/stetho-realm/raw/master/maven-repo' }
 }
 
 apply plugin: 'kotlin-android'
@@ -100,7 +101,7 @@ ext {
     playLibVersion = '11.6.0'
     stethoVersion = '1.5.0'
     stethoOkhttp3Version = '1.5.0'
-    stethoRealmVersion = '2.1.0'
+    stethoRealmVersion = '2.2.2'
     rxbindingVersion = '2.0.0'
     rxlifecycleVersion = '2.1.0'
     icepickVersion = '3.2.0'

app/src/main/java/chat/rocket/android/activity/MainActivity.java

@@ -347,15 +347,12 @@ public class MainActivity extends AbstractAuthedActivity implements MainContract
 
     @DebugLog
     public void onLogout() {
+        presenter.prepareToLogout();
         if (new RocketChatCache(getApplicationContext()).getSelectedServerHostname() == null) {
+            finish();
             LaunchUtil.showMainActivity(this);
         } else {
             onHostnameUpdated();
         }
     }
-
-    @DebugLog
-    public void beforeLogoutCleanUp() {
-        presenter.beforeLogoutCleanUp();
-    }
 }

app/src/main/java/chat/rocket/android/activity/MainContract.java

@@ -40,6 +40,6 @@ public interface MainContract {
 
     void loadSignedInServers(String hostname);
 
-    void beforeLogoutCleanUp();
+    void prepareToLogout();
   }
 }

app/src/main/java/chat/rocket/android/activity/MainPresenter.java

@@ -28,6 +28,7 @@ import chat.rocket.core.models.Session;
 import chat.rocket.core.models.User;
 import chat.rocket.core.repositories.PublicSettingRepository;
 import chat.rocket.core.utils.Pair;
+import hugo.weaving.DebugLog;
 import io.reactivex.Flowable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
@@ -133,8 +134,9 @@ public class MainPresenter extends BasePresenter<MainContract.View>
         addSubscription(subscription);
     }
 
+    @DebugLog
     @Override
-    public void beforeLogoutCleanUp() {
+    public void prepareToLogout() {
         clearSubscriptions();
     }
 

app/src/main/java/chat/rocket/android/fragment/chatroom/RoomPresenter.java

@@ -77,7 +77,7 @@ public class RoomPresenter extends BasePresenter<RoomContract.View>
         .observeOn(AndroidSchedulers.mainThread())
         .subscribe(
             success -> {
-              if (success) {
+              if (!success) {
                 connectivityManagerApi.keepAliveServer();
               }
             },
@@ -89,14 +89,13 @@ public class RoomPresenter extends BasePresenter<RoomContract.View>
 
   @Override
   public void loadMoreMessages() {
-
     final Disposable subscription = getSingleRoom()
         .flatMap(messageInteractor::loadMoreMessages)
         .subscribeOn(AndroidSchedulers.from(BackgroundLooper.get()))
         .observeOn(AndroidSchedulers.mainThread())
         .subscribe(
             success -> {
-              if (success) {
+              if (!success) {
                 connectivityManagerApi.keepAliveServer();
               }
             },

app/src/main/java/chat/rocket/android/fragment/server_config/LoginPresenter.java

@@ -18,81 +18,81 @@ import chat.rocket.core.repositories.PublicSettingRepository;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 
 public class LoginPresenter extends BasePresenter<LoginContract.View>
-    implements LoginContract.Presenter {
-
-  private final LoginServiceConfigurationRepository loginServiceConfigurationRepository;
-  private final PublicSettingRepository publicSettingRepository;
-  private final MethodCallHelper methodCallHelper;
-
-  public LoginPresenter(LoginServiceConfigurationRepository loginServiceConfigurationRepository,
-                        PublicSettingRepository publicSettingRepository,
-                        MethodCallHelper methodCallHelper) {
-    this.loginServiceConfigurationRepository = loginServiceConfigurationRepository;
-    this.publicSettingRepository = publicSettingRepository;
-    this.methodCallHelper = methodCallHelper;
-  }
-
-  @Override
-  public void bindView(@NonNull LoginContract.View view) {
-    super.bindView(view);
-
-    getLoginServices();
-  }
-
-  @Override
-  public void login(String username, String password) {
-    if (TextUtils.isEmpty(username) || TextUtils.isEmpty(password)) {
-      return;
+        implements LoginContract.Presenter {
+
+    private final LoginServiceConfigurationRepository loginServiceConfigurationRepository;
+    private final PublicSettingRepository publicSettingRepository;
+    private final MethodCallHelper methodCallHelper;
+
+    public LoginPresenter(LoginServiceConfigurationRepository loginServiceConfigurationRepository,
+                          PublicSettingRepository publicSettingRepository,
+                          MethodCallHelper methodCallHelper) {
+        this.loginServiceConfigurationRepository = loginServiceConfigurationRepository;
+        this.publicSettingRepository = publicSettingRepository;
+        this.methodCallHelper = methodCallHelper;
     }
 
-    view.showLoader();
-
-    addSubscription(
-        publicSettingRepository.getById(PublicSettingsConstants.LDAP.ENABLE)
-            .subscribeOn(AndroidSchedulers.from(BackgroundLooper.get()))
-            .observeOn(AndroidSchedulers.mainThread())
-            .subscribe(
-                publicSettingOptional -> doLogin(username, password, publicSettingOptional),
-                Logger::report
-            )
-    );
-  }
-
-  private void getLoginServices() {
-    addSubscription(
-        loginServiceConfigurationRepository.getAll()
-            .subscribeOn(AndroidSchedulers.from(BackgroundLooper.get()))
-            .observeOn(AndroidSchedulers.mainThread())
-            .subscribe(
-                loginServiceConfigurations -> view.showLoginServices(loginServiceConfigurations),
-                Logger::report
-            )
-    );
-  }
-
-  private void doLogin(String username, String password, Optional<PublicSetting> optional) {
-    call(username, password, optional)
-        .continueWith(task -> {
-          if (task.isFaulted()) {
-            view.hideLoader();
-
-            final Exception error = task.getError();
-
-            if (error instanceof TwoStepAuthException) {
-              view.showTwoStepAuth();
-            } else {
-              view.showError(error.getMessage());
-            }
-          }
-          return null;
-        }, Task.UI_THREAD_EXECUTOR);
-  }
-
-  private Task<Void> call(String username, String password, Optional<PublicSetting> optional) {
-    if (optional.isPresent() && optional.get().getValueAsBoolean()) {
-      return methodCallHelper.loginWithLdap(username, password);
+    @Override
+    public void bindView(@NonNull LoginContract.View view) {
+        super.bindView(view);
+
+        getLoginServices();
+    }
+
+    @Override
+    public void login(String username, String password) {
+        if (TextUtils.isEmpty(username) || TextUtils.isEmpty(password)) {
+            return;
+        }
+
+        view.showLoader();
+
+        addSubscription(
+                publicSettingRepository.getById(PublicSettingsConstants.LDAP.ENABLE)
+                        .subscribeOn(AndroidSchedulers.from(BackgroundLooper.get()))
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribe(
+                                publicSettingOptional -> doLogin(username, password, publicSettingOptional),
+                                Logger::report
+                        )
+        );
+    }
+
+    private void getLoginServices() {
+        addSubscription(
+                loginServiceConfigurationRepository.getAll()
+                        .subscribeOn(AndroidSchedulers.from(BackgroundLooper.get()))
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribe(
+                                loginServiceConfigurations -> view.showLoginServices(loginServiceConfigurations),
+                                Logger::report
+                        )
+        );
     }
 
-    return methodCallHelper.loginWithEmail(username, password);
-  }
+    private void doLogin(String username, String password, Optional<PublicSetting> optional) {
+        call(username, password, optional)
+                .continueWith(task -> {
+                    if (task.isFaulted()) {
+                        view.hideLoader();
+
+                        final Exception error = task.getError();
+
+                        if (error instanceof TwoStepAuthException) {
+                            view.showTwoStepAuth();
+                        } else {
+                            view.showError(error.getMessage());
+                        }
+                    }
+                    return null;
+                }, Task.UI_THREAD_EXECUTOR);
+    }
+
+    private Task<Void> call(String username, String password, Optional<PublicSetting> optional) {
+        if (optional.isPresent() && optional.get().getValueAsBoolean()) {
+            return methodCallHelper.loginWithLdap(username, password);
+        }
+
+        return methodCallHelper.loginWithEmail(username, password);
+    }
 }

app/src/main/java/chat/rocket/android/fragment/sidebar/SidebarMainContract.java

@@ -25,7 +25,7 @@ public interface SidebarMainContract {
 
     void show(User user);
 
-    void onLogoutCleanUp();
+    void onPreparedToLogOut();
   }
 
   interface Presenter extends BaseContract.Presenter<View> {
@@ -48,6 +48,6 @@ public interface SidebarMainContract {
 
     void onLogout(Continuation<Void, Object> continuation);
 
-    void beforeLogoutCleanUp();
+    void prepareToLogOut();
   }
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/fragment/sidebar/SidebarMainPresenter.java

@@ -18,7 +18,6 @@ import chat.rocket.android.helper.LogIfError;
 import chat.rocket.android.helper.Logger;
 import chat.rocket.android.helper.TextUtils;
 import chat.rocket.android.service.ConnectivityManager;
-import chat.rocket.android.service.ConnectivityManagerApi;
 import chat.rocket.android.shared.BasePresenter;
 import chat.rocket.core.interactors.RoomInteractor;
 import chat.rocket.core.models.Room;
@@ -33,6 +32,7 @@ import chat.rocket.persistence.realm.repositories.RealmSpotlightRepository;
 import io.reactivex.Flowable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
+import io.realm.Realm;
 
 public class SidebarMainPresenter extends BasePresenter<SidebarMainContract.View> implements SidebarMainContract.Presenter {
     private final String hostname;
@@ -150,20 +150,26 @@ public class SidebarMainPresenter extends BasePresenter<SidebarMainContract.View
     }
 
     @Override
-    public void beforeLogoutCleanUp() {
-        clearSubscriptions();
-        String currentHostname = rocketChatCache.getSelectedServerHostname();
-        RealmHelper realmHelper = RealmStore.getOrCreate(currentHostname);
-        realmHelper.executeTransaction(realm -> {
-            realm.executeTransactionAsync(realmObj -> realmObj.deleteAll());
-            CookieManager.getInstance().removeAllCookie();
-            ConnectivityManagerApi connectivityManagerApi = ConnectivityManager.getInstance(RocketChatApplication.getInstance());
-            connectivityManagerApi.removeServer(currentHostname);
-            rocketChatCache.removeHostname(currentHostname);
-            rocketChatCache.removeSelectedRoomId(currentHostname);
-            rocketChatCache.setSelectedServerHostname(rocketChatCache.getFirstLoggedHostnameIfAny());
-            view.onLogoutCleanUp();
-            return null;
+    public void prepareToLogOut() {
+        onLogout(task -> {
+            if (task.isFaulted()) {
+                return Task.forError(task.getError());
+            }
+
+            clearSubscriptions();
+            String currentHostname = rocketChatCache.getSelectedServerHostname();
+            RealmHelper realmHelper = RealmStore.getOrCreate(currentHostname);
+            return realmHelper.executeTransaction(realm -> {
+                rocketChatCache.removeHostname(currentHostname);
+                rocketChatCache.removeSelectedRoomId(currentHostname);
+                rocketChatCache.setSelectedServerHostname(rocketChatCache.getFirstLoggedHostnameIfAny());
+                realm.executeTransactionAsync(Realm::deleteAll);
+                view.onPreparedToLogOut();
+                ConnectivityManager.getInstance(RocketChatApplication.getInstance())
+                        .removeServer(hostname);
+                CookieManager.getInstance().removeAllCookie();
+                return null;
+            });
         });
     }
 
@@ -223,11 +229,11 @@ public class SidebarMainPresenter extends BasePresenter<SidebarMainContract.View
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(this::processUsers, Logger::report);
         addSubscription(subscription);
-  }
+    }
 
     private void processUsers(List<User> userList) {
-        for (User user: userList) {
-            for(RoomSidebar roomSidebar: roomSidebarList) {
+        for (User user : userList) {
+            for (RoomSidebar roomSidebar : roomSidebarList) {
                 if (roomSidebar.getRoomName().equals(user.getUsername())) {
                     roomSidebar.setUserStatus(user.getStatus());
                 }

app/src/main/java/chat/rocket/android/service/RealmBasedConnectivityManager.java

@@ -279,8 +279,11 @@ import io.reactivex.subjects.BehaviorSubject;
 
             if (serviceInterface != null) {
                 return serviceInterface.disconnectFromServer(hostname)
-                        // //after disconnection from server, remove HOSTNAME key from HashMap
-                        .doAfterTerminate(() -> serverConnectivityList.remove(hostname));
+                         //after disconnection from server, remove HOSTNAME key from HashMap
+                        .doAfterTerminate(() -> {
+                            serverConnectivityList.remove(hostname);
+                            serverConnectivityList.put(hostname, ServerConnectivity.STATE_DISCONNECTED);
+                        });
             } else {
                 return Single.error(new IllegalStateException("not prepared"));
             }

app/src/main/java/chat/rocket/android/service/RocketChatWebSocketThread.java

@@ -229,6 +229,8 @@ public class RocketChatWebSocketThread extends HandlerThread {
                             RxWebSocketCallback.Close result = _task.getResult();
                             if (result.code == DDPClient.REASON_NETWORK_ERROR) {
                                 reconnect();
+                            } else {
+                                unregisterListenersAndClose();
                             }
                             return null;
                         });
@@ -333,8 +335,8 @@ public class RocketChatWebSocketThread extends HandlerThread {
                         .findAll());
 
         if (sessions != null && sessions.size() > 0) {
-            // if we have a session try to resume it. At this point we're probably recovering from
-            // a disconnection state
+            // If we have a session try to resume it. At this point we're probably recovering from
+            // a disconnection state.
             final CompositeDisposable disposables = new CompositeDisposable();
             MethodCallHelper methodCall = new MethodCallHelper(realmHelper);
             disposables.add(
@@ -351,7 +353,11 @@ public class RocketChatWebSocketThread extends HandlerThread {
                                         createObserversAndRegister();
                                         disposables.clear();
                                     },
-                                    error -> logErrorAndUnsubscribe(disposables, error)
+                                    error -> {
+                                        logErrorAndUnsubscribe(disposables, error);
+                                        connectivityManager.notifyConnectionLost(hostname,
+                                                DDPClient.REASON_NETWORK_ERROR);
+                                    }
                             )
             );
         } else {

rocket-chat-core/src/main/java/chat/rocket/core/interactors/MessageInteractor.kt

@@ -19,7 +19,7 @@ class MessageInteractor(private val messageRepository: MessageRepository,
         val roomHistoryState = RoomHistoryState.builder()
                 .setRoomId(room.roomId)
                 .setSyncState(SyncState.NOT_SYNCED)
-                .setCount(100)
+                .setCount(50)
                 .setReset(true)
                 .setComplete(false)
                 .setTimestamp(0)