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
49de7deb
Unverified
Commit
49de7deb
authored
Feb 20, 2018
by
Lucio Maciel
Committed by
GitHub
Feb 20, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #785 from filipedelimabrito/chore/update-dependencies
[Chore][FIX] Update dependencies
parents
df93748c
c29334de
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
10 deletions
+13
-10
build.gradle
app/build.gradle
+6
-2
ChatRoomsPresenter.kt
...cket/android/chatrooms/presentation/ChatRoomsPresenter.kt
+2
-2
CrashlyticsTree.kt
...c/main/java/chat/rocket/android/helper/CrashlyticsTree.kt
+1
-2
dependencies.gradle
dependencies.gradle
+4
-4
No files found.
app/build.gradle
View file @
49de7deb
...
...
@@ -92,10 +92,14 @@ dependencies {
implementation
libraries
.
kotshiApi
implementation
libraries
.
frescoImageViewer
implementation
libraries
.
androidSvg
implementation
(
libraries
.
androidSvg
)
{
exclude
group:
'org.jetbrains'
,
module:
'annotations-java5'
}
implementation
libraries
.
markwon
implementation
libraries
.
markwonImageLoader
implementation
(
libraries
.
markwonImageLoader
)
{
exclude
group:
'com.caverock'
,
module:
'androidsvg'
}
implementation
libraries
.
sheetMenu
...
...
app/src/main/java/chat/rocket/android/chatrooms/presentation/ChatRoomsPresenter.kt
View file @
49de7deb
...
...
@@ -205,7 +205,7 @@ class ChatRoomsPresenter @Inject constructor(private val view: ChatRoomsView,
room
.
readonly
,
room
.
updatedAt
?:
updatedAt
,
timestamp
,
last
Modified
,
last
Seen
,
room
.
topic
,
room
.
announcement
,
default
,
...
...
@@ -235,7 +235,7 @@ class ChatRoomsPresenter @Inject constructor(private val view: ChatRoomsView,
subscription
.
readonly
?:
readonly
,
subscription
.
updatedAt
?:
updatedAt
,
subscription
.
timestamp
?:
timestamp
,
subscription
.
last
Modified
?:
lastModified
,
subscription
.
last
Seen
?:
lastSeen
,
topic
,
announcement
,
subscription
.
isDefault
,
...
...
app/src/main/java/chat/rocket/android/helper/CrashlyticsTree.kt
View file @
49de7deb
...
...
@@ -3,10 +3,9 @@ package chat.rocket.android.helper
import
com.crashlytics.android.Crashlytics
import
timber.log.Timber
class
CrashlyticsTree
:
Timber
.
Tree
()
{
override
fun
log
(
priority
:
Int
,
tag
:
String
?,
message
:
String
?
,
throwable
:
Throwable
?)
{
override
fun
log
(
priority
:
Int
,
tag
:
String
?,
message
:
String
,
throwable
:
Throwable
?)
{
Crashlytics
.
log
(
priority
,
tag
,
message
)
if
(
throwable
!=
null
)
{
...
...
dependencies.gradle
View file @
49de7deb
...
...
@@ -16,13 +16,13 @@ ext {
playServices
:
'11.8.0'
,
room
:
'1.0.0'
,
rxKotlin
:
'2.2.0'
,
rxAndroid
:
'2.0.
1
'
,
rxAndroid
:
'2.0.
2
'
,
moshi
:
'1.6.0-SNAPSHOT'
,
okhttp
:
'3.9.
0
'
,
timber
:
'4.
5
.1'
,
okhttp
:
'3.9.
1
'
,
timber
:
'4.
6
.1'
,
threeTenABP
:
'1.0.5'
,
rxBinding
:
'2.0.0'
,
fresco
:
'1.
7
.1'
,
fresco
:
'1.
8
.1'
,
kotshi
:
'0.3.0'
,
frescoImageViewer
:
'0.5.0'
,
androidSvg
:
'master-SNAPSHOT'
,
...
...
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