Fix bug #55.

patloew · Jun 9, 2018 · b344c89 · b344c89
1 parent 0e83119
commit b344c89
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -2,8 +2,8 @@
 
 buildscript {
     repositories {
-        jcenter()
         google()
+        jcenter()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.1.3'
@@ -20,8 +20,8 @@ buildscript {
 
 allprojects {
     repositories {
-        jcenter()
         google()
+        jcenter()
     }
 }
 

diff --git a/library/build.gradle b/library/build.gradle
@@ -9,6 +9,7 @@ project.archivesBaseName = 'rxlocation'
 
 android {
     compileSdkVersion 28
+    buildToolsVersion "28.0.0"
 
     defaultConfig {
         minSdkVersion 14

diff --git a/library/src/main/java/com/patloew/rxlocation/LocationUpdatesFlowableOnSubscribe.java b/library/src/main/java/com/patloew/rxlocation/LocationUpdatesFlowableOnSubscribe.java
@@ -51,9 +51,11 @@ protected void onGoogleApiClientReady(GoogleApiClient apiClient, FlowableEmitter
 
     @Override
     protected void onUnsubscribed(GoogleApiClient apiClient) {
-        LocationServices.FusedLocationApi.removeLocationUpdates(apiClient, locationListener);
-        locationListener.onUnsubscribed();
-        locationListener = null;
+        if(locationListener != null) {
+            LocationServices.FusedLocationApi.removeLocationUpdates(apiClient, locationListener);
+            locationListener.onUnsubscribed();
+            locationListener = null;
+        }
     }
 
     static class RxLocationListener implements LocationListener {

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -2,6 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 28
+    buildToolsVersion "28.0.0"
 
     defaultConfig {
         applicationId "com.patloew.rxlocationsample"