Skip to content
This repository was archived by the owner on Aug 9, 2020. It is now read-only.

Commit 8885440

Browse files
author
Victor
committed
Defensive null check to avoid null pointer exception on HolderActivity when the application has been destroyed on the background.
Closes #9
1 parent c82464f commit 8885440

File tree

6 files changed

+14
-51
lines changed

6 files changed

+14
-51
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ allprojects {
2626
And add next dependencies in the build.gradle of the module:
2727
```gradle
2828
dependencies {
29-
compile "com.github.VictorAlbertos:RxActivityResult:0.3.4"
30-
compile "io.reactivex:rxjava:1.1.5"
29+
compile "com.github.VictorAlbertos:RxActivityResult:0.3.5"
30+
compile "io.reactivex:rxjava:1.1.8"
3131
}
3232
```
3333

app/src/test/java/io/victoralbertos/rxactivityresult/ExampleUnitTest.java

Lines changed: 0 additions & 15 deletions
This file was deleted.

rx_activity_result/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ apply plugin: 'com.github.dcendents.android-maven'
33
group='com.github.VictorAlbertos'
44

55
android {
6-
compileSdkVersion 23
7-
buildToolsVersion "23.0.3"
6+
compileSdkVersion 24
7+
buildToolsVersion "24.0.0"
88

99
defaultConfig {
1010
minSdkVersion 16
11-
targetSdkVersion 23
11+
targetSdkVersion 24
1212
versionCode 1
1313
versionName "1.0"
1414
}
@@ -22,8 +22,8 @@ android {
2222

2323
dependencies {
2424
compile fileTree(dir: 'libs', include: ['*.jar'])
25-
compile 'com.android.support:appcompat-v7:23.4.0'
26-
compile 'io.reactivex:rxjava:1.1.5'
25+
compile 'com.android.support:appcompat-v7:24.1.1'
26+
compile 'io.reactivex:rxjava:1.1.8'
2727

2828
testCompile 'junit:junit:4.12'
2929
}

rx_activity_result/src/androidTest/java/io/victoralbertos/rxactivityresult/ApplicationTest.java

Lines changed: 0 additions & 13 deletions
This file was deleted.

rx_activity_result/src/main/java/rx_activity_result/HolderActivity.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ public class HolderActivity extends Activity {
3030
@Override protected void onCreate(Bundle savedInstanceState) {
3131
super.onCreate(savedInstanceState);
3232

33+
if (request == null) {
34+
finish();
35+
return;
36+
}
37+
3338
onResult = request.onResult();
3439

3540
if (savedInstanceState != null) return;
@@ -76,7 +81,8 @@ private void startIntentSenderWithOptions(RequestIntentSender requestIntentSende
7681

7782
@Override protected void onDestroy() {
7883
super.onDestroy();
79-
onResult.response(resultCode, data);
84+
if (onResult != null)
85+
onResult.response(resultCode, data);
8086
}
8187

8288
static void setRequest(Request aRequest) {

rx_activity_result/src/test/java/io/victoralbertos/rxactivityresult/ExampleUnitTest.java

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)