From 883a7cecf0ab17a03d7b876995cc20b7c3013a07 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Fri, 22 Jan 2021 15:34:40 +0300
Subject: [PATCH] Fix viewbinding npe crashes.

---
 CHANGES.md                                                   | 1 +
 .../java/im/vector/app/ui/UiAllScreensSanityTest.kt          | 2 ++
 .../app/features/home/room/detail/RoomDetailFragment.kt      | 5 ++++-
 .../app/features/home/room/detail/search/SearchFragment.kt   | 4 ++--
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index b2483df78d..d6e3a9b21a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,7 @@ Improvements 🙌:
 Bugfix 🐛:
  - Fix clear cache issue: sometimes, after a clear cache, there is still a token, so the init sync service is not started.
  - Sidebar too large in horizontal orientation or tablets (#475)
+ - Crashes reported by PlayStore (new in 1.0.14) (#2707)
 
 Translations 🗣:
  -
diff --git a/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt b/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt
index 58b596b05f..2d0077fc55 100644
--- a/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt
+++ b/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt
@@ -196,6 +196,8 @@ class UiAllScreensSanityTest {
         pressBack()
         clickMenu(R.id.video_call)
         pressBack()
+        clickMenu(R.id.search)
+        pressBack()
 
         pressBack()
     }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index e134230c61..2d2059377c 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -297,6 +297,8 @@ class RoomDetailFragment @Inject constructor(
     private var lockSendButton = false
     private val activeCallViewHolder = ActiveCallViewHolder()
 
+    private lateinit var emojiPopup: EmojiPopup
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         sharedActionViewModel = activityViewModelProvider.get(MessageSharedActionViewModel::class.java)
@@ -512,7 +514,7 @@ class RoomDetailFragment @Inject constructor(
     }
 
     private fun setupEmojiPopup() {
-        val emojiPopup = EmojiPopup
+        emojiPopup = EmojiPopup
                 .Builder
                 .fromRootView(views.rootConstraintLayout)
                 .setKeyboardAnimationStyle(R.style.emoji_fade_animation_style)
@@ -591,6 +593,7 @@ class RoomDetailFragment @Inject constructor(
         autoCompleter.clear()
         debouncer.cancelAll()
         views.timelineRecyclerView.cleanup()
+        emojiPopup.dismiss()
 
         super.onDestroyView()
     }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt
index 8a8701e45f..9a57d9480c 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt
@@ -76,10 +76,10 @@ class SearchFragment @Inject constructor(
         controller.listener = this
     }
 
-    override fun onDestroy() {
-        super.onDestroy()
+    override fun onDestroyView() {
         views.searchResultRecycler.cleanup()
         controller.listener = null
+        super.onDestroyView()
     }
 
     override fun invalidate() = withState(searchViewModel) { state ->