From f1919be19753fe288d6414ba622f7e611c7ad6d7 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Mon, 10 May 2021 17:15:02 +0200
Subject: [PATCH] code review

---
 .../im/vector/app/features/matrixto/MatrixToBottomSheet.kt | 2 +-
 .../im/vector/app/features/spaces/SpaceExploreActivity.kt  | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheet.kt b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheet.kt
index aec52a571c..61e4accba2 100644
--- a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheet.kt
@@ -57,7 +57,7 @@ class MatrixToBottomSheet :
         injector.inject(this)
     }
 
-    var weakReference = WeakReference<InteractionListener>(null)
+    private var weakReference = WeakReference<InteractionListener>(null)
 
     var interactionListener: InteractionListener?
         set(value) {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt
index 9b0173f58f..dbe92d4d93 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt
@@ -57,6 +57,13 @@ class SpaceExploreActivity : VectorBaseActivity<ActivitySimpleBinding>(), SpaceD
             }
             super.onFragmentAttached(fm, f, context)
         }
+
+        override fun onFragmentDetached(fm: FragmentManager, f: Fragment) {
+            if (f is MatrixToBottomSheet) {
+                f.interactionListener = null
+            }
+            super.onFragmentDetached(fm, f)
+        }
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {