Solved issue where map is null after on click of the satellite button (…

…#126)
AdevintaSpain · Dec 4, 2017 · 2996196 · 2996196
1 parent 0531946
commit 2996196
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -76,7 +76,7 @@ Include the dependency in your app `build.gradle`:
 
 ```groovy
 dependencies {
-    compile 'com.schibstedspain.android:leku:3.6.0'
+    compile 'com.schibstedspain.android:leku:3.6.1'
 }
 ```
 

diff --git a/leku/build.gradle b/leku/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'com.novoda.bintray-release'
 apply from: '../quality.gradle'
 
 group = 'com.schibstedspain.android'
-version = '3.6.0'
+version = '3.6.1'
 
 android {
   compileSdkVersion 26
@@ -54,7 +54,7 @@ dependencies {
   implementation 'pl.charmas.android:android-reactive-location2:2.0@aar'
 
   implementation "io.reactivex:rxandroid:1.2.1"
-  implementation 'io.reactivex.rxjava2:rxjava:2.1.6'
+  implementation 'io.reactivex.rxjava2:rxjava:2.1.7'
   implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
   implementation 'nl.littlerobots.rxlint:rxlint:1.6'
 
@@ -70,7 +70,7 @@ publish {
   userOrg = 'schibstedspain'
   groupId = 'com.schibstedspain.android'
   artifactId = 'leku'
-  publishVersion = '3.6.0'
+  publishVersion = '3.6.1'
   desc = 'Location picker component for Android. It returns a latitude,longitude and an address based on the location picked in the LocationPickerActivity provided.'
   website = 'https://github.com/SchibstedSpain/leku'
 }
diff --git a/leku/src/main/java/com/schibstedspain/leku/LocationPickerActivity.java b/leku/src/main/java/com/schibstedspain/leku/LocationPickerActivity.java
@@ -269,8 +269,10 @@ private void setUpFloatingButtons() {
 
     FloatingActionButton btnSatellite = findViewById(R.id.btnSatellite);
     btnSatellite.setOnClickListener(view -> {
-      map.setMapType(map.getMapType() == MAP_TYPE_SATELLITE ? MAP_TYPE_NORMAL : MAP_TYPE_SATELLITE);
-      btnSatellite.setImageResource(map.getMapType() == MAP_TYPE_SATELLITE ? R.drawable.ic_satellite_off : R.drawable.ic_satellite_on);
+      if (map != null && btnSatellite != null) {
+        map.setMapType(map.getMapType() == MAP_TYPE_SATELLITE ? MAP_TYPE_NORMAL : MAP_TYPE_SATELLITE);
+        btnSatellite.setImageResource(map.getMapType() == MAP_TYPE_SATELLITE ? R.drawable.ic_satellite_off : R.drawable.ic_satellite_on);
+      }
     });
     btnSatellite.setVisibility(enableSatelliteView ? View.VISIBLE : View.GONE);
   }