change onChanged() to accept nullable argument

Author: PRosenb

app/src/main/java/ch/pete/appconfigapp/configdetail/ConfigDetailFragment.kt

@@ -90,14 +90,17 @@ class ConfigDetailFragment : Fragment(), ConfigDetailView, TitleFragment {
 
         val configLiveDataKeyValues = viewModel.keyValueEntriesByConfigId(config.id)
         configLiveDataKeyValues.observe(viewLifecycleOwner, object : Observer<List<KeyValue>> {
-            override fun onChanged(keyValues: List<KeyValue>) {
+            override fun onChanged(keyValues: List<KeyValue>?) {
                 configLiveDataKeyValues.removeObserver(this)
+
                 keyValue.text =
-                    context?.resources?.getQuantityString(
-                        R.plurals.keys_count,
-                        keyValues.size,
-                        keyValues.size
-                    ) ?: ""
+                    if (keyValues != null) {
+                        context?.resources?.getQuantityString(
+                            R.plurals.keys_count,
+                            keyValues.size,
+                            keyValues.size
+                        ) ?: ""
+                    } else ""
 
                 editKeyValue.setOnClickListener {
                     viewModel.onEditKeyValueClicked(config)

app/src/main/java/ch/pete/appconfigapp/configdetail/ConfigDetailViewModel.kt

@@ -38,6 +38,7 @@ class ConfigDetailViewModel(application: Application) : AndroidViewModel(applica
                     configLiveData.removeObserver(this)
                     view.initViewWithConfig(config)
                 } else {
+                    Timber.w("config is null, close fragment")
                     view.close()
                 }
             }

app/src/main/java/ch/pete/appconfigapp/externalconfiglocationdetails/ExternalConfigLocationDetailFragment.kt

@@ -18,6 +18,7 @@ import kotlinx.android.synthetic.main.fragment_external_config_location_detail.u
 import kotlinx.android.synthetic.main.fragment_external_config_location_detail.view.explanation
 import kotlinx.android.synthetic.main.fragment_external_config_location_detail.view.name
 import kotlinx.android.synthetic.main.fragment_external_config_location_detail.view.url
+import timber.log.Timber
 
 class ExternalConfigLocationDetailFragment :
     Fragment(), ExternalConfigLocationDetailView, TitleFragment {
@@ -59,10 +60,16 @@ class ExternalConfigLocationDetailFragment :
         val liveData =
             viewModel.externalConfigLocation()
         liveData.observe(viewLifecycleOwner, object : Observer<ExternalConfigLocation> {
-            override fun onChanged(externalConfigLocation: ExternalConfigLocation) {
+            override fun onChanged(externalConfigLocation: ExternalConfigLocation?) {
                 liveData.removeObserver(this)
-                rootView.name.setText(externalConfigLocation.name)
-                rootView.url.setText(externalConfigLocation.url)
+
+                if (externalConfigLocation != null) {
+                    rootView.name.setText(externalConfigLocation.name)
+                    rootView.url.setText(externalConfigLocation.url)
+                } else {
+                    Timber.w("externalConfigLocation is null, close fragment")
+                    close()
+                }
             }
         })
     }

app/src/main/java/ch/pete/appconfigapp/keyvaluedetails/KeyValueDialogFragment.kt

@@ -16,6 +16,7 @@ import kotlinx.android.synthetic.main.dialogfragment_keyvalues.view.key
 import kotlinx.android.synthetic.main.dialogfragment_keyvalues.view.nullCheckbox
 import kotlinx.android.synthetic.main.dialogfragment_keyvalues.view.ok
 import kotlinx.android.synthetic.main.dialogfragment_keyvalues.view.value
+import timber.log.Timber
 
 
 class KeyValueDialogFragment : DialogFragment(), KeyValueDialogView {
@@ -82,11 +83,17 @@ class KeyValueDialogFragment : DialogFragment(), KeyValueDialogView {
         val keyValueLiveData =
             viewModel.keyValueEntry()
         keyValueLiveData.observe(viewLifecycleOwner, object : Observer<KeyValue> {
-            override fun onChanged(keyValue: KeyValue) {
+            override fun onChanged(keyValue: KeyValue?) {
                 keyValueLiveData.removeObserver(this)
-                rootView.key.setText(keyValue.key)
-                rootView.value.setText(keyValue.value)
-                rootView.nullCheckbox.isChecked = keyValue.value == null
+
+                if (keyValue != null) {
+                    rootView.key.setText(keyValue.key)
+                    rootView.value.setText(keyValue.value)
+                    rootView.nullCheckbox.isChecked = keyValue.value == null
+                } else {
+                    Timber.w("keyValue is null, close dialog")
+                    close()
+                }
             }
         })
     }

app/src/main/java/ch/pete/appconfigapp/nameauthority/NameAuthorityFragment.kt

@@ -18,6 +18,7 @@ import kotlinx.android.synthetic.main.fragment_name_authority.name
 import kotlinx.android.synthetic.main.fragment_name_authority.view.authority
 import kotlinx.android.synthetic.main.fragment_name_authority.view.explanation
 import kotlinx.android.synthetic.main.fragment_name_authority.view.name
+import timber.log.Timber
 
 class NameAuthorityFragment : Fragment(), TitleFragment, NameAuthorityView {
     companion object {
@@ -53,10 +54,16 @@ class NameAuthorityFragment : Fragment(), TitleFragment, NameAuthorityView {
         val liveData =
             viewModel.config()
         liveData.observe(viewLifecycleOwner, object : Observer<Config> {
-            override fun onChanged(config: Config) {
+            override fun onChanged(config: Config?) {
                 liveData.removeObserver(this)
-                rootView.name.setText(config.name)
-                rootView.authority.setText(config.authority)
+
+                if (config != null) {
+                    rootView.name.setText(config.name)
+                    rootView.authority.setText(config.authority)
+                } else {
+                    Timber.w("config is null, close fragment")
+                    close()
+                }
             }
         })
     }