fixup! Rework activity launching and result handling
SubBaseActivity cares if back was pressed, not what the result code was. Change-Id: If8cc19de6a6300c906228dbe99fc7fdf4e6b47c8
This commit is contained in:
committed by
Michael Bestas
parent
a4dd79f78d
commit
8dad806a61
@@ -80,8 +80,7 @@ public abstract class SubBaseActivity extends BaseSetupWizardActivity {
|
|||||||
super.onNextIntentResult(activityResult);
|
super.onNextIntentResult(activityResult);
|
||||||
int resultCode = activityResult.getResultCode();
|
int resultCode = activityResult.getResultCode();
|
||||||
Intent data = activityResult.getData();
|
Intent data = activityResult.getData();
|
||||||
if (resultCode == RESULT_CANCELED && data != null
|
if (data != null && data.getBooleanExtra("onBackPressed", false)) {
|
||||||
&& data.getBooleanExtra("onBackPressed", false)) {
|
|
||||||
onStartSubactivity();
|
onStartSubactivity();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user