diff --git a/app/src/main/java/net/underdesk/circolapp/fragments/CircularLetterFragment.kt b/app/src/main/java/net/underdesk/circolapp/fragments/CircularLetterFragment.kt index 58ea10f..883cc02 100644 --- a/app/src/main/java/net/underdesk/circolapp/fragments/CircularLetterFragment.kt +++ b/app/src/main/java/net/underdesk/circolapp/fragments/CircularLetterFragment.kt @@ -51,14 +51,14 @@ class CircularLetterFragment : Fragment(), MainActivity.SearchCallback, circularLetterViewModel = ViewModelProviders.of(this).get(CircularLetterViewModel::class.java) - circularLetterViewModel.circulars.observe(this, Observer { + circularLetterViewModel.circulars.observe(viewLifecycleOwner, Observer { if (root.circulars_list.adapter == null) { root.circulars_list.adapter = CircularLetterAdapter(it, activity as MainActivity) } else { (root.circulars_list.adapter as CircularLetterAdapter).changeDataSet(it) } }) - circularLetterViewModel.showMessage.observe(this, Observer { + circularLetterViewModel.showMessage.observe(viewLifecycleOwner, Observer { if (it) activity?.findViewById(R.id.container)?.let { view -> Snackbar.make( view, @@ -69,7 +69,7 @@ class CircularLetterFragment : Fragment(), MainActivity.SearchCallback, circularLetterViewModel.showMessage.postValue(false) } }) - circularLetterViewModel.circularsUpdated.observe(this, Observer { + circularLetterViewModel.circularsUpdated.observe(viewLifecycleOwner, Observer { if (it) { root.circulars_refresh.isRefreshing = false diff --git a/app/src/main/java/net/underdesk/circolapp/fragments/FavouritesFragment.kt b/app/src/main/java/net/underdesk/circolapp/fragments/FavouritesFragment.kt index 8bf8187..ae038b0 100644 --- a/app/src/main/java/net/underdesk/circolapp/fragments/FavouritesFragment.kt +++ b/app/src/main/java/net/underdesk/circolapp/fragments/FavouritesFragment.kt @@ -48,7 +48,7 @@ class FavouritesFragment : Fragment(), MainActivity.SearchCallback { favouritesViewModel = ViewModelProviders.of(this).get(FavouritesViewModel::class.java) - favouritesViewModel.circulars.observe(this, Observer { + favouritesViewModel.circulars.observe(viewLifecycleOwner, Observer { if (root.circulars_list.adapter == null) { root.circulars_list.adapter = CircularLetterAdapter(it, activity as MainActivity) } else { diff --git a/app/src/main/java/net/underdesk/circolapp/fragments/RemindersFragment.kt b/app/src/main/java/net/underdesk/circolapp/fragments/RemindersFragment.kt index 6520664..60b5b91 100644 --- a/app/src/main/java/net/underdesk/circolapp/fragments/RemindersFragment.kt +++ b/app/src/main/java/net/underdesk/circolapp/fragments/RemindersFragment.kt @@ -48,7 +48,7 @@ class RemindersFragment : Fragment(), MainActivity.SearchCallback { remindersViewModel = ViewModelProviders.of(this).get(RemindersViewModel::class.java) - remindersViewModel.circulars.observe(this, Observer { + remindersViewModel.circulars.observe(viewLifecycleOwner, Observer { if (root.circulars_list.adapter == null) { root.circulars_list.adapter = CircularLetterAdapter(it, activity as MainActivity) } else {