Properly restore drafts for new notes when restarting app after proce…

…ss death
farmerbb · Sep 22, 2024 · d1daffc · d1daffc
1 parent 675f60f
commit d1daffc
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 6 deletions.
diff --git a/app/src/main/java/com/farmerbb/notepad/android/NotepadActivity.kt b/app/src/main/java/com/farmerbb/notepad/android/NotepadActivity.kt
@@ -39,7 +39,9 @@ class NotepadActivity: ComponentActivity(), FSAFActivityCallbacks {
 
  vm.migrateData {
  setContent {
- NotepadComposeAppRoute()
+ NotepadComposeAppRoute(
+ restoredFromState = savedInstanceState != null,
+ )
  }
  }
  }

diff --git a/app/src/main/java/com/farmerbb/notepad/model/NavState.kt b/app/src/main/java/com/farmerbb/notepad/model/NavState.kt
@@ -36,11 +36,11 @@ val navStateSaver = Saver<MutableState<NavState>, Pair<String, Long?>>(
  else -> "" to null
  }
  },
- restore = {
+ restore = { (key, id) ->
  mutableStateOf(
- when(it.first) {
- VIEW -> NavState.View(it.second ?: 0)
- EDIT -> NavState.Edit(it.second)
+ when(key) {
+ VIEW -> NavState.View(id ?: 0)
+ EDIT -> NavState.Edit(id)
  else -> NavState.Empty
  }
  )

diff --git a/app/src/main/java/com/farmerbb/notepad/ui/routes/NotepadComposeApp.kt b/app/src/main/java/com/farmerbb/notepad/ui/routes/NotepadComposeApp.kt
@@ -99,7 +99,9 @@ import com.zachklipp.richtext.ui.printing.rememberPrintableController
 import org.koin.androidx.compose.koinViewModel
 
 @Composable
-fun NotepadComposeAppRoute() {
+fun NotepadComposeAppRoute(
+ restoredFromState: Boolean,
+) {
  val vm: NotepadViewModel = koinViewModel()
  val configuration = LocalConfiguration.current
 
@@ -117,6 +119,7 @@ fun NotepadComposeAppRoute() {
  NotepadTheme(isLightTheme, backgroundColorRes, rtlLayout) {
  NotepadComposeApp(
  vm = vm,
+ restoredFromState = restoredFromState,
  isMultiPane = configuration.screenWidthDp >= 600,
  initState = when (draftId) {
  -1L -> Empty
@@ -129,6 +132,7 @@ fun NotepadComposeAppRoute() {
 @Composable
 private fun NotepadComposeApp(
  vm: NotepadViewModel = koinViewModel(),
+ restoredFromState: Boolean,
  isMultiPane: Boolean = false,
  initState: NavState = Empty
 ) {
@@ -158,6 +162,7 @@ private fun NotepadComposeApp(
  val showDoubleTapMessage by vm.prefs.showDoubleTapMessage.collectAsState()
 
  var navState by rememberSaveable(saver = navStateSaver) { mutableStateOf(initState) }
+ var shouldRestoreDraftId by remember { mutableStateOf(restoredFromState) }
  var isPrinting by remember { mutableStateOf(false) }
  var isSaveButton by rememberSaveable { mutableStateOf(false) }
  var onSaveComplete by remember { mutableStateOf({ _: Long -> }) }
@@ -367,6 +372,18 @@ private fun NotepadComposeApp(
  }
  }
 
+ LaunchedEffect(shouldRestoreDraftId, navState, initState) {
+ if (shouldRestoreDraftId
+ && navState is Edit
+ && initState is Edit
+ && (navState as Edit).id == null) {
+ // Overwrite the navState restored from savedInstanceState
+ // in the case of a saved draft of a new note
+ navState = initState
+ shouldRestoreDraftId = false
+ }
+ }
+
  BackHandler(
  enabled = multiSelectEnabled || navState != Empty || searchNotesEnabled,
  onBack = onBack