From 8dad806a618c60b30096d832e078ee259462b24d Mon Sep 17 00:00:00 2001
From: Tommy Webb <tommy@calyxinstitute.org>
Date: Thu, 1 Aug 2024 15:55:04 +0000
Subject: [PATCH] fixup! Rework activity launching and result handling

SubBaseActivity cares if back was pressed, not what the result code was.

Change-Id: If8cc19de6a6300c906228dbe99fc7fdf4e6b47c8
---
 src/org/lineageos/setupwizard/SubBaseActivity.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/org/lineageos/setupwizard/SubBaseActivity.java b/src/org/lineageos/setupwizard/SubBaseActivity.java
index 4751bd44..7c83658d 100644
--- a/src/org/lineageos/setupwizard/SubBaseActivity.java
+++ b/src/org/lineageos/setupwizard/SubBaseActivity.java
@@ -80,8 +80,7 @@ public abstract class SubBaseActivity extends BaseSetupWizardActivity {
         super.onNextIntentResult(activityResult);
         int resultCode = activityResult.getResultCode();
         Intent data = activityResult.getData();
-        if (resultCode == RESULT_CANCELED && data != null
-                && data.getBooleanExtra("onBackPressed", false)) {
+        if (data != null && data.getBooleanExtra("onBackPressed", false)) {
             onStartSubactivity();
         }
     }