Merge branch 'develop' into feature/save-unfinished-message

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

@@ -328,7 +328,6 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
 
                     val currentDayMarkerText = msgModel.currentDayMarkerText
                     val previousDayMarkerText = prevMsgModel.currentDayMarkerText
-                    println("$previousDayMarkerText then $currentDayMarkerText")
                     if (previousDayMarkerText != currentDayMarkerText) {
                         prevMsgModel.showDayMarker = true
                     }

emoji/src/main/java/chat/rocket/android/emoji/EmojiKeyboardPopup.kt

@@ -156,21 +156,24 @@ class EmojiKeyboardPopup(context: Context, view: View) : OverKeyboardPopupWindow
 
     private suspend fun setupViewPager() {
         context.let {
-            val callback = when (it) {
+            val callback: EmojiKeyboardListener? = when (it) {
                 is EmojiKeyboardListener -> it
                 else -> {
                     val fragments = (it as AppCompatActivity).supportFragmentManager.fragments
                     if (fragments.size == 0 || !(fragments[0] is EmojiKeyboardListener)) {
-                        throw IllegalStateException("activity/fragment should implement Listener interface")
-                    }
+                        // Since the app can arrive in an inconsistent state at this point, do not throw
+//                        throw IllegalStateException("activity/fragment should implement Listener interface")
+                        null
+                    } else {
                         fragments[0] as EmojiKeyboardListener
                     }
                 }
+            }
 
             adapter = EmojiPagerAdapter(object : EmojiKeyboardListener {
                 override fun onEmojiAdded(emoji: Emoji) {
                     EmojiRepository.addToRecents(emoji)
-                    callback.onEmojiAdded(emoji)
+                    callback?.onEmojiAdded(emoji)
                 }
             })