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
94ce1336
Commit
94ce1336
authored
Jul 10, 2018
by
shubhsherl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Message retain issue
parent
b48db851
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
6 deletions
+8
-6
ChatRoomView.kt
...chat/rocket/android/chatroom/presentation/ChatRoomView.kt
+1
-1
ChatRoomFragment.kt
.../java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
+7
-5
No files found.
app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomView.kt
View file @
94ce1336
...
...
@@ -119,7 +119,7 @@ interface ChatRoomView : LoadingView, MessageView {
/**
* Clears the message composition.
*/
fun
clearMessageComposition
()
fun
clearMessageComposition
(
deleteMessage
:
Boolean
)
fun
showInvalidFileSize
(
fileSize
:
Int
,
maxFileSize
:
Int
)
...
...
app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
View file @
94ce1336
...
...
@@ -283,7 +283,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
}
sendButton
.
setOnClickListener
{
uploadFile
(
data
,
(
citation
?:
""
)
+
description
.
text
.
toString
())
clearMessageComposition
()
clearMessageComposition
(
true
)
alertDialog
.
dismiss
()
}
cancelButton
.
setOnClickListener
{
...
...
@@ -563,15 +563,16 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
ui
{
button_send
.
isEnabled
=
true
text_message
.
isEnabled
=
true
clearMessageComposition
()
clearMessageComposition
(
true
)
}
}
override
fun
clearMessageComposition
()
{
override
fun
clearMessageComposition
(
deleteMessage
:
Boolean
)
{
ui
{
citation
=
null
editingMessageId
=
null
if
(
deleteMessage
)
text_message
.
textContent
=
""
actionSnackbar
.
dismiss
()
}
...
...
@@ -823,7 +824,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
var
textMessage
=
citation
?:
""
textMessage
+=
text_message
.
textContent
sendMessage
(
textMessage
)
clearMessageComposition
()
clearMessageComposition
(
true
)
}
button_show_attachment_options
.
setOnClickListener
{
...
...
@@ -914,7 +915,8 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
private
fun
setupActionSnackbar
()
{
actionSnackbar
=
ActionSnackbar
.
make
(
message_list_container
,
parser
=
parser
)
actionSnackbar
.
cancelView
.
setOnClickListener
{
clearMessageComposition
()
clearMessageComposition
(
false
)
if
(
text_message
.
textContent
.
isEmpty
())
KeyboardHelper
.
showSoftKeyboard
(
text_message
)
}
}
...
...
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