resolve conflict

Author: butterflyforever

android/canonical/app/src/main/java/com/google/samples/quickstart/canonical/MapsFragment.kt

@@ -49,7 +49,7 @@ class MapsFragment : Fragment() {
         private const val LOCATION_PERMISSION_REQUEST_CODE = 1
         private const val ZOOM_VALUE = 14f
         private const val PADDING_RATIO = 1.5
-        private const val MAP_FRAGMENT_TAG = "Mapfragment"
+        private const val FRAGMENT_TAG = "Mapfragment"
     }
 
     override fun onRequestPermissionsResult(requestCode: Int,
@@ -99,33 +99,29 @@ class MapsFragment : Fragment() {
         map.isMyLocationEnabled = true
         map.setPadding(0, (PADDING_RATIO * autocompleteLayout.height).toInt(),0,0)
 
-        fusedLocationClient.lastLocation
-            .addOnSuccessListener { location ->
+        fusedLocationClient.lastLocation.addOnSuccessListener { location ->
             // Got last known location. In some rare situations this can be null.
-                location?.let {
-                    Log.d(MAP_FRAGMENT_TAG, "Locating Success ${location.latitude}, ${location.longitude}")
-                    lastLocation = location
-                    currentLatLng = LatLng(location.latitude, location.longitude)
-                    map.animateCamera(CameraUpdateFactory.newLatLngZoom(
-                        currentLatLng,
-                        ZOOM_VALUE
-                    ))
-                    map.addMarker(MarkerOptions()
-                                .position(currentLatLng!!)
-                                .title(getString(R.string.my_location_title)))
-                    map.moveCamera(CameraUpdateFactory.newLatLngZoom(
-                        currentLatLng,
-                        ZOOM_VALUE
-                    ))
-                    setPlacesSearchBias()
-                } ?: run{
-                    Log.d(MAP_FRAGMENT_TAG, "Locating Failed")
-                    Toast.makeText(context, getString(R.string.cannot_access_location), Toast.LENGTH_SHORT)
-                }
-            }
-            .addOnFailureListener {
-                Log.d(MAP_FRAGMENT_TAG, "fusedLocationClient.lastLocation Failed")
+            location?.let {
+                Log.d(FRAGMENT_TAG, "Locating Success ${location.latitude}, ${location.longitude}")
+                lastLocation = location
+                currentLatLng = LatLng(location.latitude, location.longitude)
+                map.animateCamera(CameraUpdateFactory.newLatLngZoom(
+                    currentLatLng,
+                    ZOOM_VALUE
+                ))
+                map.addMarker(MarkerOptions()
+                            .position(currentLatLng!!)
+                            .title(getString(R.string.my_location_title)))
+                map.moveCamera(CameraUpdateFactory.newLatLngZoom(
+                    currentLatLng,
+                    ZOOM_VALUE
+                ))
+                setPlacesSearchBias()
+            } ?: run{
+                Log.d(FRAGMENT_TAG, "Locating Failed")
+                Toast.makeText(context, getString(R.string.cannot_access_location), Toast.LENGTH_SHORT)
             }
+        }
     }
 
     private fun setUpAutocomplete(autocompleteFragment : AutocompleteSupportFragment, mapFragment : SupportMapFragment) {
@@ -138,7 +134,7 @@ class MapsFragment : Fragment() {
             }
 
             override fun onError(status: Status) {
-                Log.e(MAP_FRAGMENT_TAG, "An error occurred: $status")
+                Log.e(FRAGMENT_TAG, "An error occurred: $status")
             }
         })
     }