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
95ab3dce
Unverified
Commit
95ab3dce
authored
Nov 05, 2018
by
Rafael Kellermann Streit
Committed by
GitHub
Nov 05, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1835 from RocketChat/release/3.1.1-hotfix
[RELEASE] 3.1.1 hotfix
parents
b6cf0ae0
c6900816
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
16 deletions
+25
-16
build.gradle
app/build.gradle
+2
-2
ChatRoomPresenter.kt
...rocket/android/chatroom/presentation/ChatRoomPresenter.kt
+15
-13
ChatRoomFragment.kt
.../java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
+8
-1
No files found.
app/build.gradle
View file @
95ab3dce
...
@@ -16,8 +16,8 @@ android {
...
@@ -16,8 +16,8 @@ android {
applicationId
"chat.rocket.android"
applicationId
"chat.rocket.android"
minSdkVersion
versions
.
minSdk
minSdkVersion
versions
.
minSdk
targetSdkVersion
versions
.
targetSdk
targetSdkVersion
versions
.
targetSdk
versionCode
20
49
versionCode
20
50
versionName
"3.1.
0
"
versionName
"3.1.
1
"
testInstrumentationRunner
"androidx.test.runner.AndroidJUnitRunner"
testInstrumentationRunner
"androidx.test.runner.AndroidJUnitRunner"
multiDexEnabled
true
multiDexEnabled
true
...
...
app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
View file @
95ab3dce
...
@@ -1169,24 +1169,26 @@ class ChatRoomPresenter @Inject constructor(
...
@@ -1169,24 +1169,26 @@ class ChatRoomPresenter @Inject constructor(
}
}
private
fun
processTypingStatus
(
typingStatus
:
Pair
<
String
,
Boolean
>)
{
private
fun
processTypingStatus
(
typingStatus
:
Pair
<
String
,
Boolean
>)
{
if
(
typingStatus
.
first
!=
currentLoggedUsername
)
{
synchronized
(
typingStatusList
)
{
if
(!
typingStatusList
.
any
{
username
->
username
==
typingStatus
.
first
})
{
if
(
typingStatus
.
first
!=
currentLoggedUsername
)
{
if
(
typingStatus
.
second
)
{
if
(!
typingStatusList
.
any
{
username
->
username
==
typingStatus
.
first
})
{
typingStatusList
.
add
(
typingStatus
.
first
)
}
}
else
{
typingStatusList
.
find
{
username
->
username
==
typingStatus
.
first
}
?.
let
{
typingStatusList
.
remove
(
it
)
if
(
typingStatus
.
second
)
{
if
(
typingStatus
.
second
)
{
typingStatusList
.
add
(
typingStatus
.
first
)
typingStatusList
.
add
(
typingStatus
.
first
)
}
}
}
else
{
typingStatusList
.
find
{
username
->
username
==
typingStatus
.
first
}
?.
let
{
typingStatusList
.
remove
(
it
)
if
(
typingStatus
.
second
)
{
typingStatusList
.
add
(
typingStatus
.
first
)
}
}
}
}
}
if
(
typingStatusList
.
isNotEmpty
())
{
if
(
typingStatusList
.
isNotEmpty
())
{
view
.
showTypingStatus
(
typingStatusList
.
toList
())
view
.
showTypingStatus
(
typingStatusList
.
toList
())
}
else
{
}
else
{
view
.
hideTypingStatusView
()
view
.
hideTypingStatusView
()
}
}
}
}
}
}
}
...
...
app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
View file @
95ab3dce
...
@@ -545,6 +545,9 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
...
@@ -545,6 +545,9 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
override
fun
dispatchUpdateMessage
(
index
:
Int
,
message
:
List
<
BaseUiModel
<*
>>)
{
override
fun
dispatchUpdateMessage
(
index
:
Int
,
message
:
List
<
BaseUiModel
<*
>>)
{
ui
{
ui
{
// TODO - investigate WHY we get a empty list here
if
(
message
.
isEmpty
())
return
@ui
if
(
adapter
.
updateItem
(
message
.
last
()))
{
if
(
adapter
.
updateItem
(
message
.
last
()))
{
if
(
message
.
size
>
1
)
{
if
(
message
.
size
>
1
)
{
adapter
.
prependData
(
listOf
(
message
.
first
()))
adapter
.
prependData
(
listOf
(
message
.
first
()))
...
@@ -591,7 +594,11 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
...
@@ -591,7 +594,11 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
}
}
}
}
override
fun
showGenericErrorMessage
()
=
showMessage
(
getString
(
R
.
string
.
msg_generic_error
))
override
fun
showGenericErrorMessage
(){
ui
{
showMessage
(
getString
(
R
.
string
.
msg_generic_error
))
}
}
override
fun
populatePeopleSuggestions
(
members
:
List
<
PeopleSuggestionUiModel
>)
{
override
fun
populatePeopleSuggestions
(
members
:
List
<
PeopleSuggestionUiModel
>)
{
ui
{
ui
{
...
...
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