Merge pull request #227 from RocketChat/fix/server-registering

Fixes server incorret register

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

@@ -74,8 +74,7 @@ import rx.subjects.PublishSubject;
 
   @Override
   public void addOrUpdateServer(String hostname, @Nullable String name, boolean insecure) {
-    RealmBasedServerInfo.addOrUpdate(hostname, name);
-    RealmBasedServerInfo.setInsecure(hostname, insecure);
+    RealmBasedServerInfo.addOrUpdate(hostname, name, insecure);
     if (!serverConnectivityList.containsKey(hostname)) {
       serverConnectivityList.put(hostname, ServerConnectivity.STATE_DISCONNECTED);
     }

persistence-realm/src/main/java/chat/rocket/persistence/realm/models/RealmBasedServerInfo.java

@@ -44,11 +44,12 @@ public class RealmBasedServerInfo extends RealmObject {
     return RealmStore.getOrCreateForServerScope(DB_NAME);
   }
 
-  public static void addOrUpdate(String hostname, String name) {
+  public static void addOrUpdate(String hostname, String name, boolean insecure) {
     getRealm().executeTransaction(realm ->
         realm.createOrUpdateObjectFromJson(RealmBasedServerInfo.class, new JSONObject()
             .put(ColumnName.HOSTNAME, hostname)
-            .put(ColumnName.NAME, TextUtils.isEmpty(name) ? JSONObject.NULL : name)));
+            .put(ColumnName.NAME, TextUtils.isEmpty(name) ? JSONObject.NULL : name)
+            .put(ColumnName.INSECURE, insecure)));
   }
 
   public static void remove(String hostname) {
@@ -80,19 +81,6 @@ public class RealmBasedServerInfo extends RealmObject {
     return impl == null ? null : impl.getServerInfo();
   }
 
-  public static void setInsecure(String hostname, boolean insecure) {
-    RealmBasedServerInfo impl = getRealm().executeTransactionForRead(realm ->
-        realm.where(RealmBasedServerInfo.class).equalTo(ColumnName.HOSTNAME, hostname).findFirst());
-
-    if (impl != null) {
-      impl.insecure = insecure;
-      getRealm().executeTransaction(realm -> {
-        realm.copyToRealmOrUpdate(impl);
-        return null;
-      });
-    }
-  }
-
   public static List<ServerInfo> getServerInfoList() {
     List<RealmBasedServerInfo> results = getRealm().executeTransactionForReadResults(realm ->
         realm.where(RealmBasedServerInfo.class).findAll());