Merge branch 'develop' into feature/untengle-modules

app/src/main/java/chat/rocket/android/helper/ServerPolicyHelper.java

@@ -49,6 +49,10 @@ public class ServerPolicyHelper {
     return hostname.replaceAll("/+$", "");
   }
 
+  private static String removeExtraInvalidChars(String hostname) {
+    return hostname.replaceAll("[^\\w|\\.|\\-|/]", "");
+  }
+
   private static boolean isValid(JSONObject jsonObject) {
     if (jsonObject == null) {
       return false;

rocket-chat-android-widgets/src/main/java/chat/rocket/android/widget/layouthelper/MessageExtraActionListAdapter.java

@@ -51,6 +51,9 @@ public class MessageExtraActionListAdapter
 
   @Override
   public int getItemCount() {
+    if (actionItems == null) {
+      return 0;
+    }
     return actionItems.size();
   }