Commit 65e83be0 authored by Tiago Cunha's avatar Tiago Cunha Committed by GitHub

Merge pull request #210 from RocketChat/fix/firebase-crashes-20170217

Fix/firebase crashes 20170217
parents 7c3b692d d03f1134
...@@ -50,6 +50,10 @@ public class ServerPolicyHelper { ...@@ -50,6 +50,10 @@ public class ServerPolicyHelper {
return hostname.replaceAll("/+$", ""); return hostname.replaceAll("/+$", "");
} }
private static String removeExtraInvalidChars(String hostname) {
return hostname.replaceAll("[^\\w|\\.|\\-|/]", "");
}
private static boolean isValid(JSONObject jsonObject) { private static boolean isValid(JSONObject jsonObject) {
if (jsonObject == null) { if (jsonObject == null) {
return false; return false;
......
...@@ -51,6 +51,9 @@ public class MessageExtraActionListAdapter ...@@ -51,6 +51,9 @@ public class MessageExtraActionListAdapter
@Override @Override
public int getItemCount() { public int getItemCount() {
if (actionItems == null) {
return 0;
}
return actionItems.size(); return actionItems.size();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment