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

Fix ActivityResultLauncher lifecycle issues

Browse Source 
If an activity is re-created, its result launchers that were registered
during instantiation are not available, so register those in onCreate
instead and unregister in onDestroy.

Change-Id: I7fd2a61ddbb056e0bf761b6918dc371db8ddbe33
This commit is contained in:
Tommy Webb
2024-08-01 19:22:46 +00:00
committed by Michael Bestas
parent 4ed687c330
commit 0d3264d67f
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/org/lineageos/setupwizard/BaseSetupWizardActivity.java
View File

@@ -50,10 +50,7 @@ public abstract class BaseSetupWizardActivity extends AppCompatActivity implemen
private NavigationLayout mNavigationBar; private NavigationLayout mNavigationBar;
private final ActivityResultLauncher<Intent> mNextIntentResultLauncher = private ActivityResultLauncher<Intent> mNextIntentResultLauncher;
registerForActivityResult(
new StartDecoratedActivityForResult(),
BaseSetupWizardActivity.this::onNextIntentResult);
@Override @Override
protected void onCreate(@Nullable Bundle savedInstanceState) { protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -61,6 +58,9 @@ public abstract class BaseSetupWizardActivity extends AppCompatActivity implemen
logActivityState("onCreate savedInstanceState=" + savedInstanceState); logActivityState("onCreate savedInstanceState=" + savedInstanceState);
} }
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
mNextIntentResultLauncher = registerForActivityResult(
new StartDecoratedActivityForResult(),
BaseSetupWizardActivity.this::onNextIntentResult);
initLayout(); initLayout();
mNavigationBar = getNavigationBar(); mNavigationBar = getNavigationBar();
if (mNavigationBar != null) { if (mNavigationBar != null) {
@@ -125,6 +125,7 @@ public abstract class BaseSetupWizardActivity extends AppCompatActivity implemen
logActivityState("onDestroy"); logActivityState("onDestroy");
} }
super.onDestroy(); super.onDestroy();
mNextIntentResultLauncher.unregister();
} }
@Override @Override

14
src/org/lineageos/setupwizard/SubBaseActivity.java
View File

@@ -28,10 +28,7 @@ public abstract class SubBaseActivity extends BaseSetupWizardActivity {
protected abstract void onStartSubactivity(); protected abstract void onStartSubactivity();
private final ActivityResultLauncher<Intent> mSubactivityResultLauncher = private ActivityResultLauncher<Intent> mSubactivityResultLauncher;
registerForActivityResult(
new StartDecoratedActivityForResult(),
SubBaseActivity.this::onSubactivityResult);
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
@@ -39,12 +36,21 @@ public abstract class SubBaseActivity extends BaseSetupWizardActivity {
Log.d(TAG, "onCreate savedInstanceState=" + savedInstanceState); Log.d(TAG, "onCreate savedInstanceState=" + savedInstanceState);
} }
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
mSubactivityResultLauncher = registerForActivityResult(
new StartDecoratedActivityForResult(),
SubBaseActivity.this::onSubactivityResult);
setNextAllowed(false); setNextAllowed(false);
if (savedInstanceState == null) { if (savedInstanceState == null) {
onStartSubactivity(); onStartSubactivity();
} }
} }
@Override
protected void onDestroy() {
super.onDestroy();
mSubactivityResultLauncher.unregister();
}
@Override @Override
public void onStart() { public void onStart() {
super.onStart(); super.onStart();