From 1faea0857451b43076e54dbdf7956ea06b076a3f Mon Sep 17 00:00:00 2001
From: Aurelien Hubert <aurel.hubert@gmail.com>
Date: Tue, 12 Mar 2019 11:32:21 +0100
Subject: [PATCH] Clean file

---
 .../android/model/realm/Location.kt            |  7 -------
 .../ui/fragment/LocationDataFragment.kt        | 18 ++++--------------
 2 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Location.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Location.kt
index 12fc27b5..de04bfb6 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/Location.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Location.kt
@@ -6,7 +6,6 @@ import io.realm.annotations.PrimaryKey
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.model.interfaces.Manageable
 import net.pokeranalytics.android.ui.view.RowRepresentable
-import net.pokeranalytics.android.ui.view.rowrepresentable.LocationRow
 import net.pokeranalytics.android.ui.view.rowrepresentable.SimpleRow
 import java.util.*
 
@@ -40,12 +39,6 @@ open class Location : RealmObject(), Manageable, RowRepresentable {
 	override fun updateValue(value: Any?, row: RowRepresentable) {
 		when (row) {
 			SimpleRow.NAME -> this.name = value as String? ?: ""
-			LocationRow.ADDRESS -> this.address = value as String? ?: ""
-			LocationRow.LOCATE_ME -> {
-				if (value is Place) {
-					setPlace(value)
-				}
-			}
 		}
 	}
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/LocationDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/LocationDataFragment.kt
index b4f4be86..27eaaefe 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/LocationDataFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/LocationDataFragment.kt
@@ -7,13 +7,12 @@ import net.pokeranalytics.android.R
 import net.pokeranalytics.android.model.realm.Location
 import net.pokeranalytics.android.ui.adapter.RowRepresentableDataSource
 import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource
-import net.pokeranalytics.android.ui.helpers.PlacePickerManager
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor
 import net.pokeranalytics.android.ui.view.RowViewType
+import net.pokeranalytics.android.ui.view.rowrepresentable.CustomizableRowRepresentable
 import net.pokeranalytics.android.ui.view.rowrepresentable.LocationRow
 import net.pokeranalytics.android.ui.view.rowrepresentable.SimpleRow
-import net.pokeranalytics.android.ui.view.rowrepresentable.CustomizableRowRepresentable
 import timber.log.Timber
 
 /**
@@ -93,22 +92,13 @@ class LocationDataFragment : EditableDataFragment(), StaticRowRepresentableDataS
 	}
 
 	override fun onRowSelected(position: Int, row: RowRepresentable, fromAction: Boolean) {
-
-		// If we click on a location row, save the location
+		// If we click on a location row, save the location (and finish activity)
 		placesForRows[row]?.place?.let { place ->
 			location.setPlace(place)
 			saveData()
 			return
 		}
-
-		when (row) {
-			LocationRow.LOCATE_ME -> {
-				isLookingForPlaces = true
-				PlacePickerManager.create(parentActivity, row, this)
-				rowRepresentableAdapter.refreshRow(row)
-			}
-			else -> super.onRowSelected(position, row, fromAction)
-		}
+		super.onRowSelected(position, row, fromAction)
 	}
 
 	override fun onRowValueChanged(value: Any?, row: RowRepresentable) {
@@ -196,7 +186,6 @@ class LocationDataFragment : EditableDataFragment(), StaticRowRepresentableDataS
 			}
 
 			if (success && places.size > 0) {
-				locationActivated = true
 				rowPlaces.clear()
 				placesForRows.clear()
 
@@ -208,6 +197,7 @@ class LocationDataFragment : EditableDataFragment(), StaticRowRepresentableDataS
 					}
 				}
 
+				locationActivated = true
 				isLookingForPlaces = false
 				updateAdapterUI()
 			} else {