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
2528778c
Commit
2528778c
authored
Aug 02, 2018
by
Lucio Maciel
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into develop
parents
3facfd9f
797a06fc
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
3 deletions
+2
-3
build.gradle
app/build.gradle
+1
-1
MessageParser.kt
...src/main/java/chat/rocket/android/helper/MessageParser.kt
+1
-1
ConnectionManager.kt
...ocket/android/server/infraestructure/ConnectionManager.kt
+0
-1
No files found.
app/build.gradle
View file @
2528778c
...
@@ -12,7 +12,7 @@ android {
...
@@ -12,7 +12,7 @@ android {
applicationId
"chat.rocket.android"
applicationId
"chat.rocket.android"
minSdkVersion
versions
.
minSdk
minSdkVersion
versions
.
minSdk
targetSdkVersion
versions
.
targetSdk
targetSdkVersion
versions
.
targetSdk
versionCode
203
5
versionCode
203
6
versionName
"2.5.1"
versionName
"2.5.1"
testInstrumentationRunner
"androidx.test.runner.AndroidJUnitRunner"
testInstrumentationRunner
"androidx.test.runner.AndroidJUnitRunner"
multiDexEnabled
true
multiDexEnabled
true
...
...
app/src/main/java/chat/rocket/android/helper/MessageParser.kt
View file @
2528778c
...
@@ -157,7 +157,7 @@ class MessageParser @Inject constructor(
...
@@ -157,7 +157,7 @@ class MessageParser @Inject constructor(
if
(
node
is
ListItem
)
{
if
(
node
is
ListItem
)
{
newLine
()
newLine
()
builder
.
append
(
"$number$delimiter "
)
builder
.
append
(
"$number$delimiter "
)
super
.
visitChildren
(
node
.
firstChild
)
super
.
visitChildren
(
node
)
newLine
()
newLine
()
}
}
number
++
number
++
...
...
app/src/main/java/chat/rocket/android/server/infraestructure/ConnectionManager.kt
View file @
2528778c
...
@@ -2,7 +2,6 @@ package chat.rocket.android.server.infraestructure
...
@@ -2,7 +2,6 @@ package chat.rocket.android.server.infraestructure
import
androidx.lifecycle.MutableLiveData
import
androidx.lifecycle.MutableLiveData
import
chat.rocket.android.db.DatabaseManager
import
chat.rocket.android.db.DatabaseManager
import
chat.rocket.android.infrastructure.LocalRepository
import
chat.rocket.common.model.BaseRoom
import
chat.rocket.common.model.BaseRoom
import
chat.rocket.common.model.User
import
chat.rocket.common.model.User
import
chat.rocket.common.model.UserStatus
import
chat.rocket.common.model.UserStatus
...
...
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