Defensive null check to avoid null pointer exception on HolderActivit…

…y when the application has been destroyed on the background. Closes #9
VictorAlbertos · Aug 6, 2016 · 8885440 · 8885440
1 parent c82464f
commit 8885440
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 51 deletions.
diff --git a/README.md b/README.md
@@ -26,8 +26,8 @@ allprojects {
 And add next dependencies in the build.gradle of the module:
 ```gradle
 dependencies {
-    compile "com.github.VictorAlbertos:RxActivityResult:0.3.4"
-    compile "io.reactivex:rxjava:1.1.5"
+    compile "com.github.VictorAlbertos:RxActivityResult:0.3.5"
+    compile "io.reactivex:rxjava:1.1.8"
 }
 ```
 

diff --git a/app/src/test/java/io/victoralbertos/rxactivityresult/ExampleUnitTest.java b/app/src/test/java/io/victoralbertos/rxactivityresult/ExampleUnitTest.java
diff --git a/rx_activity_result/build.gradle b/rx_activity_result/build.gradle
@@ -3,12 +3,12 @@ apply plugin: 'com.github.dcendents.android-maven'
 group='com.github.VictorAlbertos'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 24
+    buildToolsVersion "24.0.0"
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 23
+        targetSdkVersion 24
         versionCode 1
         versionName "1.0"
     }
@@ -22,8 +22,8 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:23.4.0'
-    compile 'io.reactivex:rxjava:1.1.5'
+    compile 'com.android.support:appcompat-v7:24.1.1'
+    compile 'io.reactivex:rxjava:1.1.8'
 
     testCompile 'junit:junit:4.12'
 }
diff --git a/...ivity_result/src/androidTest/java/io/victoralbertos/rxactivityresult/ApplicationTest.java b/...ivity_result/src/androidTest/java/io/victoralbertos/rxactivityresult/ApplicationTest.java
diff --git a/rx_activity_result/src/main/java/rx_activity_result/HolderActivity.java b/rx_activity_result/src/main/java/rx_activity_result/HolderActivity.java
@@ -30,6 +30,11 @@ public class HolderActivity extends Activity {
     @Override protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        if (request == null) {
+            finish();
+            return;
+        }
+
         onResult = request.onResult();
 
         if (savedInstanceState != null) return;
@@ -76,7 +81,8 @@ private void startIntentSenderWithOptions(RequestIntentSender requestIntentSende
 
     @Override protected void onDestroy() {
         super.onDestroy();
-        onResult.response(resultCode, data);
+        if (onResult != null)
+            onResult.response(resultCode, data);
     }
 
     static void setRequest(Request aRequest) {

diff --git a/rx_activity_result/src/test/java/io/victoralbertos/rxactivityresult/ExampleUnitTest.java b/rx_activity_result/src/test/java/io/victoralbertos/rxactivityresult/ExampleUnitTest.java