Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
AloqaIM-Android
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
AloqaIM-Android
Commits
65e83be0
Commit
65e83be0
authored
Feb 17, 2017
by
Tiago Cunha
Committed by
GitHub
Feb 17, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #210 from RocketChat/fix/firebase-crashes-20170217
Fix/firebase crashes 20170217
parents
7c3b692d
d03f1134
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
0 deletions
+7
-0
ServerPolicyHelper.java
...n/java/chat/rocket/android/helper/ServerPolicyHelper.java
+4
-0
MessageExtraActionListAdapter.java
...id/widget/layouthelper/MessageExtraActionListAdapter.java
+3
-0
No files found.
app/src/main/java/chat/rocket/android/helper/ServerPolicyHelper.java
View file @
65e83be0
...
@@ -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
;
...
...
rocket-chat-android-widgets/src/main/java/chat/rocket/android/widget/layouthelper/MessageExtraActionListAdapter.java
View file @
65e83be0
...
@@ -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
();
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment