Merge pull request #212 from RocketChat/fix/firebase-crashes-20170220

Fix/firebase crashes 20170220

app/build.gradle

@@ -33,8 +33,8 @@ android {
         applicationId "chat.rocket.android"
         minSdkVersion 16
         targetSdkVersion 25
-        versionCode 10
-        versionName "1.0.1"
+        versionCode 11
+        versionName "1.0.2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
         vectorDrawables.useSupportLibrary = true

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

@@ -75,7 +75,7 @@ abstract class AbstractAuthedActivity extends AbstractFragmentActivity {
       }
     } else {
       if (hostname.equals(newHostname)) {
-        // we are good
+        updateHostname(newHostname);
         return;
       }
 

app/src/main/java/chat/rocket/android/service/ddp/AbstractDDPDocEventSubscriber.java

@@ -99,23 +99,27 @@ public abstract class AbstractDDPDocEventSubscriber implements Registrable {
         .filter(event -> event instanceof DDPSubscription.DocEvent)
         .cast(DDPSubscription.DocEvent.class)
         .filter(event -> isTarget(event.collection))
-        .subscribe(docEvent -> {
-          try {
-            if (docEvent instanceof DDPSubscription.Added.Before) {
-              onDocumentAdded((DDPSubscription.Added) docEvent); //ignore Before
-            } else if (docEvent instanceof DDPSubscription.Added) {
-              onDocumentAdded((DDPSubscription.Added) docEvent);
-            } else if (docEvent instanceof DDPSubscription.Removed) {
-              onDocumentRemoved((DDPSubscription.Removed) docEvent);
-            } else if (docEvent instanceof DDPSubscription.Changed) {
-              onDocumentChanged((DDPSubscription.Changed) docEvent);
-            } else if (docEvent instanceof DDPSubscription.MovedBefore) {
-              //ignore movedBefore
+        .subscribe(
+            docEvent -> {
+              try {
+                if (docEvent instanceof DDPSubscription.Added.Before) {
+                  onDocumentAdded((DDPSubscription.Added) docEvent); //ignore Before
+                } else if (docEvent instanceof DDPSubscription.Added) {
+                  onDocumentAdded((DDPSubscription.Added) docEvent);
+                } else if (docEvent instanceof DDPSubscription.Removed) {
+                  onDocumentRemoved((DDPSubscription.Removed) docEvent);
+                } else if (docEvent instanceof DDPSubscription.Changed) {
+                  onDocumentChanged((DDPSubscription.Changed) docEvent);
+                } else if (docEvent instanceof DDPSubscription.MovedBefore) {
+                  //ignore movedBefore
+                }
+              } catch (Exception exception) {
+                RCLog.w(exception, "failed to handle subscription callback");
+              }
+            },
+            throwable -> {
             }
-          } catch (Exception exception) {
-            RCLog.w(exception, "failed to handle subscription callback");
-          }
-        });
+        );
   }
 
   protected void onDocumentAdded(DDPSubscription.Added docEvent) {

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

@@ -109,9 +109,17 @@ public class MethodCallObserver extends AbstractModelObserver<MethodCall> {
       if (task.isFaulted()) {
         return realmHelper.executeTransaction(realm -> {
           Exception exception = task.getError();
-          final String errMessage = (exception instanceof DDPClientCallback.RPC.Error)
-              ? ((DDPClientCallback.RPC.Error) exception).error.toString()
-              : exception.getMessage();
+          final String errMessage;
+
+          if (exception instanceof DDPClientCallback.RPC.Error) {
+            errMessage = ((DDPClientCallback.RPC.Error) exception).error.toString();
+          } else if (exception instanceof DDPClientCallback.RPC.Timeout) {
+            // temp "fix"- we need to rewrite the connection layer a bit
+            errMessage = "{\"message\": \"Connection Timeout\"}";
+          } else {
+            errMessage = exception.getMessage();
+          }
+
           realm.createOrUpdateObjectFromJson(MethodCall.class, new JSONObject()
               .put(MethodCall.ID, methodCallId)
               .put(MethodCall.SYNC_STATE, SyncState.FAILED)

persistence-realm/src/main/java/chat/rocket/persistence/realm/models/ddp/RealmPreferences.java

@@ -11,7 +11,7 @@ public class RealmPreferences extends RealmObject {
   @PrimaryKey private String id;
 
   private String newRoomNotification;
-  private boolean newMessageNotification;
+  private String newMessageNotification;
   private boolean useEmojis;
   private boolean convertAsciiEmoji;
   private boolean saveMobileBandwidth;
@@ -52,7 +52,7 @@ public class RealmPreferences extends RealmObject {
     return newRoomNotification;
   }
 
-  public boolean isNewMessageNotification() {
+  public String getNewMessageNotification() {
     return newMessageNotification;
   }
 
@@ -123,7 +123,8 @@ public class RealmPreferences extends RealmObject {
         : that.newRoomNotification == null) {
       return false;
     }
-    if (newMessageNotification != that.newMessageNotification) {
+    if (newMessageNotification != null ? newMessageNotification.equals(that.newMessageNotification)
+        : that.newMessageNotification == null) {
       return false;
     }
     if (useEmojis != that.useEmojis) {
@@ -174,7 +175,7 @@ public class RealmPreferences extends RealmObject {
   public int hashCode() {
     int result = id != null ? id.hashCode() : 0;
     result = 31 * result + (newRoomNotification != null ? newRoomNotification.hashCode() : 0);
-    result = 31 * result + (newMessageNotification ? 1 : 0);
+    result = 31 * result + (newMessageNotification != null ? newMessageNotification.hashCode() : 0);
     result = 31 * result + (useEmojis ? 1 : 0);
     result = 31 * result + (convertAsciiEmoji ? 1 : 0);
     result = 31 * result + (saveMobileBandwidth ? 1 : 0);

persistence-realm/src/main/java/chat/rocket/persistence/realm/models/ddp/RealmUser.java

@@ -87,7 +87,7 @@ public class RealmUser extends RealmObject {
 
   public User asUser() {
     // convert email list
-    final int total = emails.size();
+    final int total = emails != null ? emails.size() : 0;
     final List<Email> coreEmails = new ArrayList<>(total);
 
     for (int i = 0; i < total; i++) {

rocket-chat-android-widgets/src/main/java/chat/rocket/android/widget/message/ImageKeyboardEditText.java

@@ -52,6 +52,9 @@ public class ImageKeyboardEditText extends EditText {
   @Override
   public InputConnection onCreateInputConnection(EditorInfo editorInfo) {
     final InputConnection inputConnection = super.onCreateInputConnection(editorInfo);
+    if (inputConnection == null) {
+      return null;
+    }
 
     EditorInfoCompat.setContentMimeTypes(editorInfo, mimeTypes);
 

rocket-chat-core/src/main/java/chat/rocket/core/models/Preferences.java

@@ -12,7 +12,8 @@ public abstract class Preferences {
   @Nullable
   public abstract String getNewRoomNotification();
 
-  public abstract boolean isNewMessageNotification();
+  @Nullable
+  public abstract String getNewMessageNotification();
 
   public abstract boolean isUseEmojis();
 
@@ -51,7 +52,7 @@ public abstract class Preferences {
 
     public abstract Builder setNewRoomNotification(String newRoomNotification);
 
-    public abstract Builder setNewMessageNotification(boolean newMessageNotification);
+    public abstract Builder setNewMessageNotification(String newMessageNotification);
 
     public abstract Builder setUseEmojis(boolean useEmojis);