fix(launch): stop replaying an open-event intent on every recreation (#309)
Android hands the intent that started the task back to onCreate every time the activity is recreated, so a single reminder or widget event tap re-opened that event on every later launch — an error screen once the event had been deleted. Hold back the event channels when the launch is a recreation or a resume from recents. The other channels keep re-reading the intent: an .ics import or a prefilled create form has no saved state of its own, so that replay is what carries them through a rotation.
This commit is contained in:
@@ -113,11 +113,26 @@ class MainActivity : AppCompatActivity() {
|
|||||||
systemBarsDark = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK ==
|
systemBarsDark = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK ==
|
||||||
Configuration.UI_MODE_NIGHT_YES
|
Configuration.UI_MODE_NIGHT_YES
|
||||||
applyEdgeToEdge()
|
applyEdgeToEdge()
|
||||||
requestedDetailKey = intent.detailKeyOrNull() ?: intent.viewEventKeyOrNull()
|
// Android hands the intent that started the task back to onCreate every
|
||||||
|
// time the activity is recreated — on a rotation, or on a restart after
|
||||||
|
// the system reclaimed the process. Re-running a launch that opens one
|
||||||
|
// specific event is what made a single reminder or widget tap re-open
|
||||||
|
// that event on every later launch, an error screen once the event had
|
||||||
|
// been deleted (#309); the user left it long ago, and the activity
|
||||||
|
// restores where they actually were along with its saved state.
|
||||||
|
//
|
||||||
|
// Only those channels are held back. An .ics import or a prefilled
|
||||||
|
// create form keeps no saved state of its own, so re-reading the intent
|
||||||
|
// is what carries one through a recreation.
|
||||||
|
val replaying = savedInstanceState != null || intent.isRelaunch()
|
||||||
|
if (!replaying) {
|
||||||
|
requestedDetailKey = intent.detailKeyOrNull() ?: intent.viewEventKeyOrNull()
|
||||||
|
requestedEditKey = intent.editEventKeyOrNull()
|
||||||
|
}
|
||||||
requestedNav = intent.navRequestOrNull()
|
requestedNav = intent.navRequestOrNull()
|
||||||
|
?.takeUnless { replaying && it is WidgetNavRequest.OpenEvent }
|
||||||
requestedImportUri = intent.importUriOrNull()
|
requestedImportUri = intent.importUriOrNull()
|
||||||
requestedInsert = intent.insertRequestOrNull()
|
requestedInsert = intent.insertRequestOrNull()
|
||||||
requestedEditKey = intent.editEventKeyOrNull()
|
|
||||||
if (CrashReporter.shouldPrompt(this)) pendingCrashReport = CrashReporter.pendingReport(this)
|
if (CrashReporter.shouldPrompt(this)) pendingCrashReport = CrashReporter.pendingReport(this)
|
||||||
setContent {
|
setContent {
|
||||||
// One activity-scoped SettingsViewModel drives both the theme here
|
// One activity-scoped SettingsViewModel drives both the theme here
|
||||||
@@ -242,6 +257,16 @@ class MainActivity : AppCompatActivity() {
|
|||||||
intent.editEventKeyOrNull()?.let { requestedEditKey = it }
|
intent.editEventKeyOrNull()?.let { requestedEditKey = it }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Whether this launch is the task being resumed rather than a fresh
|
||||||
|
* delivery — Android sets the flag when an activity is started from the
|
||||||
|
* recents list, where the intent it carries is the one the task was started
|
||||||
|
* with however long ago. `onNewIntent` is the channel a real new request
|
||||||
|
* arrives on while the task lives, so nothing is lost by ignoring these.
|
||||||
|
*/
|
||||||
|
private fun Intent.isRelaunch(): Boolean =
|
||||||
|
flags and Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY != 0
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The `.ics` Uri an external app asked us to open (file manager `ACTION_VIEW`)
|
* The `.ics` Uri an external app asked us to open (file manager `ACTION_VIEW`)
|
||||||
* or share into us (`ACTION_SEND`). Restricted to content/file schemes so the
|
* or share into us (`ACTION_SEND`). Restricted to content/file schemes so the
|
||||||
|
|||||||
Reference in New Issue
Block a user