This repository was archived by the owner on Aug 9, 2020. It is now read-only.
File tree Expand file tree Collapse file tree 6 files changed +14
-51
lines changed
app/src/test/java/io/victoralbertos/rxactivityresult
androidTest/java/io/victoralbertos/rxactivityresult
main/java/rx_activity_result
test/java/io/victoralbertos/rxactivityresult Expand file tree Collapse file tree 6 files changed +14
-51
lines changed Original file line number Diff line number Diff line change @@ -26,8 +26,8 @@ allprojects {
2626And add next dependencies in the build.gradle of the module:
2727``` gradle
2828dependencies {
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
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -3,12 +3,12 @@ apply plugin: 'com.github.dcendents.android-maven'
33group= ' com.github.VictorAlbertos'
44
55android {
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
2323dependencies {
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}
Load Diff This file was deleted.
Original file line number Diff line number Diff 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 ) {
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments