Fix crashes in PlaceSettingsActivity

5 years ago · 2d79e2e571
parent 4cf90ffdec
commit 2d79e2e571
1 changed files with 8 additions and 2 deletions
--- a/app/src/main/java/org/tasks/activities/PlaceSettingsActivity.kt
+++ b/app/src/main/java/org/tasks/activities/PlaceSettingsActivity.kt
@ -37,7 +37,13 @@ class PlaceSettingsActivity : BaseListSettingsActivity(), MapFragment.MapFragmen
            finish()
        }

-        place = intent?.getParcelableExtra(EXTRA_PLACE)!!
+        val extra: Place? = intent?.getParcelableExtra(EXTRA_PLACE)
+        if (extra == null) {
+            finish()
+            return
+        }
+
+        place = extra

        super.onCreate(savedInstanceState)

@ -85,7 +91,7 @@ class PlaceSettingsActivity : BaseListSettingsActivity(), MapFragment.MapFragmen
    override fun isNew() = false

    override fun getToolbarTitle(): String {
-        return place.address
+        return place.address ?: place.displayName
    }

    override fun delete() {