Merge pull request #583 from RocketChat/fix/force-migrate-crash

Fix forced schema update without migration crash

app/build.gradle

@@ -20,8 +20,8 @@ android {
         applicationId "chat.rocket.android"
         minSdkVersion 16
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 52
-        versionName "1.0.29"
+        versionCode 53
+        versionName "1.0.30"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled true

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

@@ -74,7 +74,14 @@ public class Migration implements RealmMigration {
 
     if (oldVersion == 5) {
       RealmObjectSchema userSchema = schema.get("RealmUser");
-      userSchema.addField(RealmUser.NAME, String.class);
+      try {
+        userSchema.addField(RealmUser.NAME, String.class);
+      } catch (IllegalArgumentException e) {
+        if (BuildConfig.DEBUG) {
+          e.printStackTrace();
+        }
+        // ignore; it makes here if the schema for this model was already update before without migration
+      }
     }
   }