Fixed LocationPicker null Closes #34

thunsaker · Oct 9, 2015 · e78dd17 · e78dd17
1 parent 644f6db
commit e78dd17
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/mobile/build.gradle b/mobile/build.gradle
@@ -24,8 +24,8 @@ android {
         applicationId "com.thunsaker.rapido"
         minSdkVersion 14
         targetSdkVersion 23
-        versionCode 20
-        versionName "2.0"
+        versionCode 2010
+        versionName "2.0.1"
         resConfigs "en", "es"
     }
 

diff --git a/mobile/src/main/java/com/thunsaker/rapido/ui/LocationPicker.java b/mobile/src/main/java/com/thunsaker/rapido/ui/LocationPicker.java
@@ -228,14 +228,14 @@ public boolean onOptionsItemSelected(MenuItem item) {
 
         if(id == R.id.action_close) {
             setResult(Activity.RESULT_CANCELED);
-            foursquareServiceSubscription.unsubscribe();
             ShutItDown();
         }
         return super.onOptionsItemSelected(item);
     }
 
     private void ShutItDown() {
-        foursquareServiceSubscription.unsubscribe();
+        if(foursquareServiceSubscription != null)
+            foursquareServiceSubscription.unsubscribe();
         finish();
     }