Merge pull request #560 from WideChat/pjl-remove-composer-delay

clear composer and enable send button before sending messages
WideChat · Aug 2, 2019 · 2f3ff34 · 2f3ff34
2 parents b6c3992 + 843bf21
commit 2f3ff34
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
@@ -412,6 +412,8 @@ class ChatRoomPresenter @Inject constructor(
                                 RoomUiModel(roles = chatRoles, isBroadcast = chatIsBroadcast)
                             ), false
                         )
+                        clearDraftMessage()
+                        view.enableSendMessageButton()
                         client.sendMessage(id, chatRoomId, text)
                         messagesRepository.save(newMessage.copy(synced = true))
                         analyticsManager.logMessageSent(newMessage.type.toString(), currentServer)
@@ -432,15 +434,16 @@ class ChatRoomPresenter @Inject constructor(
                         }
                     }
                 } else {
+                    clearDraftMessage()
+                    view.enableSendMessageButton()
                     client.updateMessage(chatRoomId, messageId, text)
                 }
-                clearDraftMessage()
             } catch (ex: Exception) {
                 Timber.e(ex, "Error sending message...")
+                view.enableSendMessageButton()
                 jobSchedulerInteractor.scheduleSendingMessages()
             } finally {
-                view.clearMessageComposition(true)
-                view.enableSendMessageButton()
+                //view.enableSendMessageButton()
             }
         }
     }
@@ -1363,6 +1366,7 @@ class ChatRoomPresenter @Inject constructor(
     }
 
     fun clearDraftMessage() {
+        view.clearMessageComposition(true)
         localRepository.clear(draftKey)
     }
     /**