Skip to content

Commit 6f6859c

Browse files
committed
update ActivityResult logic
1 parent a4f61c2 commit 6f6859c

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

utils/src/main/java/com/haoge/easyandroid/easy/EasyActivityResult.kt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ object EasyActivityResult {
3232
return
3333
}
3434

35-
if (context !is Activity) {
35+
if (context !is Activity || callback == null) {
3636
context.startActivity(intent)
3737
} else {
3838
val requestCode = codeGenerator.nextInt(0x0000FFFF)
@@ -42,10 +42,6 @@ object EasyActivityResult {
4242
context.startActivityForResult(intent, requestCode, options)
4343
}
4444

45-
if (callback == null) {
46-
return
47-
}
48-
4945
if (container.containsKey(context)) {
5046
container[context]?.put(requestCode, callback)
5147
} else {

0 commit comments

Comments
 (0)