kutesir/Kisani
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

Add cellular data toggle, Tailscale remote access, fix ToggleRow padding

Browse Source 
- ToggleRow: fix cramped layout — proper horizontal + vertical card padding
- ConnectionStore: add allowCellularBackup, useTailscaleWhenRemote, tailscaleHost
- LANMonitor: add isOnCellular (NWPath cellular interface), isTailscaleActive
  (detects utun interface with 100.x.x.x CGNAT address), openTailscaleApp()
- BackupEngine: gate backup on cellular setting; resolveHost() switches to
  tailscaleHost when not on trusted LAN and Tailscale tunnel is active
- SettingsView: CONNECTIVITY section (cellular toggle + live status),
  REMOTE ACCESS section (Tailscale toggle, host field, status dot, Open button)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Robin Kutesa
2026-05-16 11:40:07 +03:00
parent 07b5e45c78
commit 03d63e60de
5 changed files with 211 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Services/BackupEngine.swift
View File

@@ -20,6 +20,16 @@ final class BackupEngine: ObservableObject {
) async throws -> BackupResult {
isCancelled = false
let startDate = Date()
let store = ConnectionStore.shared
let lan = LANMonitor.shared
// Gate: block cellular unless user opted in (never block on LAN trigger)
if !triggeredByLAN && lan.isOnCellular && !store.allowCellularBackup {
throw BackupError.networkUnavailable
}
// Resolve effective host: use Tailscale when remote and tunnel is active
let host = resolveHost(connection: connection, store: store, lan: lan)
// 1. Fetch assets
job.prepare()
@@ -33,7 +43,7 @@ final class BackupEngine: ObservableObject {
}
try await transfer.connect(
to: connection.host,
to: host,
port: connection.port,
username: connection.username,
password: connection.password
@@ -63,7 +73,6 @@ final class BackupEngine: ObservableObject {
let remotePath = "\(connection.remotePath)/\(asset.filename)"
// Skip if exists (newFilesOnly = true in filter)
if filter.newFilesOnly, (try? await transfer.fileExists(at: remotePath)) == true {
job.fileCompleted(skipped: true)
skipped += 1
@@ -74,7 +83,8 @@ final class BackupEngine: ObservableObject {
let localURL = try await photoService.exportAsset(asset)
defer { try? FileManager.default.removeItem(at: localURL) }
let fileSize = (try? localURL.resourceValues(forKeys: [.fileSizeKey]).fileSize).flatMap { Int64($0) } ?? 0
let fileSize = (try? localURL.resourceValues(forKeys: [.fileSizeKey]).fileSize)
.flatMap { Int64($0) } ?? 0
try await transfer.upload(localURL: localURL, remotePath: remotePath) { sent, total in
let speed = speedTracker.update(bytesSent: sent)
@@ -109,22 +119,33 @@ final class BackupEngine: ObservableObject {
job.finish(result: result)
// 5. Persist history
let entry = BackupHistoryEntry(result: result, nasHost: connection.host, triggeredByLAN: triggeredByLAN)
ConnectionStore.shared.appendHistoryEntry(entry)
let entry = BackupHistoryEntry(result: result, nasHost: host, triggeredByLAN: triggeredByLAN)
store.appendHistoryEntry(entry)
// 6. Push notification
await sendCompletionNotification(result: result)
return result
}
// Returns the Tailscale host when outside the trusted network and tunnel is up,
// otherwise falls back to the saved local host.
private func resolveHost(connection: NASConnection, store: ConnectionStore, lan: LANMonitor) -> String {
let onTrustedLAN = store.trustedSSIDs.contains(lan.currentSSID ?? "")
guard !onTrustedLAN,
store.useTailscaleWhenRemote,
!store.tailscaleHost.isEmpty,
lan.isTailscaleActive else {
return connection.host
}
return store.tailscaleHost
}
func cancel() {
isCancelled = true
job.cancel()
}
func pause() { job.pause() }
func pause() { job.pause() }
func resume() { job.resume() }
private func sendCompletionNotification(result: BackupResult) async {