Merge branch 'develop' into autocomplete-emojis

app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt

@@ -418,11 +418,12 @@ class ChatRoomPresenter @Inject constructor(
                         }
                     }
                 }
-            } catch (ex: Exception) {
-                Timber.d(ex, "Error uploading file")
-                when (ex) {
-                    is RocketChatException -> view.showMessage(ex)
-                    else -> view.showGenericErrorMessage()
+            } catch (ex: RocketChatException) {
+                Timber.d(ex)
+                ex.message?.let {
+                    view.showMessage(it)
+                }.ifNull {
+                    view.showGenericErrorMessage()
                 }
             } finally {
                 view.hideLoading()
@@ -1139,4 +1140,33 @@ class ChatRoomPresenter @Inject constructor(
             navigator.toMessageInformation(messageId = messageId)
         }
     }
-}
\ No newline at end of file
+
+    /**
+     * Save unfinished message, when user left chat room without sending a message. It also clears
+     * saved message from local repository when unfinishedMessage is blank.
+     *
+     * @param chatRoomId Chat room Id.
+     * @param unfinishedMessage The unfinished message to save.
+     */
+    fun saveUnfinishedMessage(chatRoomId: String, unfinishedMessage: String) {
+        val key = "${currentServer}_${LocalRepository.UNFINISHED_MSG_KEY}$chatRoomId"
+        if (unfinishedMessage.isNotBlank()) {
+            localRepository.save(key, unfinishedMessage)
+        } else {
+            localRepository.clear(key)
+        }
+    }
+
+    /**
+     * Get unfinished message from local repository, when user left chat room without
+     * sending a message and now the user is back.
+     *
+     * @param chatRoomId Chat room Id.
+     *
+     * @return Returns the unfinished message.
+     */
+    fun getUnfinishedMessage(chatRoomId: String): String {
+        val key = "${currentServer}_${LocalRepository.UNFINISHED_MSG_KEY}$chatRoomId"
+        return localRepository.get(key) ?: ""
+    }
+}

app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt

@@ -6,13 +6,11 @@ import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
 import android.content.Intent
+import android.content.res.Configuration
 import android.graphics.drawable.Drawable
 import android.os.Bundle
 import android.os.Handler
-import android.os.SystemClock
-import android.text.Spannable
 import android.text.SpannableStringBuilder
-import android.text.style.ImageSpan
 import android.view.KeyEvent
 import android.view.LayoutInflater
 import android.view.Menu
@@ -65,7 +63,6 @@ import chat.rocket.android.helper.ImageHelper
 import chat.rocket.android.helper.KeyboardHelper
 import chat.rocket.android.helper.MessageParser
 import chat.rocket.android.util.extension.asObservable
-import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.extensions.circularRevealOrUnreveal
 import chat.rocket.android.util.extensions.fadeIn
 import chat.rocket.android.util.extensions.fadeOut
@@ -78,8 +75,6 @@ import chat.rocket.android.util.extensions.ui
 import chat.rocket.common.model.RoomType
 import chat.rocket.common.model.roomTypeOf
 import chat.rocket.core.internal.realtime.socket.model.State
-import chat.rocket.core.model.ChatRoom
-import com.bumptech.glide.load.resource.gif.GifDrawable
 import dagger.android.support.AndroidSupportInjection
 import io.reactivex.Observable
 import io.reactivex.disposables.CompositeDisposable
@@ -88,8 +83,6 @@ import kotlinx.android.synthetic.main.fragment_chat_room.*
 import kotlinx.android.synthetic.main.message_attachment_options.*
 import kotlinx.android.synthetic.main.message_composer.*
 import kotlinx.android.synthetic.main.message_list.*
-import kotlinx.coroutines.experimental.android.UI
-import kotlinx.coroutines.experimental.launch
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicInteger
 import javax.inject.Inject
@@ -260,6 +253,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         recycler_view.removeOnLayoutChangeListener(layoutChangeListener)
 
         presenter.disconnect()
+        presenter.saveUnfinishedMessage(chatRoomId, text_message.text.toString())
         handler.removeCallbacksAndMessages(null)
         unsubscribeComposeTextMessage()
 
@@ -478,15 +472,15 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         ui {
             when (usernameList.size) {
                 1 -> text_typing_status.text =
-                        SpannableStringBuilder()
-                            .bold { append(usernameList[0]) }
-                            .append(getString(R.string.msg_is_typing))
+                    SpannableStringBuilder()
+                        .bold { append(usernameList[0]) }
+                        .append(getString(R.string.msg_is_typing))
                 2 -> text_typing_status.text =
-                        SpannableStringBuilder()
-                            .bold { append(usernameList[0]) }
-                            .append(getString(R.string.msg_and))
-                            .bold { append(usernameList[1]) }
-                            .append(getString(R.string.msg_are_typing))
+                    SpannableStringBuilder()
+                        .bold { append(usernameList[0]) }
+                        .append(getString(R.string.msg_and))
+                        .bold { append(usernameList[1]) }
+                        .append(getString(R.string.msg_are_typing))
 
                 else -> text_typing_status.text = getString(R.string.msg_several_users_are_typing)
             }
@@ -796,6 +790,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
             )
 
             subscribeComposeTextMessage()
+            getUnfinishedMessage()
             emojiKeyboardPopup = EmojiKeyboardPopup(activity!!, activity!!.findViewById(R.id.fragment_container))
             emojiKeyboardPopup.listener = this
             text_message.listener = object : ComposerEditText.ComposerEditTextListener {
@@ -863,6 +858,19 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         }
     }
 
+    private fun getUnfinishedMessage() {
+        val unfinishedMessage = presenter.getUnfinishedMessage(chatRoomId)
+        if (unfinishedMessage.isNotBlank()) {
+            text_message.setText(unfinishedMessage)
+            val orientation = resources.configuration.orientation
+            if (orientation == Configuration.ORIENTATION_PORTRAIT) {
+                KeyboardHelper.showSoftKeyboard(text_message)
+            } else {
+                //TODO show keyboard in full screen mode when landscape orientation
+            }
+        }
+    }
+
     private fun setupSuggestionsView() {
         suggestions_view.anchorTo(text_message)
             .setMaximumHeight(resources.getDimensionPixelSize(R.dimen.suggestions_box_max_height))

app/src/main/java/chat/rocket/android/helper/KeyboardHelper.kt

@@ -4,6 +4,7 @@ import android.app.Activity
 import android.content.Context
 import android.graphics.Rect
 import android.view.View
+import android.view.WindowManager
 import android.view.inputmethod.InputMethodManager
 
 
@@ -50,4 +51,4 @@ object KeyboardHelper {
             inputMethodManager.toggleSoftInput(InputMethodManager.SHOW_IMPLICIT, InputMethodManager.SHOW_IMPLICIT)
         }
     }
-}
\ No newline at end of file
+}

app/src/main/java/chat/rocket/android/infrastructure/LocalRepository.kt

@@ -27,6 +27,7 @@ interface LocalRepository {
         const val SETTINGS_KEY = "settings_"
         const val PERMISSIONS_KEY = "permissions_"
         const val USER_KEY = "user_"
+        const val UNFINISHED_MSG_KEY = "unfinished_msg_"
         const val CURRENT_USERNAME_KEY = "username_"
         const val LAST_CHATROOMS_REFRESH = "_chatrooms_refresh"
     }