Merge pull request #581 from RocketChat/fix/servers-logging-out

Fix servers logging out on app update

app/build.gradle

@@ -20,8 +20,8 @@ android {
         applicationId "chat.rocket.android"
         minSdkVersion 16
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 50
-        versionName "1.0.27"
+        versionCode 52
+        versionName "1.0.29"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled true
@@ -144,7 +144,7 @@ dependencies {
     testCompile "org.jetbrains.kotlin:kotlin-test:$rootProject.ext.kotlinVersion"
     testCompile "org.jetbrains.kotlin:kotlin-test-junit:$rootProject.ext.kotlinVersion"
     testCompile "org.jetbrains.kotlin:kotlin-reflect:$rootProject.ext.kotlinVersion"
-    testCompile "com.nhaarman:mockito-kotlin:1.1.0"
+    testCompile "com.nhaarman:mockito-kotlin:1.5.0"
     testCompile 'org.amshove.kluent:kluent:1.14'
 }
 apply plugin: 'com.google.gms.google-services'

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

 package chat.rocket.android.service;
 
+import android.annotation.SuppressLint;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.ServiceConnection;
@@ -68,6 +69,7 @@ import io.reactivex.subjects.PublishSubject;
     }
   }
 
+  @SuppressLint("RxLeakedSubscription")
   @DebugLog
   @Override
   public void ensureConnections() {
@@ -84,6 +86,7 @@ import io.reactivex.subjects.PublishSubject;
           });
   }
 
+  @SuppressLint("RxLeakedSubscription")
   @Override
   public void addOrUpdateServer(String hostname, @Nullable String name, boolean insecure) {
     RealmBasedServerInfo.addOrUpdate(hostname, name, insecure);
@@ -95,6 +98,7 @@ import io.reactivex.subjects.PublishSubject;
         }, RCLog::e);
   }
 
+  @SuppressLint("RxLeakedSubscription")
   @Override
   public void removeServer(String hostname) {
     RealmBasedServerInfo.remove(hostname);
@@ -166,7 +170,11 @@ import io.reactivex.subjects.PublishSubject;
   @DebugLog
   private Single<Boolean> connectToServerIfNeeded(String hostname, boolean forceConnect) {
     return Single.defer(() -> {
-      final int connectivity = serverConnectivityList.get(hostname);
+      Integer state = serverConnectivityList.get(hostname);
+      if (state == null) {
+        state = ServerConnectivity.STATE_DISCONNECTED;
+      }
+      final int connectivity = state;
       if (!forceConnect && connectivity == ServerConnectivity.STATE_CONNECTED) {
         return Single.just(true);
       }

build.gradle

@@ -15,9 +15,9 @@ buildscript {
         maven { url 'http://oss.jfrog.org/artifactory/oss-snapshot-local' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.51"
-        classpath 'io.realm:realm-gradle-plugin:4.2.0-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.60"
+        classpath 'io.realm:realm-gradle-plugin:4.2.0'
         classpath 'com.jakewharton.hugo:hugo-plugin:1.2.1'
         classpath 'com.google.gms:google-services:3.0.0'
         classpath 'com.github.triplet.gradle:play-publisher:1.1.5'

persistence-realm/src/main/java/chat/rocket/persistence/realm/Migration.java

@@ -6,6 +6,7 @@ import chat.rocket.persistence.realm.models.ddp.RealmRole;
 import chat.rocket.persistence.realm.models.ddp.RealmRoomRole;
 import chat.rocket.persistence.realm.models.ddp.RealmSpotlightRoom;
 import chat.rocket.persistence.realm.models.ddp.RealmSpotlightUser;
+import chat.rocket.persistence.realm.models.ddp.RealmUser;
 import io.realm.DynamicRealm;
 import io.realm.FieldAttribute;
 import io.realm.RealmMigration;
@@ -67,6 +68,13 @@ public class Migration implements RealmMigration {
     if (oldVersion == 4) {
       RealmObjectSchema messageSchema = schema.get("RealmMessage");
       messageSchema.addField(RealmMessage.EDITED_AT, long.class);
+
+      oldVersion++;
+    }
+
+    if (oldVersion == 5) {
+      RealmObjectSchema userSchema = schema.get("RealmUser");
+      userSchema.addField(RealmUser.NAME, String.class);
     }
   }
 

persistence-realm/src/main/java/chat/rocket/persistence/realm/RealmStore.java

@@ -15,9 +15,7 @@ public class RealmStore {
         .name(name + ".realm")
         .modules(new RocketChatLibraryModule())
         .migration(new Migration())
-        .schemaVersion(5)
-        // Just in case
-        .deleteRealmIfMigrationNeeded()
+        .schemaVersion(6)
         .build();
   }
 
@@ -49,7 +47,7 @@ public class RealmStore {
       sStore.put(name, new RealmConfiguration.Builder()
           .name(name + ".realm")
           .modules(new RocketChatServerModule())
-          .deleteRealmIfMigrationNeeded().build());
+          .build());
     }
     return new RealmHelper(sStore.get(name));
   }

persistence-realm/src/main/java/chat/rocket/persistence/realm/repositories/RealmMessageRepository.java

@@ -41,8 +41,7 @@ public class RealmMessageRepository extends RealmRepository implements MessageRe
               return Flowable.empty();
             }
 
-            return
-              pair.first.where(RealmMessage.class)
+            return pair.first.where(RealmMessage.class)
                   .equalTo(RealmMessage.ID, messageId)
                   .findAll()
                   .<RealmResults<RealmMessage>>asFlowable();

persistence-realm/src/main/java/chat/rocket/persistence/realm/repositories/RealmSessionRepository.java

@@ -7,6 +7,7 @@ import com.hadisatrio.optional.Optional;
 
 import chat.rocket.core.models.Session;
 import chat.rocket.core.repositories.SessionRepository;
+import chat.rocket.persistence.realm.RealmHelper;
 import chat.rocket.persistence.realm.RealmStore;
 import chat.rocket.persistence.realm.models.internal.RealmSession;
 import io.reactivex.Flowable;
@@ -44,7 +45,7 @@ public class RealmSessionRepository extends RealmRepository implements SessionRe
           if (realmSessions.size() == 0) {
             return Optional.absent();
           }
-          return Optional.of(realmSessions.get(0).asSession());
+            return Optional.of(realmSessions.get(0).asSession());
         }));
   }
 
@@ -73,14 +74,9 @@ public class RealmSessionRepository extends RealmRepository implements SessionRe
       realmSession.setTokenVerified(session.isTokenVerified());
       realmSession.setError(session.getError());
 
-      realm.beginTransaction();
-
-      return realm.copyToRealmOrUpdate(realmSession)
-          .asFlowable()
+      return RealmHelper.copyToRealmOrUpdate(realm, realmSession)
           .filter(it -> it != null && it.isLoaded() && it.isValid())
           .firstElement()
-          .doOnSuccess(it -> realm.commitTransaction())
-          .doOnError(throwable -> realm.cancelTransaction())
           .doOnEvent((realmObject, throwable) -> close(realm, looper))
           .toSingle()
           .map(realmObject -> true);

persistence-realm/src/main/java/chat/rocket/persistence/realm/repositories/RealmSpotlightRepository.kt

@@ -24,8 +24,8 @@ class RealmSpotlightRepository(private val hostname: String) : RealmRepository()
             }
 
             return@using pair.first.where(RealmSpotlight::class.java)
-                .findAllSorted(Columns.TYPE, Sort.DESCENDING)
-                .asFlowable()
+                    .findAllSorted(Columns.TYPE, Sort.DESCENDING)
+                    .asFlowable()
         }) { pair -> close(pair.first, pair.second) }
                 .unsubscribeOn(AndroidSchedulers.from(Looper.myLooper()!!))
                 .filter { realmSpotlightResults -> realmSpotlightResults.isLoaded && realmSpotlightResults.isValid }

rocket-chat-core/build.gradle

@@ -6,7 +6,7 @@ dependencies {
     compile extraDependencies.rxJava
     compile extraDependencies.optional
     compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$rootProject.ext.kotlinVersion"
-    compile 'com.google.code.findbugs:jsr305:3.0.1'
+    compile 'com.google.code.findbugs:jsr305:3.0.2'
     compileOnly 'com.google.auto.value:auto-value:1.3'
     kapt 'com.google.auto.value:auto-value:1.3'
     kapt 'com.gabrielittner.auto.value:auto-value-with:1.0.0'