PawletOS/lineageos_setupwizard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix restore page back navigation

Browse Source 
Issue: calyxos#2284
Change-Id: I72249924d4b0c56b6bcceea1c5a4adbfa5c54fb2
This commit is contained in:
Oliver Scott
2024-04-23 18:38:23 -04:00
committed by Michael Bestas
parent ac47a02936
commit a1a6530ddd
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/org/lineageos/setupwizard/backup/RestoreIntroActivity.java
View File

@@ -6,8 +6,12 @@
package org.lineageos.setupwizard.backup; package org.lineageos.setupwizard.backup;
import static com.google.android.setupcompat.util.ResultCodes.RESULT_ACTIVITY_NOT_FOUND;
import static org.lineageos.setupwizard.SetupWizardApp.ACTION_RESTORE_FROM_BACKUP; import static org.lineageos.setupwizard.SetupWizardApp.ACTION_RESTORE_FROM_BACKUP;
import androidx.activity.result.ActivityResult;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
@@ -23,6 +27,19 @@ public class RestoreIntroActivity extends SubBaseActivity {
getString(R.string.os_name))); getString(R.string.os_name)));
} }
@Override
protected void onActivityResult(ActivityResult activityResult) {
int resultCode = activityResult.getResultCode();
Intent data = activityResult.getData();
if (resultCode != RESULT_CANCELED) {
nextAction(resultCode, data);
} else if (mIsSubactivityNotFound) {
finishAction(RESULT_ACTIVITY_NOT_FOUND);
} else if (data != null && data.getBooleanExtra("onBackPressed", false)) {
onStartSubactivity();
}
}
@Override @Override
protected void onStartSubactivity() { protected void onStartSubactivity() {
setNextAllowed(true); setNextAllowed(true);