feat: add option to wait for sync to finish (fixes #309)

Signed-off-by: Tommy van der Vorst <tommy@pixelspark.nl>

Author: pixelspark

Localizable.xcstrings

@@ -36570,6 +36570,52 @@
         }
       }
     },
+    "Wait inside the app" : {
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Warten Sie in der App"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Espera dentro de la app"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Attendi all'interno dell'app"
+          }
+        },
+        "ja" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "アプリ内でお待ちください"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Wacht in de app"
+          }
+        },
+        "uk" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Зачекайте в додатку"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "请在应用内等待"
+          }
+        }
+      }
+    },
     "Wait until the folder is done synchronizing and try again." : {
       "localizations" : {
         "de" : {

Sushitrain/BackgroundManager.swift

@@ -43,6 +43,7 @@ enum BackgroundTaskType: String, Codable, Equatable {
 
 enum ContinuedTaskType {
 	case time(seconds: Double)
+	case timeOrFinished(seconds: Double)
 }
 
 #if os(iOS)
@@ -170,8 +171,13 @@ enum ContinuedTaskType {
 				var run = BackgroundSyncRun(started: Date.now, taskType: .continued)
 				// Perform the requested continued task
 				switch taskType {
-				case .time(seconds: let duration):
+				case .time(seconds: let duration), .timeOrFinished(seconds: let duration):
 					let start = Date.now
+					var stopWhenFinished = false
+					if case .timeOrFinished(_) = taskType {
+						stopWhenFinished = true
+					}
+
 					var shouldContinue = true
 					task.expirationHandler = {
 						Log.info("Continued processing task expired")
@@ -180,6 +186,17 @@ enum ContinuedTaskType {
 
 					do {
 						while shouldContinue {
+							if stopWhenFinished && appState.isFinished {
+								// Wait another second to see if we're still finished
+								continuedTask.updateTitle(continuedTask.title, subtitle: String(localized: "Finished"))
+								try await Task.sleep(for: .seconds(1))
+								if appState.isFinished {
+									shouldContinue = false
+									continuedTask.updateTitle(continuedTask.title, subtitle: String(localized: "Finishing up..."))
+									break
+								}
+							}
+
 							let remaining = Int64(duration - Date.now.timeIntervalSince(start))
 							if remaining <= 0 {
 								shouldContinue = false

Sushitrain/StartView.swift

@@ -303,13 +303,18 @@ struct StartView: View {
 					#if os(iOS)
 						.contextMenu {
 							if !self.appState.isFinished {
-								Button("Wait for completion", systemImage: "hourglass.circle") {
-									self.showWaitScreen = true
+								if #available(iOS 26, *) {
+									self.continueInBackgroundMenu(untilFinished: true)
+								}
+								else {
+									Button("Wait for completion", systemImage: "hourglass.circle") {
+										self.showWaitScreen = true
+									}
 								}
 							}
 
 							if #available(iOS 26, *) {
-								self.continueInBackgroundMenu()
+								self.continueInBackgroundMenu(untilFinished: false)
 							}
 						}
 					#endif
@@ -425,32 +430,40 @@ struct StartView: View {
 	}
 
 	#if os(iOS)
-		@ViewBuilder @available(iOS 26, *) private func continueInBackgroundMenu() -> some View {
-			Menu("Synchronize in the background", systemImage: "gearshape.2.fill") {
+		@ViewBuilder @available(iOS 26, *) private func continueInBackgroundMenu(untilFinished: Bool) -> some View {
+			Menu(untilFinished ? "Wait for completion" : "Synchronize in the background", systemImage: "gearshape.2.fill") {
 				Button("For 10 seconds") {
-					self.startBackgroundSyncFor(.time(seconds: 10))
+					self.startBackgroundSyncFor(untilFinished ? .timeOrFinished(seconds: 10) : .time(seconds: 10))
 				}.disabled(backgroundManager.runningContinuedTask != nil)
 
 				Button("For 1 minute") {
-					self.startBackgroundSyncFor(.time(seconds: 60))
+					self.startBackgroundSyncFor(untilFinished ? .timeOrFinished(seconds: 60) : .time(seconds: 60))
 				}.disabled(backgroundManager.runningContinuedTask != nil)
 
 				Button("For 10 minutes") {
-					self.startBackgroundSyncFor(.time(seconds: 10 * 60))
+					self.startBackgroundSyncFor(untilFinished ? .timeOrFinished(seconds: 10 * 60) : .time(seconds: 10 * 60))
 				}.disabled(backgroundManager.runningContinuedTask != nil)
 
 				Button("For 1 hour") {
-					self.startBackgroundSyncFor(.time(seconds: 3600))
+					self.startBackgroundSyncFor(untilFinished ? .timeOrFinished(seconds: 3600) : .time(seconds: 3600))
 				}.disabled(backgroundManager.runningContinuedTask != nil)
+
+				Divider()
+
+				Button("Wait inside the app", systemImage: "hourglass.circle") {
+					self.showWaitScreen = true
+				}
 			}
 		}
 
 		@available(iOS 26, *) private func startBackgroundSyncFor(_ type: ContinuedTaskType) {
-			do {
-				try backgroundManager.startContinuedSync(type)
-			}
-			catch {
-				self.showError = error
+			withAnimation {
+				do {
+					try backgroundManager.startContinuedSync(type)
+				}
+				catch {
+					self.showError = error
+				}
 			}
 		}
 	#endif