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
14133a9a
Commit
14133a9a
authored
Jul 04, 2017
by
Filipe de Lima Brito
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' of
https://github.com/RocketChat/Rocket.Chat.Android
into develop
parents
2aeb9ed5
625dbcaf
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
ISSUE_TEMPLATE.md
.github/ISSUE_TEMPLATE.md
+6
-1
MessageRenderer.java
...in/java/chat/rocket/android/renderer/MessageRenderer.java
+1
-0
No files found.
.github/ISSUE_TEMPLATE.md
View file @
14133a9a
Your Rocket.Chat.Android version: (make sure you are running the latest)
Your Rocket.Chat.Android version: (make sure you are running the latest)
\ No newline at end of file
<!-- Version can be found by opening the side menu and then clicking on the chevron alongside username -->
<!-- Found a bug? List all devices that reproduced it and all that doesn't -->
Mobile device model and OS version: (e.g. "Nexus 7 - Android 6.0.1")
<!-- Don't forget to list the steps to reproduce. Stack traces may help too :) -->
app/src/main/java/chat/rocket/android/renderer/MessageRenderer.java
View file @
14133a9a
...
@@ -80,6 +80,7 @@ public class MessageRenderer extends AbstractRenderer<Message> {
...
@@ -80,6 +80,7 @@ public class MessageRenderer extends AbstractRenderer<Message> {
break
;
break
;
case
SyncState
.
FAILED
:
case
SyncState
.
FAILED
:
textView
.
setText
(
R
.
string
.
failed_to_sync
);
textView
.
setText
(
R
.
string
.
failed_to_sync
);
break
;
default
:
default
:
textView
.
setText
(
DateTime
.
fromEpocMs
(
object
.
getTimestamp
(),
DateTime
.
Format
.
TIME
));
textView
.
setText
(
DateTime
.
fromEpocMs
(
object
.
getTimestamp
(),
DateTime
.
Format
.
TIME
));
break
;
break
;
...
...
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