agorise/bitsy-wallet
agorise/bitsy-wallet
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Make the map object in the MerchantsFragment nullable and add null checks everywhere it is used, to avoid NPE related crashes in case the map is not loaded correctly.

Browse source
This commit is contained in:
Severiano Jaramillo 2019-03-13 22:18:04 -06:00
parent 3f3423873c
commit afcb0aa8bd
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/MerchantsFragment.kt
View file

@ -74,7 +74,7 @@ class MerchantsFragment : Fragment(), OnMapReadyCallback, SearchView.OnSuggestio
private const val SUGGEST_COLUMN_IMAGE_RESOURCE = "suggest_image_resource" private const val SUGGEST_COLUMN_IMAGE_RESOURCE = "suggest_image_resource"
} }
private lateinit var mMap: GoogleMap private var mMap: GoogleMap? = null
private lateinit var mMerchantViewModel: MerchantViewModel private lateinit var mMerchantViewModel: MerchantViewModel
@ -303,7 +303,7 @@ class MerchantsFragment : Fragment(), OnMapReadyCallback, SearchView.OnSuggestio
if (lat != null && lon != null) { if (lat != null && lon != null) {
try { try {
mMap.animateCamera(CameraUpdateFactory.newLatLngZoom(LatLng(lat, lon), 15f)) mMap?.animateCamera(CameraUpdateFactory.newLatLngZoom(LatLng(lat, lon), 15f))
} catch (e: Exception) { } catch (e: Exception) {
Log.d(TAG, e.message) Log.d(TAG, e.message)
} }
@ -319,8 +319,8 @@ class MerchantsFragment : Fragment(), OnMapReadyCallback, SearchView.OnSuggestio
// Try to show or dismiss the custom popup window with the merchants and tellers switches // Try to show or dismiss the custom popup window with the merchants and tellers switches
if (mPopupWindow?.isShowing == false) { if (mPopupWindow?.isShowing == false) {
mPopupWindow?.showAsDropDown(toolbar, screenWidth, 8) mPopupWindow?.showAsDropDown(toolbar, screenWidth, 8)
if (mMap.isMyLocationEnabled) if (mMap?.isMyLocationEnabled == true)
mMap.uiSettings?.isMyLocationButtonEnabled = false mMap?.uiSettings?.isMyLocationButtonEnabled = false
} else } else
dismissPopupWindow() dismissPopupWindow()
return true return true
@ -335,7 +335,7 @@ class MerchantsFragment : Fragment(), OnMapReadyCallback, SearchView.OnSuggestio
if (requestCode == REQUEST_LOCATION_PERMISSION) { if (requestCode == REQUEST_LOCATION_PERMISSION) {
if ((grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED)) { if ((grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED)) {
mMap.isMyLocationEnabled = true mMap?.isMyLocationEnabled = true
} else { } else {
context?.toast(getString(R.string.msg__location_permission_necessary)) context?.toast(getString(R.string.msg__location_permission_necessary))
} }
@ -356,7 +356,7 @@ class MerchantsFragment : Fragment(), OnMapReadyCallback, SearchView.OnSuggestio
mMap = googleMap mMap = googleMap
// Add padding to move the controls out of the toolbar/status bar and navigation bar. // Add padding to move the controls out of the toolbar/status bar and navigation bar.
mMap.setPadding(0, toolbar.height + statusBarSize, 0, navigationBarSize) mMap?.setPadding(0, toolbar.height + statusBarSize, 0, navigationBarSize)
applyMapTheme() applyMapTheme()
@ -370,17 +370,17 @@ class MerchantsFragment : Fragment(), OnMapReadyCallback, SearchView.OnSuggestio
initTellersCluster() initTellersCluster()
// Point the map's listeners at the listeners implemented by the marker manager. // Point the map's listeners at the listeners implemented by the marker manager.
mMap.setOnMarkerClickListener(mMarkerManager) mMap?.setOnMarkerClickListener(mMarkerManager)
mMap.setOnCameraIdleListener { mMap?.setOnCameraIdleListener {
mMerchantClusterManager?.onCameraIdle() mMerchantClusterManager?.onCameraIdle()
mTellerClusterManager?.onCameraIdle() mTellerClusterManager?.onCameraIdle()
} }
mMap.setInfoWindowAdapter(mMarkerManager) mMap?.setInfoWindowAdapter(mMarkerManager)
// Try to dismiss the // Try to dismiss the
mMap.setOnMapClickListener { mMap?.setOnMapClickListener {
dismissPopupWindow() dismissPopupWindow()
} }
} }
@ -392,13 +392,13 @@ class MerchantsFragment : Fragment(), OnMapReadyCallback, SearchView.OnSuggestio
if (nightMode) { if (nightMode) {
// Customise the styling of the base map using a JSON object defined // Customise the styling of the base map using a JSON object defined
// in a raw resource file. // in a raw resource file.
val success = mMap.setMapStyle( val success = mMap?.setMapStyle(
MapStyleOptions.loadRawResourceStyle( MapStyleOptions.loadRawResourceStyle(
context, R.raw.map_style_night context, R.raw.map_style_night
) )
) )
if (!success) { if (success != null && success != false) {
Log.e(TAG, "Style parsing failed.") Log.e(TAG, "Style parsing failed.")
} }
} }
@ -411,7 +411,7 @@ class MerchantsFragment : Fragment(), OnMapReadyCallback, SearchView.OnSuggestio
requestPermissions(arrayOf(android.Manifest.permission.ACCESS_FINE_LOCATION), REQUEST_LOCATION_PERMISSION) requestPermissions(arrayOf(android.Manifest.permission.ACCESS_FINE_LOCATION), REQUEST_LOCATION_PERMISSION)
} else { } else {
// Permission is already granted // Permission is already granted
mMap.isMyLocationEnabled = true mMap?.isMyLocationEnabled = true
} }
} }
@ -499,7 +499,7 @@ class MerchantsFragment : Fragment(), OnMapReadyCallback, SearchView.OnSuggestio
val bounds = builder.build() val bounds = builder.build()
try { try {
mMap.animateCamera(CameraUpdateFactory.newLatLngBounds(bounds, 100)) mMap?.animateCamera(CameraUpdateFactory.newLatLngBounds(bounds, 100))
} catch (e: Exception) { } catch (e: Exception) {
Log.d(TAG, e.message) Log.d(TAG, e.message)
} }
@ -600,8 +600,8 @@ class MerchantsFragment : Fragment(), OnMapReadyCallback, SearchView.OnSuggestio
private fun dismissPopupWindow() { private fun dismissPopupWindow() {
if (mPopupWindow?.isShowing == true) { if (mPopupWindow?.isShowing == true) {
mPopupWindow?.dismiss() mPopupWindow?.dismiss()
if (mMap.isMyLocationEnabled) if (mMap?.isMyLocationEnabled == true)
mMap.uiSettings?.isMyLocationButtonEnabled = true mMap?.uiSettings?.isMyLocationButtonEnabled = true
} }
} }