Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat.Android into iss268

app/src/main/java/chat/rocket/android/api/MethodCallHelper.java

@@ -36,7 +36,7 @@ import hugo.weaving.DebugLog;
  */
 public class MethodCallHelper {
 
-  protected static final long TIMEOUT_MS = 4000;
+  protected static final long TIMEOUT_MS = 20000;
   protected static final Continuation<String, Task<JSONObject>> CONVERT_TO_JSON_OBJECT =
       task -> Task.forResult(new JSONObject(task.getResult()));
   protected static final Continuation<String, Task<JSONArray>> CONVERT_TO_JSON_ARRAY =

app/src/main/java/chat/rocket/android/service/observer/NewMessageObserver.java

@@ -71,6 +71,11 @@ public class NewMessageObserver extends AbstractModelObserver<RealmMessage> {
             realm.createOrUpdateObjectFromJson(RealmMessage.class, new JSONObject()
                 .put(RealmMessage.ID, messageId)
                 .put(RealmMessage.SYNC_STATE, SyncState.FAILED)));
+      } else {
+        realmHelper.executeTransaction(realm ->
+                realm.createOrUpdateObjectFromJson(RealmMessage.class, new JSONObject()
+                        .put(RealmMessage.ID, messageId)
+                        .put(RealmMessage.SYNC_STATE, SyncState.SYNCED)));
       }
       return null;
     });