(#2) Fix observer lifecycle bug.

mash-up-kr · Nov 27, 2019 · ad7b765 · ad7b765
1 parent 3a30b8d
commit ad7b765
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 14 deletions.
diff --git a/app/src/main/java/com/mashup/app/attendees/AttendeesFragment.kt b/app/src/main/java/com/mashup/app/attendees/AttendeesFragment.kt
@@ -57,7 +57,7 @@ class AttendeesFragment(attendanceList: List<NoticeAttendance>) : Fragment() {
     }
 
     private fun setupEventObserver() {
-        viewModel.closeEvent.observe(this, EventObserver {
+        viewModel.closeEvent.observe(viewLifecycleOwner, EventObserver {
             if (it) {
                 activity?.finish()
             }

diff --git a/app/src/main/java/com/mashup/app/notices/NoticesFragment.kt b/app/src/main/java/com/mashup/app/notices/NoticesFragment.kt
@@ -19,10 +19,6 @@ import org.koin.androidx.viewmodel.ext.android.viewModel
 
 class NoticesFragment : Fragment() {
 
-    companion object {
-        fun newInstance() = NoticesFragment()
-    }
-
     private val viewModel: NoticesViewModel by viewModel()
     private lateinit var viewDataBinding: NoticesFragmentBinding
     private lateinit var listAdapter: NoticeAdapter
@@ -56,7 +52,7 @@ class NoticesFragment : Fragment() {
     }
 
     private fun setupSnackbar() {
-        view?.setupSnackbar(this, viewModel.snackbarText, Snackbar.LENGTH_SHORT)
+        view?.setupSnackbar(viewLifecycleOwner, viewModel.snackbarText, Snackbar.LENGTH_SHORT)
     }
 
     private fun setupEventObserver() {

diff --git a/app/src/main/java/com/mashup/util/ViewExt.kt b/app/src/main/java/com/mashup/util/ViewExt.kt
@@ -22,14 +22,11 @@ fun View.setupSnackbar(
         snackbarEvent: LiveData<Event<Any>>,
         timeLength: Int
 ) {
-
-    snackbarEvent.observe(lifecycleOwner, Observer { event ->
-        event.getContentIfNotHandled()?.let {
-            when (it) {
-                is Int -> showSnackbar(context.getString(it), timeLength)
-                is String -> showSnackbar(it, timeLength)
-                else -> throw TypeCastException()
-            }
+    snackbarEvent.observe(lifecycleOwner, EventObserver {
+        when (it) {
+            is Int -> showSnackbar(context.getString(it), timeLength)
+            is String -> showSnackbar(it, timeLength)
+            else -> throw TypeCastException()
         }
     })
 }