Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
51682a901d | ||
|
|
15eb8d3c74 | ||
|
|
f2bba2914e | ||
|
|
49ae712f5e | ||
|
|
ff5f04e9a1 | ||
|
|
faaec5365f | ||
|
|
722b66f7b1 | ||
|
|
dd0c27035a | ||
|
|
b1400e399f | ||
|
|
44a23c3632 | ||
|
|
eee2730fbe | ||
|
|
be38f24f32 | ||
|
|
bcc18a7060 | ||
|
|
453aff983a | ||
|
|
f78ceb7e8b |
@@ -8,7 +8,9 @@ lib/
|
||||
# MainShellView (bottom-nav shell), share-intent listener
|
||||
models/ # plain data classes (NextcloudItem, NextcloudShare,
|
||||
# SavedAccount, AppTab, ...)
|
||||
providers/ # ServerProvider — the single app-wide ChangeNotifier
|
||||
providers/ # per-domain ChangeNotifiers (SessionController,
|
||||
# FilesController, PhotosController, ...) plus
|
||||
# ItemOperations, a plain cross-domain coordinator
|
||||
services/ # network/IO: NextcloudService, LoginFlowService,
|
||||
# AccountStore, AppLockService
|
||||
theme/ # AppTheme (Material 3 ThemeData)
|
||||
@@ -23,103 +25,250 @@ lib/
|
||||
`views/` files are screens routed to directly (a tab, or pushed via
|
||||
`Navigator`). `widgets/` files are building blocks used by more than one
|
||||
view (or complex enough to warrant their own file) — nothing in `widgets/`
|
||||
owns app state itself; it reads it from the `ServerProvider` passed down or
|
||||
read via `context.watch`/`context.read`.
|
||||
owns app state itself; it reads whichever controller(s) it needs via
|
||||
`context.watch`/`context.read`.
|
||||
|
||||
## State management
|
||||
|
||||
There is exactly one `ChangeNotifier`: [`ServerProvider`](../../lib/providers/server_provider.dart)
|
||||
(~1500 lines). It is created once in `main()` and provided at the root with
|
||||
`provider`'s `ChangeNotifierProvider`. It owns:
|
||||
State used to live in one 2300+ line `ServerProvider` god object. It's now
|
||||
split into ten focused `ChangeNotifier`s plus one plain coordinator, all
|
||||
registered in `main()`'s `MultiProvider` in dependency order (later
|
||||
providers read earlier ones via `context.read` in their `create` callback —
|
||||
safe since none of these providers are ever recreated for the app's
|
||||
lifetime; account switching is internal state on `SessionController`, not a
|
||||
new provider instance):
|
||||
|
||||
- **Multi-account state**: the list of saved accounts (`accounts`), which one
|
||||
is active (`activeAccountId`/`activeAccount`), and a `_sessionGeneration`
|
||||
counter incremented on every account switch so an in-flight fetch from the
|
||||
account just left can recognize it's stale and discard its result instead
|
||||
of writing into the newly-active account's state — every method that
|
||||
writes fetched data into a shared field (`refreshData`, `fetchAllMedia`,
|
||||
`fetchTrash`, `fetchShares`, `fetchRecent`,
|
||||
`_applyCredentialsForAccount`) captures the generation at entry and checks
|
||||
it before each write. See `server.md` for the full account-switch/storage
|
||||
story.
|
||||
- auth/session state for whichever account is active (`isLoggedIn`,
|
||||
`isRestoringSession`, login-flow status)
|
||||
- the active `NextcloudService` instance (null until logged in)
|
||||
- all fetched data, scoped to the active account (`items`, `quota`,
|
||||
`activities`, `photoItems`, `trashItems`, `shares`, `recentItems`) — all
|
||||
torn down and refetched fresh on every account switch (no simultaneous
|
||||
multi-account state; only one account's content is ever live in memory)
|
||||
- navigation-within-files state (`currentFolderPath`, `pathStack`), plus an
|
||||
in-memory `_directoryCache` keyed by folder path (see `CachePolicy`)
|
||||
- UI settings that persist across launches — split into **global** (theme
|
||||
mode, seed color, dynamic-color toggle, bottom-bar opacity/blur,
|
||||
tap-tab-to-scroll-top, seek bar style, tab order/visibility/default, swipe
|
||||
actions, login lock — see below) and **per-account** (grid/list view,
|
||||
favorites-only, show-hidden, storage scope, Photos sort, Files'
|
||||
per-folder sort map, cache policy) — see `server.md` for exactly which is
|
||||
which and why
|
||||
- **Login lock** (`loginLockEnabled`/`lockAccountSwitching`/
|
||||
`lockHiddenFiles`/`needsUnlock`): an app-wide PIN/biometric gate via
|
||||
`AppLockService` (a thin wrapper over `local_auth` — this app never
|
||||
stores or hashes a PIN itself, it delegates entirely to whatever
|
||||
credential the OS already has configured). `needsUnlock` is
|
||||
`loginLockEnabled && !_isUnlocked`, where `_isUnlocked` is transient
|
||||
(never persisted) and reset to `false` on every backgrounding
|
||||
(`didChangeAppLifecycleState`, `AppLifecycleState.paused`) so the lock has
|
||||
real value rather than only firing once per cold start. `switchAccount`/
|
||||
`cycleToNextAccount`/`cycleToPreviousAccount` and *enabling* (not
|
||||
disabling) `showHiddenFiles`/`showHiddenPhotos` each call the shared
|
||||
`_passGate` helper, which no-ops unless both `loginLockEnabled` and the
|
||||
relevant per-feature toggle are on.
|
||||
- [`SessionController`](../../lib/providers/session_controller.dart) — the
|
||||
foundation everything else depends on. Owns multi-account state (the
|
||||
saved-accounts list, which one is active, `sessionGeneration` — see
|
||||
below), auth/login-flow state (`isLoggedIn`, `isRestoringSession`,
|
||||
`loginFlowStatus`), the active `NextcloudService` instance, and login lock
|
||||
(`loginLockEnabled`/`lockAccountSwitching`/`lockHiddenFiles`/
|
||||
`needsUnlock`/`passGate`). Exposes `addAccountClearedListener`/
|
||||
`addAccountActivatedListener` (plain `List<VoidCallback>`) so sibling
|
||||
controllers — constructed after `SessionController` and unable to hold a
|
||||
forward reference to it — can react to login/logout/account-switch
|
||||
without a circular dependency.
|
||||
- [`SettingsController`](../../lib/providers/settings_controller.dart) —
|
||||
global UI prefs independent of login state: theme mode/seed color/dynamic
|
||||
color, bottom-bar opacity/blur, tap-tab-to-scroll-top, seek bar style, tab
|
||||
order/visibility/default (`requestedTab`/`requestTab`/
|
||||
`consumeRequestedTab`), swipe actions.
|
||||
- [`FilesController`](../../lib/providers/files_controller.dart) — the
|
||||
Files tab: `items`/`currentFolderPath`/`pathStack`, the in-memory
|
||||
`_directoryCache` (see `CachePolicy`), per-account display prefs
|
||||
(grid/list, hidden files, storage scope, sort field/order, per-folder
|
||||
sort map), and the shared `applyCommonFilters`/`applyFilesDisplayPrefs`
|
||||
helpers Photos/Favorites reuse rather than duplicating the same
|
||||
filter/sort logic. `refreshData` refreshes **in place** when a listing is
|
||||
already on screen (pull-to-refresh, periodic refresh, post-mutation): no
|
||||
spinner, the list is swapped once the server answers, and a failed
|
||||
refresh keeps the old list. The spinner/error page only appear when there
|
||||
is nothing to show (first load, `_navigateTo` clears the outgoing folder
|
||||
first, retry after an error). Keep that invariant - blanking the list to
|
||||
a spinner made refreshes look like files vanishing and reappearing.
|
||||
- [`PhotosController`](../../lib/providers/photos_controller.dart) /
|
||||
[`FavoritesController`](../../lib/providers/favorites_controller.dart) —
|
||||
each depends on `FilesController` for the shared storage-scope toggle and
|
||||
display-prefs helpers, but owns its own account-wide item list and
|
||||
independent favorites-only/hidden/sort state.
|
||||
- [`TrashController`](../../lib/providers/trash_controller.dart) /
|
||||
[`SharesController`](../../lib/providers/shares_controller.dart) /
|
||||
[`RecentController`](../../lib/providers/recent_controller.dart) — one
|
||||
per remaining tab, each just `items`/`isLoading`/`errorMessage` plus that
|
||||
tab's own fetch/mutate methods. All three (plus Photos/Favorites) share
|
||||
one shape: capture `session.sessionGeneration` at fetch entry, set
|
||||
loading/clear error, fetch, check the generation before writing the
|
||||
result, `notifyListeners()`.
|
||||
- [`SyncStatusController`](../../lib/providers/sync_status_controller.dart)
|
||||
— device-sync settings and live status (`syncStatusFor(item)`,
|
||||
`syncHeaderStatus`, conflicts), subscribed to `SyncService`'s status
|
||||
stream directly rather than living inside the same object as the item
|
||||
lists it decorates. Depends on `FilesController` (declared before it in
|
||||
`main()`) because synced files refresh by the Files Cache rule - it owns
|
||||
the foreground timer/resume/pull triggers and background scheduling; see
|
||||
`server.md`'s "Keeping synced files current automatically".
|
||||
- [`PickController`](../../lib/providers/pick_controller.dart) — "being
|
||||
picked by another app" state (`pickRequest`/`isPicking`/`confirmPick`/
|
||||
`itemMatchesPickFilter`) — see `server.md`.
|
||||
- [`FolderBrowser`](../../lib/providers/folder_browser.dart) — the small
|
||||
interface (`pathStack`/`currentFolderPath`/`items`/`isLoading`/
|
||||
`errorMessage`/navigation/`reload`) `FilesView` needs from whatever
|
||||
supplies its folder. `FilesController` (server) and `OfflineController`
|
||||
(local mirror) both implement it, which is what lets the Offline tab be
|
||||
`FilesView(offline: true)` - literally the Files tab over the device-sync
|
||||
mirror, not a second view. `offline` only swaps the data source, reads
|
||||
images from the local file (`localFileFor`) instead of a server preview,
|
||||
and turns off what needs the server: selection and bulk actions, swipe
|
||||
actions, sync badges, "+" (replaced by "Manage synced folders"), pick
|
||||
mode. The two `FilesView`s are keyed in `buildAppTabView` so the
|
||||
`IndexedStack` never hands one's State to the other.
|
||||
- [`OfflineController`](../../lib/providers/offline_controller.dart) — the
|
||||
Files tab's folder listing read from local storage instead of the
|
||||
server. Owns no display prefs: `items` runs the
|
||||
listing through `FilesController.applyFilesDisplayPrefs` (hidden files,
|
||||
files/folders filter, per-folder sort keyed by the same remote path,
|
||||
minus the cloud/external scope) and `FilesView` reads grid/list from
|
||||
`FilesController`, so both tabs share one set of controls
|
||||
(`FilesControlsRow`). `FilesController` restores those prefs on the
|
||||
account-*ready* event too (memoized `_restoreDisplayPrefs`) so they apply
|
||||
offline. Refreshed (see `server.md`'s "Device sync" section) automatically whenever a sync pass
|
||||
finishes. Listens for `SessionController.addAccountReadyListener`, not
|
||||
`addAccountActivatedListener` - its work is local-only, so it's safe to
|
||||
run even on a provisional/offline login (see `ConnectivityController`
|
||||
below). Registered with `lazy: false` in `main.dart` (as is
|
||||
`SyncStatusController`) - the ready event fires once at startup, before
|
||||
any widget reads a lazily-created provider, so a lazy one would register
|
||||
its listener too late and never load its persisted state.
|
||||
- [`ConnectivityController`](../../lib/providers/connectivity_controller.dart)
|
||||
— wraps `connectivity_plus`, exposing just `isOffline`. The one thing
|
||||
every network-touching controller (indirectly, via `SessionController`)
|
||||
and `MainShellView` consult before making a request or deciding what to
|
||||
show - see `server.md`'s "Working offline" section.
|
||||
- [`ItemOperations`](../../lib/providers/item_operations.dart) — not a
|
||||
`ChangeNotifier`; a plain, `const`-constructible class holding direct
|
||||
references to `SessionController`/`FilesController`/`PhotosController`/
|
||||
`FavoritesController`. The one place that knows how a mutation
|
||||
(delete/rename/move/copy/favorite-toggle/create-folder) ripples across
|
||||
those three tabs' independent item lists — deliberately direct
|
||||
references rather than a generic event bus, so a caller can `await` a
|
||||
mutation and know every affected list has already been reconciled by the
|
||||
time it returns, the same guarantee the old god object gave for free.
|
||||
Also home to the file-details sheet's per-item pass-throughs
|
||||
(shares/activity/versions/restore) — stateless, so they don't need a
|
||||
controller of their own.
|
||||
|
||||
New **global** state belongs on `ServerProvider` as a private field + getter
|
||||
+ a method that mutates it, calls `notifyListeners()`, and persists via
|
||||
`_prefsFuture`. New **per-account** state follows the same shape but
|
||||
persists through `_persistAccountPref` (namespaces the pref key under
|
||||
`sessionGeneration` (on `SessionController`, read by every other
|
||||
controller) is incremented on every account switch so an in-flight fetch
|
||||
from the account just left can recognize it's stale and discard its result
|
||||
instead of writing into the newly-active account's state — see `server.md`
|
||||
for the full account-switch/storage story.
|
||||
|
||||
New **global** state belongs on `SettingsController` as a private field +
|
||||
getter + a method that mutates it, calls `notifyListeners()`, and persists
|
||||
via its own prefs future. New **per-account** state follows the same shape
|
||||
on whichever controller owns that domain, but persists through
|
||||
`_persistAccountPref` (namespaces the pref key under
|
||||
`acct_<activeAccountId>_...` via `AccountStore.accountPrefKey`) and must be
|
||||
reset/reloaded in `_applyAccountPrefs` so it's correct after a switch.
|
||||
Screen-local state (e.g. a `TextEditingController`, an expanded/collapsed
|
||||
flag) stays in that view's own `State` class — see `standards.md` for the
|
||||
split.
|
||||
reset/reloaded on `SessionController`'s account-activated listener so it's
|
||||
correct after a switch. Screen-local state (e.g. a `TextEditingController`,
|
||||
an expanded/collapsed flag) stays in that view's own `State` class — see
|
||||
`standards.md` for the split.
|
||||
|
||||
There's no separate repository/data layer: views call `ServerProvider`
|
||||
methods directly, which call `NextcloudService`/`LoginFlowService`/
|
||||
`AccountStore`/`AppLockService`.
|
||||
There's no separate repository/data layer: views call controller methods
|
||||
directly, which call `NextcloudService`/`LoginFlowService`/`AccountStore`/
|
||||
`AppLockService`.
|
||||
|
||||
## Navigation / screen flow
|
||||
|
||||
`main.dart`'s `NextcloudApp` picks the app's `home` screen from provider
|
||||
state, no named routes:
|
||||
`main.dart`'s `NextcloudApp` picks the app's `home` screen from
|
||||
`SessionController` state, no named routes:
|
||||
|
||||
- `provider.isRestoringSession` → `_SplashView` (monochrome app icon,
|
||||
- `session.isRestoringSession` → `_SplashView` (monochrome app icon,
|
||||
tinted via `ColorFiltered` to the theme's `onSurface` so it works in both
|
||||
light/dark, plus a small spinner, while `flutter_secure_storage`/
|
||||
`shared_preferences` are read on startup)
|
||||
- else `!provider.isLoggedIn` → `LoginView` (server-address entry + Login
|
||||
- else `!session.isLoggedIn` → `LoginView` (server-address entry + Login
|
||||
Flow v2) — `isLoggedIn` is only ever false here or after the last saved
|
||||
account is removed; switching between multiple saved accounts never
|
||||
routes through this screen (see `server.md`)
|
||||
- else `provider.needsUnlock` → `LockScreenView` (login lock — see above)
|
||||
- else `session.needsUnlock` → `LockScreenView` (login lock — see above)
|
||||
- else `MainShellView`
|
||||
|
||||
`MainShellView` is a bottom-nav `IndexedStack` over up to 6 tabs — Files,
|
||||
Photos, Activity, Trash, Shares, Recent — user-configurable (order,
|
||||
visibility up to `maxVisibleTabs`, default tab) via `AppTab`/`ServerProvider`
|
||||
and rendered through `buildAppTabView` (`widgets/app_tab_view_builder.dart`).
|
||||
`MainShellView` is a bottom-nav `IndexedStack` over up to 8 tabs — Files,
|
||||
Photos, Favorites, Activity, Trash, Shares, Recent, Offline — user-configurable
|
||||
(order, visibility up to `maxVisibleTabs`, default tab) via
|
||||
`AppTab`/`SettingsController` and rendered through `buildAppTabView`
|
||||
(`widgets/app_tab_view_builder.dart`). `maxVisibleTabs` (5) is less than the
|
||||
total tab count, and `SettingsController._enforceMaxVisibleTabs` already
|
||||
auto-hides overflow on load (fresh install, or - as when Favorites was
|
||||
added - an existing saved tab order from before a new tab existed), so
|
||||
adding a tab to the `AppTab` enum needs no extra migration.
|
||||
Each tab keeps its own `ScrollController` (survives tab switches via
|
||||
`IndexedStack`'s built-but-hidden trees) and tapping the already-active tab
|
||||
scrolls it back to top (`tapTabToScrollTop` setting). `MainShellView` also
|
||||
owns the app's share-intent listener (`receive_sharing_intent`): both
|
||||
`getInitialMedia()` (cold start via another app's "Share to...") and
|
||||
`getMediaStream()` (already running) push `ShareUploadView`.
|
||||
owns the app's share-intent listener (`ShareIntentService`, backed by
|
||||
hand-rolled native handling in `MainActivity.kt` - see `server.md` for why
|
||||
this isn't the `receive_sharing_intent` plugin): both `getInitialShare()`
|
||||
(cold start via another app's "Share to...") and `onNewShare` (already
|
||||
running) push `ShareUploadView`. `FilesView`'s own "+" → "Upload File"
|
||||
(`_pickAndUploadFile`) reaches the exact same `ShareUploadView` screen
|
||||
through the same `SharedFileRef`-based path (wrapping `file_picker`'s
|
||||
result `Uri`s instead of a share intent's) rather than a separate
|
||||
in-app-only upload, so both entry points get the same destination picker
|
||||
and the same durable background-service upload. It similarly owns the pick-intent listener
|
||||
(`PickIntentService` - see `server.md` for the full "being picked by
|
||||
another app" story) that feeds `PickController.pickRequest`; while
|
||||
`isPicking`, the visible tab list is overridden to just Files and Photos
|
||||
regardless of the user's own hidden/reordered tab settings, since those
|
||||
are the only two views that know how to handle a picking-mode tap and the
|
||||
only two that make sense as external "choose a file" sources. The same
|
||||
override mechanism restricts the visible tabs to just Offline while
|
||||
`ConnectivityController.isOffline` - see `server.md`'s "Working offline"
|
||||
section for the full story, including why session restore itself has to
|
||||
avoid making a network request in that case. `MoreTabsButton` hides
|
||||
entirely in both cases (picking, offline) for the same reason - there's
|
||||
nothing it could usefully open.
|
||||
`MainShellView` also fires a one-time notification-permission prompt on
|
||||
its first mount (`_maybeRequestNotificationPermission`, gated by a plain
|
||||
`shared_preferences` flag so it only ever asks once, not on every
|
||||
launch): a plain-language `AlertDialog` explaining why Noo wants it
|
||||
(upload/download progress notifications - see `ShareUploadService.kt`/
|
||||
`DownloadService.kt`) before the OS's own `permission_handler`-driven
|
||||
`Permission.notification.request()`, since the bare system prompt gives
|
||||
no context on its own.
|
||||
|
||||
Five of the six tabs (all but Files) plus each tab's own controls share
|
||||
`FloatingBottomNavBar` (`widgets/floating_bottom_bar.dart`) wraps its
|
||||
pill's item row in a horizontal `SingleChildScrollView` rather than a
|
||||
plain `Row`, so a wide selected-item label plus several icon-only tabs
|
||||
scrolls instead of overflowing on narrower screens.
|
||||
|
||||
All eight tabs, plus `ShareUploadView` (the share-to-upload destination
|
||||
picker, pushed rather than a tab - see below), share
|
||||
[`SyncedHeaderScaffold`](../../lib/widgets/synced_header_scaffold.dart) — a
|
||||
`CustomScrollView` with a pull-down "sync status" header (Google
|
||||
Photos-style) and a classic Material refresh spinner shown during a
|
||||
pull-triggered sync. `SearchView`, `AccountView` (Settings), the
|
||||
file-details sheet, the share sheet, and `ShareUploadView` (the
|
||||
share-to-upload destination picker) are pushed on top via
|
||||
pull-triggered sync. `ShareUploadView` mirrors the Files tab's own
|
||||
controls-row/breadcrumbs sticky header almost exactly, so arriving via
|
||||
another app's "Share to..." sheet still lands on the same top chrome
|
||||
instead of a plain `AppBar` - its `actions` are `[ProfileAvatarButton()]`
|
||||
only (no `MoreTabsButton`: there's nowhere useful for it to go mid-upload,
|
||||
since jumping to another tab would abandon the destination picker);
|
||||
backing out is the system back gesture/button, not a bespoke close icon in
|
||||
the app bar. Its bottom action - "Upload to
|
||||
{folder}" - and the uploading-file-name summary above it (single line,
|
||||
auto-scrolling via `MarqueeTitle` if it doesn't fit) live together in one
|
||||
rounded-top, elevated `Material` bar as `bottomNavigationBar`, reading as a
|
||||
sheet peeking up from the bottom edge rather than a plain flat bar.
|
||||
[`MarqueeTitle`](../../lib/widgets/marquee_title.dart) (`package:marquee`) is
|
||||
shared with `FileViewerScreen`'s title - falls back to a plain ellipsized
|
||||
`Text` when the content already fits, so short text never marquees.
|
||||
|
||||
The Move/Copy destination picker
|
||||
([`MoveCopyDestinationPicker`](../../lib/views/move_copy_destination_picker.dart),
|
||||
pushed from Files/Photos' selection toolbar - see `server.md` for the
|
||||
backend side) visually mirrors `ShareUploadView`'s browser the same way,
|
||||
but is a deliberately different case for state: it does **not** reuse
|
||||
`FilesController`'s shared `currentFolderPath`/`pathStack`/`items`, and
|
||||
owns its own local navigation state instead, fetching through the
|
||||
stateless `FilesController.fetchFolderListing`/`applyFilesDisplayPrefs`
|
||||
pair. `ShareUploadView` can get away with hijacking the shared state
|
||||
because it always resets to root on entry and pops all the way to the
|
||||
app's root route on completion - fine for a cold share-intent launch with
|
||||
no prior browsing session to preserve. The Move/Copy picker is pushed
|
||||
*while the user is actively browsing a specific Files-tab folder*, so
|
||||
reusing the shared state would strand that folder's `pathStack` under it;
|
||||
its local state means popping back always lands the user exactly where
|
||||
they were, untouched.
|
||||
`SearchView`, `AccountView` (Settings), the file-details sheet, and the
|
||||
share sheet are pushed on top via
|
||||
`Navigator`/`showModalBottomSheet`/`showGradualBottomSheet` rather than
|
||||
being tabs. `ProfileAvatarButton` (top-right on every tab) opens Settings on
|
||||
tap and cycles between saved accounts on a vertical swipe.
|
||||
|
||||
Files and Photos (the two tabs with multi-select) pass their selection
|
||||
toolbar into `SyncedHeaderScaffold`'s `selectionBar` param rather than
|
||||
rendering it as a second sliver app bar inside their own content: while
|
||||
non-null, it fully takes over the pinned top bar in place of the
|
||||
sync-status chip/`actions`/pull-to-reveal quota panel, so selecting reads
|
||||
as replacing the whole top chrome rather than adding a strip beneath it.
|
||||
|
||||
|
After Width: | Height: | Size: 27 KiB |
@@ -0,0 +1,305 @@
|
||||
# Noo Design System
|
||||
|
||||
Noo is a Nextcloud client for iOS, Android, macOS and Windows. ("Noo" is a placeholder name.)
|
||||
Its visual language is warm neutrals with one violet accent, flat surfaces, pill-shaped controls, and no gradients.
|
||||
|
||||
**Platform rule:** keep one visual language everywhere. Adapt only the navigation chrome (status bar, top bar, bottom bar, window controls) to each platform. Content components look the same on every platform.
|
||||
|
||||
Reference files in this project:
|
||||
- `Noo Screens.dc.html` has every screen on every platform, in light and dark.
|
||||
- `Noo Design System.dc.html` is the visual component sheet.
|
||||
- `noo-kit.js` holds the tokens (`TH`), the icon set (`SVG`/`ic`), file-type mapping (`KIND`) and mock data.
|
||||
- `Mobile Screen.dc.html` and `Desktop Screen.dc.html` are the reference builds for each screen.
|
||||
|
||||
---
|
||||
|
||||
## 1. Tokens
|
||||
|
||||
### 1.1 Color (semantic). Use these names in code.
|
||||
|
||||
| Token | Role | Light | Dark |
|
||||
|---|---|---|---|
|
||||
| `bg` | App background, desktop sidebar | `#F3EFE6` warm off-white | `#0E0D0B` |
|
||||
| `surface` (`sf`) | Cards, rows, bars, sheets, desktop main pane | `#FFFFFF` | `#25241F` |
|
||||
| `surface-2` (`sf2`) | Inputs, inset panels, secondary buttons | `#F6F5F2` | `#3D3C38` |
|
||||
| `surface-3` (`sf3`) | Progress tracks, toggle off, grabbers | `#EAE8E2` | `#5A5852` |
|
||||
| `line` (`ln`) | Dividers, 1px borders | `#EAE8E2` | `#3D3C38` |
|
||||
| `fg-1` | Primary text | `#0E0D0B` | `#F3EFE6` |
|
||||
| `fg-2` | Secondary text, idle icons | `#5A5852` | `#BDBAB1` |
|
||||
| `fg-3` | Meta text, placeholders, trailing icons | `#7C7A72` | `#9E9B92` |
|
||||
| `accent` (`ac`) | Primary fills (buttons, FAB, toggle on, progress) | `#8D0DE3` | `#8D0DE3` |
|
||||
| `accent-text` (`act`) | Accent text and icons, active nav | `#8D0DE3` | `#CBA5FD` |
|
||||
| `accent-soft` (`acs`) | Selected and active backgrounds, tonal buttons | `#ECDFFF` | `#2F0454` |
|
||||
| `danger` / `danger-soft` | Destructive text / bg | `#A8202A` / `#FDE7E7` | `#F49E9E` / `#560F18` |
|
||||
| `danger-fill` | Swipe-delete background (white text) | `#A8202A` | `#A8202A` |
|
||||
| `success` / `success-soft` | Synced, connected | `#3E7A23` / `#EAF5DF` | `#B7DD9F` / `#1E3F10` |
|
||||
| `warning` / `warning-soft` | Video file type | `#8C5A0E` / `#FBEFD0` | `#F0C26C` / `#4A3208` |
|
||||
| `info` / `info-soft` | Docs, images | `#2940A8` / `#E6ECFE` | `#B6C3FB` / `#1C2B73` |
|
||||
| `scrim` | Behind sheets, drawers, dialogs | `rgba(14,13,11,.45)` | `rgba(0,0,0,.6)` |
|
||||
|
||||
Rules:
|
||||
- Text on `accent` is always `#FFFFFF`. Accent-colored text uses `accent-text`, never `accent` in dark mode.
|
||||
- On-color text always uses the matching pair: `accent-text` on `accent-soft`, `danger` on `danger-soft`, and so on.
|
||||
- Don't use gradients. Don't add new colors. Avatar and photo placeholder fills use the secondary palette: `#8DCDE2 #96B0FD #E5D8BD #EEEDB3 #DA9AC7 #A7D296 #E9A6A7 #85D1BD #CBA5FD`, always with `#0E0D0B` text.
|
||||
|
||||
### 1.2 File-type tiles (`KIND`)
|
||||
| Kind | Background | Icon color | Lucide icon |
|
||||
|---|---|---|---|
|
||||
| folder | accent-soft | accent-text | `folder` |
|
||||
| pdf | danger-soft | danger | `file-text` |
|
||||
| doc / text | info-soft | info | `file-text` |
|
||||
| sheet | success-soft | success | `sheet` |
|
||||
| video | warning-soft | warning | `film` |
|
||||
| image | info-soft | info | `image` |
|
||||
| archive | surface-3 | fg-2 | `file-archive` |
|
||||
|
||||
Tile sizes: 40px/r12 for mobile rows, 30px/r9 for desktop rows, 44px/r12 for the share header, 32px/r10 for activity. The icon is half the tile size (20, 16, 24, 16).
|
||||
|
||||
### 1.3 Typography
|
||||
Fonts (Google Fonts): **Schibsted Grotesk** for headings (weights 500/600) and **Instrument Sans** for UI (weights 400/500/600). Load them with `https://fonts.googleapis.com/css2?family=Instrument+Sans:wght@400;500;600&family=Schibsted+Grotesk:wght@500;600&display=swap`. Don't use italics, all-caps or wide tracking.
|
||||
|
||||
| Style | Font | Size / line-height | Tracking | Use |
|
||||
|---|---|---|---|---|
|
||||
| Large title | Schibsted 600 | 34 / 0.9 | −3% | iOS large title |
|
||||
| Stat | Schibsted 600 | 32 (mobile) · 28 (desktop) / 0.9 | −3% | Offline GB, counters |
|
||||
| Title | Schibsted 500 | 22 / 1 | −2% | Android top bar, desktop toolbar |
|
||||
| Card title | Schibsted 500 | 17–20 / 1 | −2% | Settings cards, sheet sections, account name |
|
||||
| Group heading | Schibsted 500 | 18 / 1 | −2% | Photos month |
|
||||
| Body L | Instrument 400/500 | 16 / 1.2 | 0 | Mobile row title, settings label |
|
||||
| Body | Instrument 400/500 | 14–15 / 1.3 | 0 | Desktop rows, activity text, banners |
|
||||
| Label | Instrument 600 | 13 / 1 | 0 | Section labels (fg-2), chips, table headers (12, fg-3) |
|
||||
| Meta | Instrument 400 | 13 (mobile) · 12–13 (desktop) / 1.2 | 0 | Size · date, subtitles (fg-3) |
|
||||
| Nav label | Instrument 500 / 600 (active) | 12 Android · 10 iOS | 0 | Bottom bars |
|
||||
| Button | Instrument 600 | 14–16 / 1 | 0 | All buttons |
|
||||
| Mono | ui-monospace 400 | 13–14 | 0 | Share URLs, local paths |
|
||||
|
||||
### 1.4 Space, radius, elevation, motion
|
||||
- **Spacing** uses a 4px base: 4, 8, 12, 14, 16, 20, 24, 32. Mobile screen gutter is **12px** (cards) and 16px (bars). Desktop content gutter is **24px**.
|
||||
- **Radius:**
|
||||
- pills (`999px`) for every button, chip, segmented control, toggle, search field and badge
|
||||
- 20px for cards and grouped lists
|
||||
- 18px for grid cards and stat cards
|
||||
- 14px for inputs and inset panels
|
||||
- 12px for desktop sidebar items and selected table rows
|
||||
- 28px for the sheet top and drawer edge
|
||||
- 24px for desktop dialogs
|
||||
- screen corners are 48 on iOS and 36 on Android
|
||||
- **Elevation:** product UI is flat, with no shadows on buttons or cards. The only shadow is `0 24px 48px rgba(30,0,47,.14)`, and only on floating desktop dialogs. Separate things by surface color, not by shadow.
|
||||
- **Motion:** use `cubic-bezier(.7,0,.15,1)` with durations of 180, 280 and 480ms. Nothing bounces. Pressing a button scales it to 0.98.
|
||||
|
||||
### 1.5 Icons
|
||||
Use **Lucide** (pinned to `lucide-static@0.460.0`) at a 1.8 stroke. Sizes are 14, 16, 18, 20, 24 and 32. Icons render in the current text color. Tab icons: Files `folder`, Photos `images`, Favorites `star`, Offline `hard-drive-download`, Shares `share-2`, Recent `clock`, Activity `activity`, Trash `trash-2`, Settings `settings`.
|
||||
|
||||
---
|
||||
|
||||
## 2. Components
|
||||
|
||||
**Button**
|
||||
- Always a pill. Heights: 52 (sheet CTA), 44 (mobile card), 40 (inline in a field), 36 (desktop toolbar), 28–32 (compact).
|
||||
- Variants:
|
||||
- *Primary*: accent fill, white text.
|
||||
- *Tonal*: accent-soft fill, accent-text.
|
||||
- *Secondary*: surface-2 fill, fg-1.
|
||||
- *Danger*: danger-soft fill, danger text.
|
||||
- *Outline*: 1.5px surface-3 border.
|
||||
- An icon goes on the left, with a 6–10px gap.
|
||||
|
||||
**FAB** (Android only)
|
||||
- An extended pill: 56px tall, accent fill, labelled "Upload".
|
||||
- Sits 16px from the right and bottom edges of the content area.
|
||||
- Shows only on Files and Photos.
|
||||
|
||||
**Chip**
|
||||
- A pill, 32–34px tall, 12px horizontal padding, Label 13–14.
|
||||
- Idle: surface fill on mobile, or a 1px line border on desktop.
|
||||
- Selected: accent-soft fill with accent-text.
|
||||
- A trailing `chevron-down` means it opens a menu. A trailing `x` means it's an active filter.
|
||||
|
||||
**Segmented control**
|
||||
- A pill track (surface or surface-2) with 3px padding.
|
||||
- The active segment gets an accent-soft fill with accent-text at weight 600. Idle segments use fg-2 at weight 500.
|
||||
- Use it for the List/Grid toggle (icons only, 36×28), Shares scope, Theme, and default view.
|
||||
|
||||
**Toggle**
|
||||
- 48×28 on mobile, 44×26 on desktop, with a white knob 3px inset.
|
||||
- On: accent track. Off: surface-3 track. It looks the same on every platform.
|
||||
|
||||
**Search field**
|
||||
- A pill (radius 12 on the iOS inline field), 36–38px tall.
|
||||
- Surface fill on bg, or surface-2 fill on surface. Leading search icon and placeholder in fg-3.
|
||||
- Placement:
|
||||
- iOS: below the large title.
|
||||
- Android: an icon in the top bar that expands.
|
||||
- Desktop: 260px wide in the toolbar.
|
||||
|
||||
**Grouped list (card)**
|
||||
- A surface card with radius 20 and 1px gaps showing `line`, which draws the dividers.
|
||||
- An optional group label above it: 13/600 in fg-2, inset 8px.
|
||||
- Each group is 18px from the next.
|
||||
|
||||
**File row**
|
||||
- Mobile: 64px tall.
|
||||
- Left to right: tile 40, then a column with the name (16/500, one line, ellipsis) above a meta line (13, fg-3), then optional trailing icons, then the overflow menu (`ellipsis` on iOS, `ellipsis-vertical` on Android).
|
||||
- The meta line is `[status icon][shared icon] size · modified`.
|
||||
- A favorite shows an accent-text star before the overflow menu.
|
||||
- Trailing icon by screen: star in Favorites, `rotate-ccw` in Trash.
|
||||
- Desktop: a table row 52px tall.
|
||||
- Columns are `minmax(0,1fr) 180px 160px 120px`: Name, two data columns, then status icons and the overflow menu.
|
||||
- The header row is 36px, 12/600 in fg-3, with a sort arrow on the active column.
|
||||
- A selected row gets an accent-soft fill with radius 12.
|
||||
|
||||
**Status icons (14px)**
|
||||
- Synced: `circle-check` in success.
|
||||
- Syncing: `refresh-cw` in accent-text.
|
||||
- Error: `circle-alert` in danger, and the meta text says what to do ("Couldn't sync · Tap to retry").
|
||||
- Shared: `users` in fg-3.
|
||||
|
||||
**Swipe action**
|
||||
- The row slides and uncovers a 96px action block. Delete is white on danger-fill; Favorite is white on accent.
|
||||
- The block has a 20px icon above a 12/600 label.
|
||||
- Swipe actions are set in Settings → Swipe on a file.
|
||||
|
||||
**Grid card**
|
||||
- Surface fill, radius 18. Mobile uses 2 columns with a 10px gap; desktop uses 5 columns with a 16px gap.
|
||||
- The thumbnail area is 104–118px tall, filled with the file-type soft color and a 32px icon. Real thumbnails replace it when they exist.
|
||||
- Below it: the name (14/500) with an overflow menu, then the meta (12).
|
||||
|
||||
**Photo grid**
|
||||
- Square tiles with a 2px gap on mobile (3 columns, edge to edge) and a 4px gap on desktop (8 columns).
|
||||
- Tiles are grouped by month, with the group heading on the left and the count on the right.
|
||||
- Videos get a badge in the bottom-right: a `play` icon and the duration on `rgba(14,13,11,.7)`.
|
||||
|
||||
**Activity item**
|
||||
- Avatar 36 (initials on a secondary-palette color), then a sentence: **Actor** verb **object** tail.
|
||||
- Time in meta style. The file tile (32) goes on the right.
|
||||
|
||||
**Banner / summary card**
|
||||
- A surface card with radius 20 (surface-2 on desktop) and padding of 14–18.
|
||||
- Trash: an info icon, the retention text, and "Empty trash" as a danger text button.
|
||||
- Offline: the stat, a 6px progress bar, the last-sync meta, and a "Sync now" tonal button.
|
||||
|
||||
**Progress bar**
|
||||
- 6px tall pill. Surface-3 track with an accent fill.
|
||||
- Used for storage quota, cache use and the offline limit.
|
||||
|
||||
**Avatar**
|
||||
- A circle with initials, weight 600, at 0.36× the avatar size.
|
||||
- Sizes: 30–32 in bars, 36 in lists, 48 in the drawer, 52–56 on the account card.
|
||||
- The current user gets an accent-soft fill with accent-text.
|
||||
|
||||
**Settings row**
|
||||
- 52px tall, or 60px with a subtitle.
|
||||
- Left to right: an optional 20px icon in fg-2, then the label (16) with an optional subtitle (13, fg-3), then a trailing control.
|
||||
- Trailing control is one of: a toggle, a value in fg-3 with a chevron (desktop uses a 32px dropdown with radius 10), a segmented control, a pill button, or a status badge.
|
||||
- A destructive row uses danger text.
|
||||
|
||||
**Tab order row**
|
||||
- A grip icon (`grip-vertical`, fg-3), the tab icon, the label, then a pin button: a 36px circle (30 on desktop) that is accent-soft with `pin` when pinned, or surface-2 with `pin-off` when not.
|
||||
- Allow at most 5 pinned tabs.
|
||||
|
||||
**Sheet** (mobile)
|
||||
- Surface fill, radius 28 at the top. A 36×5 grabber in surface-3. Padding 20, with 22px between sections.
|
||||
- It sits on a scrim.
|
||||
|
||||
**Dialog** (desktop)
|
||||
- 540px wide, radius 24, padding 24, sitting on a scrim.
|
||||
- Header: file tile, title "Share "<name>"", and a close button (32px circle, surface-2).
|
||||
|
||||
**Drawer** (mobile)
|
||||
- 316px wide, surface fill, radius 28 on the trailing edge, on a scrim.
|
||||
- Top to bottom:
|
||||
- account block with a chevron to switch accounts
|
||||
- storage bar
|
||||
- "More" label, then the unpinned tabs as 52px pill items (icon 24, label 16/500, trailing count)
|
||||
- Settings
|
||||
- an "Edit tabs" link at the bottom, in accent-text
|
||||
|
||||
---
|
||||
|
||||
## 3. Navigation & platform mapping
|
||||
|
||||
**Tabs** (the user sets the order): Files, Photos, Favorites, Offline, Shares, Recent, Activity, Trash. Settings is always separate.
|
||||
|
||||
### Mobile
|
||||
|
||||
Mobile always has **5 pinned tabs in the bottom bar**. The rest go in the drawer, which opens from the top-left menu icon.
|
||||
|
||||
| Element | iOS | Android |
|
||||
|---|---|---|
|
||||
| Status bar | 54px, Dynamic Island | 40px |
|
||||
| Top bar | 44px row: `menu` on the left; `plus` and avatar on the right (all accent-text). Then a 34px large title, then the search field. | 64px: `menu`, 22px title, `search`, avatar |
|
||||
| Bottom bar | Surface fill, 1px top line. Icon 24 above a 10px label. Active: accent-text. Idle: fg-3. 34px home indicator below. | Surface fill, 80px. The active icon sits in a 56×32 accent-soft pill with a 12px label. 20px gesture bar below. |
|
||||
| Upload | `plus` in the nav bar | Extended FAB |
|
||||
| Overflow icon | `ellipsis` | `ellipsis-vertical` |
|
||||
| Settings | Pushed screen with a "‹ Files" back button and a large title. No bottom bar. | Pushed screen with a back arrow and a title. No bottom bar. |
|
||||
| Biometric label | "Lock with Face ID" | "Lock with fingerprint" |
|
||||
|
||||
### Desktop
|
||||
|
||||
Desktop has a 256px sidebar in `bg` and a main pane in `surface`, separated by a 1px line.
|
||||
|
||||
**Sidebar**, top to bottom:
|
||||
- account switcher card
|
||||
- the 5 pinned tabs
|
||||
- a divider
|
||||
- the remaining tabs
|
||||
- a spacer
|
||||
- the storage meter
|
||||
- Settings
|
||||
|
||||
Sidebar items are 38px tall with radius 12, an 18px icon and a 14/500 label. The active item gets an accent-soft fill with accent-text at weight 600. Counts sit on the right: Trash 12, Offline errors, new shares.
|
||||
|
||||
**Toolbar** is 64px tall:
|
||||
- the title (22px Schibsted Grotesk), with a breadcrumb in Files
|
||||
- a spacer
|
||||
- the search field
|
||||
- context actions: List/Grid toggle and Upload in Files, Upload in Photos, Empty trash in Trash, Sync now in Offline
|
||||
|
||||
| Element | macOS | Windows |
|
||||
|---|---|---|
|
||||
| Window | Radius 12 | Radius 8 |
|
||||
| Controls | Traffic lights at the top of the sidebar | 40px title bar with the app mark and name; minimize, maximize and close buttons 46px wide |
|
||||
| Navigation | Back and forward chevrons at the start of the toolbar | Not shown in the toolbar |
|
||||
| Biometric | "Touch ID" | "Windows Hello" |
|
||||
| Local path | `~/Noo/…` | `C:\Users\…\Noo` |
|
||||
| Swipe setting | "Trackpad swipe on a file" | "Touch swipe on a file" |
|
||||
|
||||
---
|
||||
|
||||
## 4. Screen recipes
|
||||
|
||||
- **Files:**
|
||||
- Toolbar: sort chip (`Name ↑`), type filter chip, List/Grid segmented toggle.
|
||||
- Desktop adds Modified and Shared filter chips, an active-filter chip, and an item count.
|
||||
- Content: a list, or a grid when the toggle is set.
|
||||
- **Photos:** type chips (All, Photos, Videos, Camera), then the photo grid grouped by month. The grid view is the only view.
|
||||
- **Favorites:** a file list with a star as the trailing icon.
|
||||
- **Offline:** a summary card (or 4 stat cards on desktop), then a list whose rows show sync status icons and status meta.
|
||||
- **Shares:** a segmented control (With you, By you, Links), then a list. The meta reads "Owner · Permission".
|
||||
- **Recent:** a list grouped into Today, Yesterday and This week. The meta is the action plus the location.
|
||||
- **Activity:** the feed grouped by day. Desktop limits it to 760px wide.
|
||||
- **Trash:** a retention banner, then a list. Mobile rows get a restore icon; desktop rows get a tonal "Restore" pill.
|
||||
- **Settings:** sections in this order:
|
||||
1. Account card
|
||||
2. Accounts (list, then "Add account")
|
||||
3. Security
|
||||
4. File sync
|
||||
5. Files cache
|
||||
6. Appearance
|
||||
7. Tabs
|
||||
8. Swipe on a file
|
||||
|
||||
Mobile uses one column of grouped lists. Desktop uses a 2-column grid of cards with a 1px line and radius 20.
|
||||
- **Share sheet / dialog:** sections in this order:
|
||||
1. Header: file tile, name, size · folder, and close.
|
||||
2. **Share with people:** an input ("Name, email or group"), then the people with access. The owner comes first; the others each have a permission pill ("Can edit ▾").
|
||||
3. **Share link:** a toggle, then the URL field in mono with a primary "Copy link" button, then option chips (permission, expiry, password, allow download).
|
||||
4. **Send file directly:** an outline button, with a caption saying that link settings don't apply.
|
||||
|
||||
---
|
||||
|
||||
## 5. Copy
|
||||
- Use plain, active and short sentences, under 15 words. Say "you".
|
||||
- Name the problem and the fix: "Couldn't sync · Tap to retry", not "An error occurred".
|
||||
- Use sentence case everywhere and no all-caps. Use a middle dot ( · ) to separate meta values.
|
||||
- Don't use emoji in the product UI.
|
||||
@@ -0,0 +1,340 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<script src="./support.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
<x-dc>
|
||||
<helmet>
|
||||
<script src="noo-kit.js"></script>
|
||||
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Instrument+Sans:wght@400;500;600&family=Schibsted+Grotesk:wght@500;600&display=swap">
|
||||
<style>
|
||||
body{margin:0}
|
||||
a{color:#8D0DE3;text-decoration:none}
|
||||
a:hover{color:#6E08B3}
|
||||
</style>
|
||||
</helmet>
|
||||
<sc-if value="{{ ready }}" hint-placeholder-val="{{ false }}">
|
||||
<div style="{{ root }}">
|
||||
|
||||
<sc-if value="{{ win }}">
|
||||
<div style="height:40px;flex:none;display:flex;align-items:center;background:var(--bg);color:var(--fg2)">
|
||||
<div style="display:flex;align-items:center;gap:10px;padding:0 16px;flex:1;font:400 12px/1 var(--ft)"><div style="width:16px;height:16px;border-radius:4px;background:var(--ac)"></div>Noo</div>
|
||||
<div style="width:46px;height:40px;display:flex;align-items:center;justify-content:center"><span style="{{ i16.minus }}"></span></div>
|
||||
<div style="width:46px;height:40px;display:flex;align-items:center;justify-content:center"><span style="{{ i14.square }}"></span></div>
|
||||
<div style="width:46px;height:40px;display:flex;align-items:center;justify-content:center"><span style="{{ i16.x }}"></span></div>
|
||||
</div>
|
||||
</sc-if>
|
||||
|
||||
<div style="flex:1;min-height:0;display:flex">
|
||||
<div style="width:256px;flex:none;background:var(--bg);display:flex;flex-direction:column;padding:12px 12px 16px;box-sizing:border-box;gap:2px">
|
||||
<sc-if value="{{ mac }}">
|
||||
<div style="height:32px;display:flex;align-items:center;gap:8px;padding:0 8px 8px"><div style="width:12px;height:12px;border-radius:999px;background:#FF5F57"></div><div style="width:12px;height:12px;border-radius:999px;background:#FEBC2E"></div><div style="width:12px;height:12px;border-radius:999px;background:#28C840"></div></div>
|
||||
</sc-if>
|
||||
<div style="display:flex;align-items:center;gap:10px;padding:8px 10px;border-radius:14px;background:var(--sf);margin-bottom:14px">
|
||||
<div style="width:32px;height:32px;border-radius:999px;background:var(--acs);color:var(--act);display:flex;align-items:center;justify-content:center;font:600 12px/1 var(--ft);flex:none">MR</div>
|
||||
<div style="flex:1;min-width:0;display:flex;flex-direction:column;gap:4px"><div style="font:600 14px/1 var(--ft)">Marina Rocha</div><div style="font:400 12px/1 var(--ft);color:var(--fg3)">cloud.rocha.family</div></div>
|
||||
<span style="{{ chevG }}"></span>
|
||||
</div>
|
||||
<sc-for list="{{ navA }}" as="n" hint-placeholder-count="5">
|
||||
<sc-if value="{{ n.on }}"><div style="height:38px;border-radius:12px;padding:0 12px;display:flex;align-items:center;gap:12px;background:var(--acs);color:var(--act);font:600 14px/1 var(--ft)"><span style="{{ n.ico }}"></span><div style="flex:1">{{ n.label }}</div><div style="font:500 12px/1 var(--ft)">{{ n.count }}</div></div></sc-if>
|
||||
<sc-if value="{{ n.off }}"><div style="height:38px;border-radius:12px;padding:0 12px;display:flex;align-items:center;gap:12px;color:var(--fg1);font:500 14px/1 var(--ft)"><span style="{{ n.icoG }}"></span><div style="flex:1">{{ n.label }}</div><div style="font:500 12px/1 var(--ft);color:var(--fg3)">{{ n.count }}</div></div></sc-if>
|
||||
</sc-for>
|
||||
<div style="height:1px;background:var(--ln);margin:8px 12px"></div>
|
||||
<sc-for list="{{ navB }}" as="n" hint-placeholder-count="3">
|
||||
<sc-if value="{{ n.on }}"><div style="height:38px;border-radius:12px;padding:0 12px;display:flex;align-items:center;gap:12px;background:var(--acs);color:var(--act);font:600 14px/1 var(--ft)"><span style="{{ n.ico }}"></span><div style="flex:1">{{ n.label }}</div><div style="font:500 12px/1 var(--ft)">{{ n.count }}</div></div></sc-if>
|
||||
<sc-if value="{{ n.off }}"><div style="height:38px;border-radius:12px;padding:0 12px;display:flex;align-items:center;gap:12px;color:var(--fg1);font:500 14px/1 var(--ft)"><span style="{{ n.icoG }}"></span><div style="flex:1">{{ n.label }}</div><div style="font:500 12px/1 var(--ft);color:var(--fg3)">{{ n.count }}</div></div></sc-if>
|
||||
</sc-for>
|
||||
<div style="flex:1"></div>
|
||||
<div style="display:flex;flex-direction:column;gap:8px;padding:12px 12px 14px">
|
||||
<div style="display:flex;justify-content:space-between;font:400 12px/1 var(--ft);color:var(--fg2)"><span style="font-weight:500;color:var(--fg1)">Storage</span><span>38.2 of 100 GB</span></div>
|
||||
<div style="height:6px;border-radius:999px;background:var(--sf3);overflow:hidden"><div style="width:38%;height:100%;background:var(--ac)"></div></div>
|
||||
</div>
|
||||
<sc-if value="{{ setOn }}"><div style="height:38px;border-radius:12px;padding:0 12px;display:flex;align-items:center;gap:12px;background:var(--acs);color:var(--act);font:600 14px/1 var(--ft)"><span style="{{ i18.settings }}"></span>Settings</div></sc-if>
|
||||
<sc-if value="{{ setOff }}"><div style="height:38px;border-radius:12px;padding:0 12px;display:flex;align-items:center;gap:12px;color:var(--fg1);font:500 14px/1 var(--ft)"><span style="{{ setIcoG }}"></span>Settings</div></sc-if>
|
||||
</div>
|
||||
|
||||
<div style="flex:1;min-width:0;background:var(--sf);display:flex;flex-direction:column;position:relative;border-left:1px solid var(--ln)">
|
||||
<div style="height:64px;flex:none;display:flex;align-items:center;gap:12px;padding:0 20px 0 24px;border-bottom:1px solid var(--ln)">
|
||||
<sc-if value="{{ mac }}"><div style="display:flex;gap:4px;color:var(--fg3);margin-right:4px"><span style="{{ i20.chevL }}"></span><span style="{{ i20.chevR }}"></span></div></sc-if>
|
||||
<div style="display:flex;align-items:center;gap:8px;font:500 22px/1 var(--fd);letter-spacing:-0.02em">{{ title }}<sc-if value="{{ s.files }}"><span style="{{ chevG }}"></span><span style="font:400 15px/1 var(--ft);letter-spacing:0;color:var(--fg2);white-space:nowrap">All files</span></sc-if></div>
|
||||
<div style="flex:1"></div>
|
||||
<sc-if value="{{ notSettings }}"><div style="width:260px;height:36px;border-radius:999px;background:var(--sf2);display:flex;align-items:center;gap:8px;padding:0 14px;color:var(--fg3);font:400 14px/1 var(--ft)"><span style="{{ i16.search }}"></span>Search in {{ title }}</div></sc-if>
|
||||
<sc-if value="{{ s.files }}">
|
||||
<div style="display:flex;padding:3px;border-radius:999px;background:var(--sf2);gap:2px"><div style="{{ segL }}"><span style="{{ i16.list }}"></span></div><div style="{{ segG }}"><span style="{{ i16.grid }}"></span></div></div>
|
||||
<div style="height:36px;padding:0 16px 0 12px;border-radius:999px;background:var(--ac);color:#FFFFFF;display:flex;align-items:center;gap:8px;font:600 14px/1 var(--ft);white-space:nowrap"><span style="{{ i18.plus }}"></span>Upload</div>
|
||||
</sc-if>
|
||||
<sc-if value="{{ s.photos }}"><div style="height:36px;padding:0 16px 0 12px;border-radius:999px;background:var(--ac);color:#FFFFFF;display:flex;align-items:center;gap:8px;font:600 14px/1 var(--ft);white-space:nowrap"><span style="{{ i18.upload }}"></span>Upload</div></sc-if>
|
||||
<sc-if value="{{ s.trash }}"><div style="height:36px;padding:0 16px;border-radius:999px;background:var(--dgs);color:var(--dg);display:flex;align-items:center;gap:8px;font:600 14px/1 var(--ft);white-space:nowrap"><span style="{{ i16.trash }}"></span>Empty trash</div></sc-if>
|
||||
<sc-if value="{{ s.offline }}"><div style="height:36px;padding:0 16px;border-radius:999px;background:var(--acs);color:var(--act);display:flex;align-items:center;gap:8px;font:600 14px/1 var(--ft);white-space:nowrap"><span style="{{ i16.sync }}"></span>Sync now</div></sc-if>
|
||||
</div>
|
||||
|
||||
<div style="flex:1;min-height:0;overflow:hidden;display:flex;flex-direction:column;padding:0 24px">
|
||||
|
||||
<sc-if value="{{ s.files }}">
|
||||
<div style="flex:none;display:flex;align-items:center;gap:8px;padding:14px 0 10px">
|
||||
<div style="height:32px;padding:0 12px;border-radius:999px;border:1px solid var(--ln);display:flex;align-items:center;gap:6px;font:500 13px/1 var(--ft);white-space:nowrap"><span style="{{ i14.filter }}"></span>All types<span style="{{ i14.chevD }}"></span></div>
|
||||
<div style="height:32px;padding:0 12px;border-radius:999px;border:1px solid var(--ln);display:flex;align-items:center;gap:6px;font:500 13px/1 var(--ft);white-space:nowrap">Modified<span style="{{ i14.chevD }}"></span></div>
|
||||
<div style="height:32px;padding:0 12px;border-radius:999px;border:1px solid var(--ln);display:flex;align-items:center;gap:6px;font:500 13px/1 var(--ft);white-space:nowrap">Shared<span style="{{ i14.chevD }}"></span></div>
|
||||
<div style="height:32px;padding:0 12px;border-radius:999px;background:var(--acs);color:var(--act);display:flex;align-items:center;gap:6px;font:600 13px/1 var(--ft);white-space:nowrap"><span style="{{ i14.offline }}"></span>Available offline<span style="{{ i14.x }}"></span></div>
|
||||
<div style="flex:1"></div>
|
||||
<div style="font:400 13px/1 var(--ft);color:var(--fg3)">10 items · 440 MB</div>
|
||||
</div>
|
||||
</sc-if>
|
||||
<sc-if value="{{ s.trash }}">
|
||||
<div style="flex:none;margin:16px 0 4px;padding:12px 16px;border-radius:14px;background:var(--sf2);display:flex;gap:10px;align-items:center;color:var(--fg2);font:400 14px/1.2 var(--ft)"><span style="{{ i18.info }}"></span>Items here are deleted for good after 30 days.</div>
|
||||
</sc-if>
|
||||
<sc-if value="{{ s.offline }}">
|
||||
<div style="flex:none;display:grid;grid-template-columns:minmax(0,2fr) repeat(3,minmax(0,1fr));gap:12px;padding:18px 0 8px">
|
||||
<div style="padding:16px 18px;border-radius:18px;background:var(--sf2);display:flex;flex-direction:column;gap:10px"><div style="display:flex;justify-content:space-between;align-items:baseline"><div style="font:600 28px/0.9 var(--fd);letter-spacing:-0.03em">2.4 GB</div><div style="font:400 13px/1 var(--ft);color:var(--fg3)">of 5 GB limit</div></div><div style="height:6px;border-radius:999px;background:var(--sf3);overflow:hidden"><div style="width:48%;height:100%;background:var(--ac)"></div></div></div>
|
||||
<div style="padding:16px 18px;border-radius:18px;background:var(--sf2);display:flex;flex-direction:column;gap:8px"><div style="font:600 28px/0.9 var(--fd);letter-spacing:-0.03em">142</div><div style="font:400 13px/1 var(--ft);color:var(--fg2)">Files up to date</div></div>
|
||||
<div style="padding:16px 18px;border-radius:18px;background:var(--sf2);display:flex;flex-direction:column;gap:8px"><div style="font:600 28px/0.9 var(--fd);letter-spacing:-0.03em;color:var(--act)">6</div><div style="font:400 13px/1 var(--ft);color:var(--fg2)">Syncing now</div></div>
|
||||
<div style="padding:16px 18px;border-radius:18px;background:var(--dgs);display:flex;flex-direction:column;gap:8px"><div style="font:600 28px/0.9 var(--fd);letter-spacing:-0.03em;color:var(--dg)">1</div><div style="font:400 13px/1 var(--ft);color:var(--dg)">Needs attention</div></div>
|
||||
</div>
|
||||
</sc-if>
|
||||
<sc-if value="{{ s.shares }}">
|
||||
<div style="flex:none;display:flex;padding:14px 0 8px"><div style="display:flex;padding:3px;border-radius:999px;background:var(--sf2);gap:2px">
|
||||
<div style="height:32px;padding:0 16px;border-radius:999px;background:var(--acs);color:var(--act);display:flex;align-items:center;font:600 13px/1 var(--ft);white-space:nowrap">With you</div>
|
||||
<div style="height:32px;padding:0 16px;display:flex;align-items:center;font:500 13px/1 var(--ft);color:var(--fg2)">By you</div>
|
||||
<div style="height:32px;padding:0 16px;display:flex;align-items:center;font:500 13px/1 var(--ft);color:var(--fg2)">Links</div>
|
||||
</div></div>
|
||||
</sc-if>
|
||||
|
||||
<sc-if value="{{ showTable }}">
|
||||
<sc-for list="{{ groups }}" as="g" hint-placeholder-count="1">
|
||||
<sc-if value="{{ g.hasLabel }}"><div style="padding:18px 12px 6px;font:600 13px/1 var(--ft);color:var(--fg2)">{{ g.label }}</div></sc-if>
|
||||
<div style="display:grid;grid-template-columns:minmax(0,1fr) 180px 160px 120px;align-items:center;height:36px;padding:0 12px;border-bottom:1px solid var(--ln);font:600 12px/1 var(--ft);color:var(--fg3)">
|
||||
<div style="display:flex;align-items:center;gap:4px">{{ c0 }}<sc-if value="{{ sortable }}"><span style="{{ i14.up }}"></span></sc-if></div><div>{{ c1 }}</div><div>{{ c2 }}</div><div></div>
|
||||
</div>
|
||||
<sc-for list="{{ g.rows }}" as="f" hint-placeholder-count="8">
|
||||
<div style="{{ f.rs }}">
|
||||
<div style="display:flex;align-items:center;gap:12px;min-width:0"><div style="{{ f.tile }}"><span style="{{ f.ico }}"></span></div><div style="font:500 14px/1.2 var(--ft);white-space:nowrap;overflow:hidden;text-overflow:ellipsis">{{ f.name }}</div></div>
|
||||
<div style="font:400 13px/1.2 var(--ft);color:var(--fg2);white-space:nowrap;overflow:hidden;text-overflow:ellipsis">{{ f.a }}</div>
|
||||
<div style="display:flex;align-items:center;gap:6px;font:400 13px/1.2 var(--ft);color:var(--fg2);white-space:nowrap;overflow:hidden"><sc-if value="{{ f.bInline }}"><span style="{{ f.badge }}"></span></sc-if>{{ f.b }}</div>
|
||||
<div style="display:flex;align-items:center;justify-content:flex-end;gap:10px;color:var(--fg3)">
|
||||
<sc-if value="{{ f.bIcon }}"><span style="{{ f.badge }}"></span></sc-if>
|
||||
<sc-if value="{{ f.shared }}"><span style="{{ i16.users }}"></span></sc-if>
|
||||
<sc-if value="{{ f.fav }}"><span style="{{ starSm }}"></span></sc-if>
|
||||
<sc-if value="{{ restore }}"><div style="height:28px;padding:0 12px;border-radius:999px;background:var(--acs);color:var(--act);display:flex;align-items:center;gap:6px;font:600 12px/1 var(--ft);white-space:nowrap"><span style="{{ i14.restore }}"></span>Restore</div></sc-if>
|
||||
<span style="{{ i18.moreH }}"></span>
|
||||
</div>
|
||||
</div>
|
||||
</sc-for>
|
||||
</sc-for>
|
||||
</sc-if>
|
||||
|
||||
<sc-if value="{{ showGrid }}">
|
||||
<div style="display:grid;grid-template-columns:repeat(5,minmax(0,1fr));gap:16px;padding-top:6px">
|
||||
<sc-for list="{{ gridRows }}" as="f" hint-placeholder-count="10">
|
||||
<div style="border:1px solid var(--ln);border-radius:18px;overflow:hidden;display:flex;flex-direction:column;background:var(--sf)">
|
||||
<div style="{{ f.thumb }}"><span style="{{ f.icoL }}"></span></div>
|
||||
<div style="padding:10px 10px 12px 14px;display:flex;flex-direction:column;gap:5px">
|
||||
<div style="display:flex;align-items:center;gap:4px"><div style="flex:1;min-width:0;font:500 14px/1.2 var(--ft);white-space:nowrap;overflow:hidden;text-overflow:ellipsis">{{ f.name }}</div><span style="{{ moreSm }}"></span></div>
|
||||
<div style="display:flex;align-items:center;gap:5px;font:400 12px/1.2 var(--ft);color:var(--fg3)"><sc-if value="{{ f.hasBadge }}"><span style="{{ f.badge }}"></span></sc-if>{{ f.meta }}</div>
|
||||
</div>
|
||||
</div>
|
||||
</sc-for>
|
||||
</div>
|
||||
</sc-if>
|
||||
|
||||
<sc-if value="{{ s.photos }}">
|
||||
<div style="flex:none;display:flex;gap:8px;padding:14px 0 4px">
|
||||
<div style="height:32px;padding:0 14px;border-radius:999px;background:var(--acs);color:var(--act);display:flex;align-items:center;font:600 13px/1 var(--ft);white-space:nowrap">All</div>
|
||||
<div style="height:32px;padding:0 14px;border-radius:999px;border:1px solid var(--ln);display:flex;align-items:center;font:500 13px/1 var(--ft);white-space:nowrap">Photos</div>
|
||||
<div style="height:32px;padding:0 14px;border-radius:999px;border:1px solid var(--ln);display:flex;align-items:center;font:500 13px/1 var(--ft);white-space:nowrap">Videos</div>
|
||||
<div style="height:32px;padding:0 14px;border-radius:999px;border:1px solid var(--ln);display:flex;align-items:center;gap:6px;font:500 13px/1 var(--ft);white-space:nowrap"><span style="{{ i14.camera }}"></span>Camera uploads</div>
|
||||
</div>
|
||||
<sc-for list="{{ photoGroups }}" as="g" hint-placeholder-count="2">
|
||||
<div style="display:flex;justify-content:space-between;align-items:baseline;padding:16px 0 10px"><div style="font:500 18px/1 var(--fd);letter-spacing:-0.02em">{{ g.label }}</div><div style="font:400 13px/1 var(--ft);color:var(--fg3)">{{ g.count }}</div></div>
|
||||
<div style="display:grid;grid-template-columns:repeat(8,minmax(0,1fr));gap:4px">
|
||||
<sc-for list="{{ g.tiles }}" as="t" hint-placeholder-count="16">
|
||||
<div style="{{ t.s }}"><sc-if value="{{ t.vid }}"><div style="position:absolute;right:6px;bottom:6px;height:20px;padding:0 7px 0 5px;border-radius:999px;background:rgba(14,13,11,0.7);color:#FFFFFF;display:flex;align-items:center;gap:3px;font:600 11px/1 var(--ft)"><span style="{{ i14.play }}"></span>{{ t.dur }}</div></sc-if></div>
|
||||
</sc-for>
|
||||
</div>
|
||||
</sc-for>
|
||||
</sc-if>
|
||||
|
||||
<sc-if value="{{ s.activity }}">
|
||||
<div style="max-width:760px;width:100%;display:flex;flex-direction:column">
|
||||
<sc-for list="{{ act }}" as="g" hint-placeholder-count="2">
|
||||
<div style="padding:20px 0 8px;font:600 13px/1 var(--ft);color:var(--fg2)">{{ g.label }}</div>
|
||||
<sc-for list="{{ g.items }}" as="a" hint-placeholder-count="3">
|
||||
<div style="display:flex;gap:14px;padding:14px 0;align-items:center;border-bottom:1px solid var(--ln)">
|
||||
<div style="{{ a.av }}">{{ a.who }}</div>
|
||||
<div style="flex:1;min-width:0;font:400 14px/1.3 var(--ft)"><span style="font-weight:600">{{ a.name }}</span> {{ a.verb }} <span style="font-weight:600">{{ a.obj }}</span> {{ a.tail }}</div>
|
||||
<div style="{{ a.tile }}"><span style="{{ a.ico }}"></span></div>
|
||||
<div style="width:48px;text-align:right;font:400 13px/1 var(--ft);color:var(--fg3)">{{ a.time }}</div>
|
||||
</div>
|
||||
</sc-for>
|
||||
</sc-for>
|
||||
</div>
|
||||
</sc-if>
|
||||
|
||||
<sc-if value="{{ s.settings }}">
|
||||
<div style="display:grid;grid-template-columns:minmax(0,1fr) minmax(0,1fr);gap:16px;padding:20px 0;align-items:start">
|
||||
<div style="display:flex;flex-direction:column;gap:16px">
|
||||
<div style="padding:20px;border-radius:20px;border:1px solid var(--ln);display:flex;flex-direction:column;gap:16px">
|
||||
<div style="display:flex;gap:14px;align-items:center"><div style="width:52px;height:52px;border-radius:999px;background:var(--acs);color:var(--act);display:flex;align-items:center;justify-content:center;font:600 18px/1 var(--ft);flex:none">MR</div><div style="flex:1;display:flex;flex-direction:column;gap:5px"><div style="font:500 20px/1 var(--fd);letter-spacing:-0.02em">Marina Rocha</div><div style="font:400 14px/1 var(--ft);color:var(--fg2)">marina@rocha.family</div></div><div style="height:24px;padding:0 10px;border-radius:999px;background:var(--oks);color:var(--ok);display:flex;align-items:center;font:600 12px/1 var(--ft);white-space:nowrap">Connected</div></div>
|
||||
<div style="display:grid;grid-template-columns:auto minmax(0,1fr);gap:10px 16px;font:400 14px/1.2 var(--ft)"><span style="color:var(--fg3)">Server</span><span>cloud.rocha.family</span><span style="color:var(--fg3)">Version</span><span>Nextcloud 30.0.2</span><span style="color:var(--fg3)">Storage</span><div style="display:flex;align-items:center;gap:10px"><div style="flex:1;height:6px;border-radius:999px;background:var(--sf3);overflow:hidden"><div style="width:38%;height:100%;background:var(--ac)"></div></div><span style="color:var(--fg2)">38.2 of 100 GB</span></div></div>
|
||||
<div style="display:flex;gap:8px"><div style="height:36px;padding:0 16px;border-radius:999px;background:var(--sf2);display:flex;align-items:center;gap:8px;font:600 14px/1 var(--ft);white-space:nowrap"><span style="{{ i14.external }}"></span>Manage on web</div><div style="height:36px;padding:0 16px;border-radius:999px;background:var(--dgs);color:var(--dg);display:flex;align-items:center;gap:8px;font:600 14px/1 var(--ft);white-space:nowrap"><span style="{{ i14.logout }}"></span>Log out</div></div>
|
||||
</div>
|
||||
<div style="padding:8px 20px 12px;border-radius:20px;border:1px solid var(--ln);display:flex;flex-direction:column">
|
||||
<div style="padding:12px 0 8px;font:500 17px/1 var(--fd);letter-spacing:-0.02em">Accounts</div>
|
||||
<div style="display:flex;align-items:center;gap:12px;height:56px;border-bottom:1px solid var(--ln)"><div style="width:32px;height:32px;border-radius:999px;background:var(--acs);color:var(--act);display:flex;align-items:center;justify-content:center;font:600 12px/1 var(--ft)">MR</div><div style="flex:1;display:flex;flex-direction:column;gap:4px"><div style="font:500 14px/1 var(--ft)">Marina Rocha</div><div style="font:400 12px/1 var(--ft);color:var(--fg3)">cloud.rocha.family</div></div><span style="{{ checkA }}"></span></div>
|
||||
<div style="display:flex;align-items:center;gap:12px;height:56px;border-bottom:1px solid var(--ln)"><div style="width:32px;height:32px;border-radius:999px;background:#85D1BD;color:#0E0D0B;display:flex;align-items:center;justify-content:center;font:600 12px/1 var(--ft)">MR</div><div style="flex:1;display:flex;flex-direction:column;gap:4px"><div style="font:500 14px/1 var(--ft)">Marina · Work</div><div style="font:400 12px/1 var(--ft);color:var(--fg3)">files.acme-studio.com</div></div><div style="font:600 13px/1 var(--ft);color:var(--act)">Switch</div></div>
|
||||
<div style="display:flex;align-items:center;gap:12px;height:48px;color:var(--act);font:600 14px/1 var(--ft)"><div style="width:32px;display:flex;justify-content:center"><span style="{{ i18.plus }}"></span></div>Add account</div>
|
||||
</div>
|
||||
</div>
|
||||
<div style="display:flex;flex-direction:column;gap:16px">
|
||||
<div style="padding:8px 20px 8px;border-radius:20px;border:1px solid var(--ln);display:flex;flex-direction:column">
|
||||
<div style="padding:12px 0 8px;font:500 17px/1 var(--fd);letter-spacing:-0.02em">Security</div>
|
||||
<div style="display:flex;align-items:center;gap:14px;min-height:60px;border-bottom:1px solid var(--ln)"><span style="{{ bioIco }}"></span><div style="flex:1;display:flex;flex-direction:column;gap:4px"><div style="font:400 14px/1.1 var(--ft)">{{ bioLabel }}</div><div style="font:400 12px/1.2 var(--ft);color:var(--fg3)">Needed every time you open Noo</div></div><div style="width:44px;height:26px;border-radius:999px;background:var(--ac);padding:3px;box-sizing:border-box;display:flex;justify-content:flex-end;flex:none"><div style="width:20px;height:20px;border-radius:999px;background:#FFFFFF"></div></div></div>
|
||||
<div style="display:flex;align-items:center;gap:14px;height:52px"><span style="{{ i18.timer }}"></span><div style="flex:1;font:400 14px/1 var(--ft)">Lock after</div><div style="height:32px;padding:0 10px 0 12px;border-radius:10px;border:1px solid var(--ln);display:flex;align-items:center;gap:6px;font:500 13px/1 var(--ft)">5 minutes idle<span style="{{ i14.chevD }}"></span></div></div>
|
||||
</div>
|
||||
<div style="padding:8px 20px 8px;border-radius:20px;border:1px solid var(--ln);display:flex;flex-direction:column">
|
||||
<div style="padding:12px 0 8px;font:500 17px/1 var(--fd);letter-spacing:-0.02em">File sync</div>
|
||||
<div style="display:flex;align-items:center;gap:14px;min-height:60px;border-bottom:1px solid var(--ln)"><span style="{{ i18.folder }}"></span><div style="flex:1;display:flex;flex-direction:column;gap:4px"><div style="font:400 14px/1.1 var(--ft)">Local sync folder</div><div style="font:400 12px/1.2 var(--ft);color:var(--fg3);font-family:ui-monospace,Menlo,monospace">{{ syncPath }}</div></div><div style="height:32px;padding:0 12px;border-radius:999px;background:var(--sf2);display:flex;align-items:center;font:600 13px/1 var(--ft);white-space:nowrap">Change</div></div>
|
||||
<div style="display:flex;align-items:center;gap:14px;height:52px;border-bottom:1px solid var(--ln)"><span style="{{ i18.sync }}"></span><div style="flex:1;font:400 14px/1 var(--ft)">Sync automatically</div><div style="width:44px;height:26px;border-radius:999px;background:var(--ac);padding:3px;box-sizing:border-box;display:flex;justify-content:flex-end;flex:none"><div style="width:20px;height:20px;border-radius:999px;background:#FFFFFF"></div></div></div>
|
||||
<div style="display:flex;align-items:center;gap:14px;height:52px;border-bottom:1px solid var(--ln)"><span style="{{ i18.download }}"></span><div style="flex:1;font:400 14px/1 var(--ft)">Download files on demand</div><div style="width:44px;height:26px;border-radius:999px;background:var(--ac);padding:3px;box-sizing:border-box;display:flex;justify-content:flex-end;flex:none"><div style="width:20px;height:20px;border-radius:999px;background:#FFFFFF"></div></div></div>
|
||||
<div style="display:flex;align-items:center;gap:14px;height:52px"><span style="{{ i18.wifi }}"></span><div style="flex:1;font:400 14px/1 var(--ft)">Pause on metered networks</div><div style="width:44px;height:26px;border-radius:999px;background:var(--sf3);padding:3px;box-sizing:border-box;display:flex;justify-content:flex-start;flex:none"><div style="width:20px;height:20px;border-radius:999px;background:#FFFFFF"></div></div></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</sc-if>
|
||||
|
||||
<sc-if value="{{ s.settings2 }}">
|
||||
<div style="display:grid;grid-template-columns:minmax(0,1fr) minmax(0,1fr);gap:16px;padding:20px 0;align-items:start">
|
||||
<div style="display:flex;flex-direction:column;gap:16px">
|
||||
<div style="padding:8px 20px 8px;border-radius:20px;border:1px solid var(--ln);display:flex;flex-direction:column">
|
||||
<div style="padding:12px 0 8px;font:500 17px/1 var(--fd);letter-spacing:-0.02em">Files cache</div>
|
||||
<div style="display:flex;flex-direction:column;gap:10px;padding:10px 0 14px;border-bottom:1px solid var(--ln)"><div style="display:flex;justify-content:space-between;font:400 14px/1 var(--ft)"><span>Cache in use</span><span style="color:var(--fg2)">1.2 of 2 GB</span></div><div style="height:6px;border-radius:999px;background:var(--sf3);overflow:hidden"><div style="width:60%;height:100%;background:var(--ac)"></div></div></div>
|
||||
<div style="display:flex;align-items:center;gap:14px;height:52px;border-bottom:1px solid var(--ln)"><span style="{{ i18.database }}"></span><div style="flex:1;font:400 14px/1 var(--ft)">Cache limit</div><div style="height:32px;padding:0 10px 0 12px;border-radius:10px;border:1px solid var(--ln);display:flex;align-items:center;gap:6px;font:500 13px/1 var(--ft)">2 GB<span style="{{ i14.chevD }}"></span></div></div>
|
||||
<div style="display:flex;align-items:center;gap:14px;height:52px"><span style="{{ i18.trash }}"></span><div style="flex:1;font:400 14px/1 var(--ft)">Clear cached files</div><div style="height:32px;padding:0 14px;border-radius:999px;background:var(--dgs);color:var(--dg);display:flex;align-items:center;font:600 13px/1 var(--ft);white-space:nowrap">Clear cache</div></div>
|
||||
</div>
|
||||
<div style="padding:8px 20px 8px;border-radius:20px;border:1px solid var(--ln);display:flex;flex-direction:column">
|
||||
<div style="padding:12px 0 8px;font:500 17px/1 var(--fd);letter-spacing:-0.02em">Appearance</div>
|
||||
<div style="display:flex;align-items:center;gap:14px;height:56px;border-bottom:1px solid var(--ln)"><span style="{{ i18.palette }}"></span><div style="flex:1;font:400 14px/1 var(--ft)">Theme</div><div style="display:flex;padding:3px;border-radius:999px;background:var(--sf2);gap:2px"><div style="height:28px;padding:0 12px;border-radius:999px;background:var(--acs);color:var(--act);display:flex;align-items:center;font:600 13px/1 var(--ft);white-space:nowrap">System</div><div style="height:28px;padding:0 12px;display:flex;align-items:center;font:500 13px/1 var(--ft);color:var(--fg2)">Light</div><div style="height:28px;padding:0 12px;display:flex;align-items:center;font:500 13px/1 var(--ft);color:var(--fg2)">Dark</div></div></div>
|
||||
<div style="display:flex;align-items:center;gap:14px;height:56px;border-bottom:1px solid var(--ln)"><span style="{{ i18.grid }}"></span><div style="flex:1;font:400 14px/1 var(--ft)">Default file view</div><div style="display:flex;padding:3px;border-radius:999px;background:var(--sf2);gap:2px"><div style="height:28px;padding:0 12px;border-radius:999px;background:var(--acs);color:var(--act);display:flex;align-items:center;gap:6px;font:600 13px/1 var(--ft);white-space:nowrap"><span style="{{ i14.list }}"></span>List</div><div style="height:28px;padding:0 12px;display:flex;align-items:center;gap:6px;font:500 13px/1 var(--ft);color:var(--fg2)"><span style="{{ i14.grid }}"></span>Grid</div></div></div>
|
||||
<div style="display:flex;align-items:center;gap:14px;height:52px"><span style="{{ i18.hidden }}"></span><div style="flex:1;font:400 14px/1 var(--ft)">Show hidden files</div><div style="width:44px;height:26px;border-radius:999px;background:var(--sf3);padding:3px;box-sizing:border-box;display:flex;justify-content:flex-start;flex:none"><div style="width:20px;height:20px;border-radius:999px;background:#FFFFFF"></div></div></div>
|
||||
</div>
|
||||
</div>
|
||||
<div style="display:flex;flex-direction:column;gap:16px">
|
||||
<div style="padding:8px 20px 12px;border-radius:20px;border:1px solid var(--ln);display:flex;flex-direction:column">
|
||||
<div style="padding:12px 0 4px;display:flex;justify-content:space-between;align-items:baseline"><div style="font:500 17px/1 var(--fd);letter-spacing:-0.02em">Sidebar tabs</div><div style="font:400 12px/1 var(--ft);color:var(--fg3)">Drag to reorder</div></div>
|
||||
<div style="padding:4px 0 8px;font:400 12px/1.3 var(--ft);color:var(--fg3)">Pinned tabs show at the top of the sidebar, and in the bottom bar on mobile.</div>
|
||||
<sc-for list="{{ tabRows }}" as="t" hint-placeholder-count="8">
|
||||
<div style="display:flex;align-items:center;gap:12px;height:44px;border-bottom:1px solid var(--ln)"><span style="{{ gripS }}"></span><span style="{{ t.ico }}"></span><div style="flex:1;font:400 14px/1 var(--ft)">{{ t.label }}</div><div style="{{ t.pinS }}"><span style="{{ t.pinI }}"></span></div></div>
|
||||
</sc-for>
|
||||
</div>
|
||||
<div style="padding:8px 20px 8px;border-radius:20px;border:1px solid var(--ln);display:flex;flex-direction:column">
|
||||
<div style="padding:12px 0 8px;font:500 17px/1 var(--fd);letter-spacing:-0.02em">{{ swipeTitle }}</div>
|
||||
<div style="display:flex;align-items:center;gap:14px;height:52px;border-bottom:1px solid var(--ln)"><span style="{{ i18.swipe }}"></span><div style="flex:1;font:400 14px/1 var(--ft)">Swipe left</div><div style="height:32px;padding:0 10px 0 12px;border-radius:10px;border:1px solid var(--ln);display:flex;align-items:center;gap:6px;font:500 13px/1 var(--ft);color:var(--dg)"><span style="{{ i14.trash }}"></span>Delete<span style="{{ i14.chevD }}"></span></div></div>
|
||||
<div style="display:flex;align-items:center;gap:14px;height:52px"><span style="{{ i18.swipe }}"></span><div style="flex:1;font:400 14px/1 var(--ft)">Swipe right</div><div style="height:32px;padding:0 10px 0 12px;border-radius:10px;border:1px solid var(--ln);display:flex;align-items:center;gap:6px;font:500 13px/1 var(--ft);color:var(--act)"><span style="{{ i14.star }}"></span>Favorite<span style="{{ i14.chevD }}"></span></div></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</sc-if>
|
||||
|
||||
</div>
|
||||
|
||||
<sc-if value="{{ share }}">
|
||||
<div style="position:absolute;inset:0;background:var(--scrim);display:flex;align-items:center;justify-content:center">
|
||||
<div style="width:540px;background:var(--sf);border-radius:24px;padding:24px;box-sizing:border-box;display:flex;flex-direction:column;gap:20px;box-shadow:0 24px 48px rgba(30,0,47,0.14)">
|
||||
<div style="display:flex;gap:12px;align-items:center">
|
||||
<div style="{{ shareTile }}"><span style="{{ i20.doc }}"></span></div>
|
||||
<div style="flex:1;min-width:0;display:flex;flex-direction:column;gap:5px"><div style="font:500 19px/1 var(--fd);letter-spacing:-0.02em">Share “Q3 Planning.pdf”</div><div style="font:400 13px/1 var(--ft);color:var(--fg3)">2.4 MB · Documents</div></div>
|
||||
<div style="width:32px;height:32px;border-radius:999px;background:var(--sf2);display:flex;align-items:center;justify-content:center"><span style="{{ i16.x }}"></span></div>
|
||||
</div>
|
||||
<div style="display:flex;flex-direction:column;gap:12px">
|
||||
<div style="font:500 16px/1 var(--fd);letter-spacing:-0.02em">Share with people</div>
|
||||
<div style="display:flex;gap:8px"><div style="flex:1;height:42px;border-radius:12px;background:var(--sf2);display:flex;align-items:center;gap:10px;padding:0 12px;color:var(--fg3);font:400 14px/1 var(--ft)"><span style="{{ i18.userPlus }}"></span>Name, email or group</div><div style="height:42px;padding:0 10px 0 14px;border-radius:12px;border:1px solid var(--ln);display:flex;align-items:center;gap:6px;font:500 13px/1 var(--ft)">Can edit<span style="{{ i14.chevD }}"></span></div></div>
|
||||
<div style="display:flex;align-items:center;gap:12px;height:44px"><div style="{{ avYou }}">MR</div><div style="flex:1;display:flex;flex-direction:column;gap:4px"><div style="font:500 14px/1 var(--ft)">You</div><div style="font:400 12px/1 var(--ft);color:var(--fg3)">marina@rocha.family</div></div><div style="font:500 13px/1 var(--ft);color:var(--fg3)">Owner</div></div>
|
||||
<div style="display:flex;align-items:center;gap:12px;height:44px"><div style="{{ avAna }}">AS</div><div style="flex:1;display:flex;flex-direction:column;gap:4px"><div style="font:500 14px/1 var(--ft)">Ana Souza</div><div style="font:400 12px/1 var(--ft);color:var(--fg3)">ana@rocha.family</div></div><div style="height:28px;padding:0 8px 0 12px;border-radius:999px;border:1px solid var(--ln);display:flex;align-items:center;gap:4px;font:500 12px/1 var(--ft);white-space:nowrap">Can edit<span style="{{ i14.chevD }}"></span></div></div>
|
||||
<div style="display:flex;align-items:center;gap:12px;height:44px"><div style="width:32px;height:32px;border-radius:999px;background:var(--sf2);color:var(--fg2);display:flex;align-items:center;justify-content:center;flex:none"><span style="{{ i16.users }}"></span></div><div style="flex:1;display:flex;flex-direction:column;gap:4px"><div style="font:500 14px/1 var(--ft)">Design team</div><div style="font:400 12px/1 var(--ft);color:var(--fg3)">Group · 6 people</div></div><div style="height:28px;padding:0 8px 0 12px;border-radius:999px;border:1px solid var(--ln);display:flex;align-items:center;gap:4px;font:500 12px/1 var(--ft);white-space:nowrap">Can view<span style="{{ i14.chevD }}"></span></div></div>
|
||||
</div>
|
||||
<div style="height:1px;background:var(--ln)"></div>
|
||||
<div style="display:flex;flex-direction:column;gap:12px">
|
||||
<div style="display:flex;justify-content:space-between;align-items:center"><div style="display:flex;flex-direction:column;gap:5px"><div style="font:500 16px/1 var(--fd);letter-spacing:-0.02em">Share link</div><div style="font:400 12px/1 var(--ft);color:var(--fg3)">Anyone with the link can view</div></div><div style="width:44px;height:26px;border-radius:999px;background:var(--ac);padding:3px;box-sizing:border-box;display:flex;justify-content:flex-end;flex:none"><div style="width:20px;height:20px;border-radius:999px;background:#FFFFFF"></div></div></div>
|
||||
<div style="border-radius:14px;background:var(--sf2);padding:5px 5px 5px 14px;display:flex;gap:10px;align-items:center;color:var(--fg2)"><span style="{{ i16.link }}"></span><div style="flex:1;min-width:0;font:400 13px/1 ui-monospace,Menlo,monospace;color:var(--fg1);white-space:nowrap;overflow:hidden;text-overflow:ellipsis">https://cloud.rocha.family/s/k7Pq2xW</div><div style="height:34px;padding:0 14px;border-radius:999px;background:var(--ac);color:#FFFFFF;display:flex;align-items:center;gap:6px;font:600 13px/1 var(--ft);white-space:nowrap"><span style="{{ i14.copy }}"></span>Copy link</div></div>
|
||||
<div style="display:flex;gap:8px;flex-wrap:wrap">
|
||||
<div style="height:30px;padding:0 12px;border-radius:999px;border:1px solid var(--ln);display:flex;align-items:center;gap:6px;font:500 12px/1 var(--ft);white-space:nowrap"><span style="{{ i14.eye }}"></span>Can view<span style="{{ i14.chevD }}"></span></div>
|
||||
<div style="height:30px;padding:0 12px;border-radius:999px;background:var(--acs);color:var(--act);display:flex;align-items:center;gap:6px;font:600 12px/1 var(--ft);white-space:nowrap"><span style="{{ i14.calendar }}"></span>Expires Oct 24</div>
|
||||
<div style="height:30px;padding:0 12px;border-radius:999px;border:1px solid var(--ln);display:flex;align-items:center;gap:6px;font:500 12px/1 var(--ft);white-space:nowrap"><span style="{{ i14.lock }}"></span>Add password</div>
|
||||
<div style="height:30px;padding:0 12px;border-radius:999px;border:1px solid var(--ln);display:flex;align-items:center;gap:6px;font:500 12px/1 var(--ft);white-space:nowrap"><span style="{{ i14.download }}"></span>Allow download</div>
|
||||
</div>
|
||||
</div>
|
||||
<div style="height:1px;background:var(--ln)"></div>
|
||||
<div style="display:flex;align-items:center;gap:12px">
|
||||
<div style="flex:1;font:400 12px/1.3 var(--ft);color:var(--fg3)">Sends a copy through another app. Link settings don’t apply.</div>
|
||||
<div style="height:38px;padding:0 16px;border-radius:999px;border:1.5px solid var(--sf3);display:flex;align-items:center;gap:8px;font:600 14px/1 var(--ft);white-space:nowrap"><span style="{{ i16.send }}"></span>Send file directly</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</sc-if>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</sc-if>
|
||||
</x-dc>
|
||||
<script type="text/x-dc" data-dc-script data-props="{"$preview":{"width":1280,"height":800},"os":{"editor":"enum","options":["mac","windows"],"default":"mac","tsType":"'mac'|'windows'"},"screen":{"editor":"enum","options":["files","filesGrid","photos","favorites","offline","shares","recent","activity","trash","share","settings","settings2"],"default":"files","tsType":"string"},"theme":{"editor":"enum","options":["light","dark"],"default":"light","tsType":"'light'|'dark'"}}">
|
||||
class Component extends DCLogic {
|
||||
componentDidMount() {
|
||||
if (!window.NK) this._t = setInterval(() => { if (window.NK) { clearInterval(this._t); this.forceUpdate(); } }, 40);
|
||||
}
|
||||
componentWillUnmount() { clearInterval(this._t); }
|
||||
renderVals() {
|
||||
const K = window.NK;
|
||||
if (!K) return { ready: false };
|
||||
const { I, ic, D, row, TH, tile, tiles, avatar } = K;
|
||||
const mac = this.props.os !== 'windows', win = !mac;
|
||||
const sc = this.props.screen || 'files';
|
||||
const theme = this.props.theme === 'dark' ? 'dark' : 'light';
|
||||
const share = sc === 'share', grid = sc === 'filesGrid';
|
||||
const base = (share || grid) ? 'files' : sc;
|
||||
const settings = base.startsWith('settings');
|
||||
const s = {}; ['files','photos','activity','trash','favorites','offline','shares','recent','settings','settings2'].forEach(k => s[k] = base === k);
|
||||
const RS = sel => ({ display: 'grid', gridTemplateColumns: 'minmax(0,1fr) 180px 160px 120px', alignItems: 'center', height: 52, padding: '0 12px', borderBottom: '1px solid var(--ln)', background: sel ? 'var(--acs)' : 'transparent', borderRadius: sel ? 12 : 0 });
|
||||
const mk = (list, fn, o = {}) => list.map((f, i) => { const r = row(f, { tile: 30, r: 9, ico: 16, ...o }); Object.assign(r, fn(f)); r.rs = RS(o.sel === i); return r; });
|
||||
let groups = [], cols = ['Name', 'Size', 'Modified'];
|
||||
const split = f => { const p = (f.meta || '').split(' · '); return { a: p[0], b: p[1] || '' }; };
|
||||
if (base === 'files') groups = [{ rows: mk(D.files, f => ({ a: f.size, b: f.mod, bIcon: !!f.off }), { noSwipe: 1, sel: 3 }) }];
|
||||
if (base === 'favorites') groups = [{ rows: mk(D.favorites, f => ({ a: f.size, b: f.mod, bIcon: !!f.off, fav: true })) }];
|
||||
if (base === 'offline') { cols = ['Name', 'Size', 'Status']; groups = [{ rows: mk(D.offline, f => ({ a: f.size, b: split(f).a, bInline: true })) }]; }
|
||||
if (base === 'shares') { cols = ['Name', 'Shared by', 'Permission']; groups = [{ rows: mk(D.shares, f => ({ a: f.by, b: f.perm })) }]; }
|
||||
if (base === 'recent') { cols = ['Name', 'Activity', 'Location']; groups = D.recent.map(g => ({ label: g.label, rows: mk(g.rows, f => ({ ...split(f), bIcon: !!f.off })) })); }
|
||||
if (base === 'trash') { cols = ['Name', 'Original location', 'Deleted']; groups = [{ rows: mk(D.trash, f => ({ a: f.from, b: f.del })) }]; }
|
||||
groups = groups.map(g => ({ ...g, hasLabel: !!g.label }));
|
||||
const title = settings ? 'Settings' : D.titles[base];
|
||||
const seg = on => ({ width: 34, height: 30, borderRadius: 999, display: 'flex', alignItems: 'center', justifyContent: 'center', background: on ? 'var(--acs)' : 'transparent', color: on ? 'var(--act)' : 'var(--fg3)' });
|
||||
const counts = { trash: '12', offline: '1', shares: '3' };
|
||||
const navItem = ([label, ico, key]) => ({ label, ico: I[18][ico], icoG: ic(ico, 18, 'var(--fg2)'), on: key === base, off: key !== base, count: counts[key] || '' });
|
||||
return {
|
||||
ready: true, mac, win, s, title, groups, c0: cols[0], c1: cols[1], c2: cols[2], share, notSettings: !settings,
|
||||
sortable: base === 'files' || base === 'favorites',
|
||||
restore: base === 'trash',
|
||||
root: { ...TH[theme], width: 1280, height: 800, borderRadius: mac ? 12 : 8, overflow: 'hidden', position: 'relative', display: 'flex', flexDirection: 'column', background: 'var(--bg)', color: 'var(--fg1)', fontFamily: 'var(--ft)', border: '1px solid var(--ln)', boxSizing: 'border-box' },
|
||||
i14: I[14], i16: I[16], i18: I[18], i20: I[20], i24: I[24],
|
||||
showTable: groups.length > 0 && !grid, showGrid: grid,
|
||||
gridRows: D.files.map(f => row(f, { noSwipe: 1, thumbH: 118 })).map(r => ({ ...r, meta: `${r.size} · ${r.mod}` })),
|
||||
segL: seg(!grid), segG: seg(grid),
|
||||
navA: D.pinned.map(navItem), navB: D.menu.map(navItem),
|
||||
setOn: settings, setOff: !settings, setIcoG: ic('settings', 18, 'var(--fg2)'),
|
||||
starSm: ic('star', 16, 'var(--act)'), moreSm: ic('moreH', 16, 'var(--fg3)'),
|
||||
checkA: ic('check', 18, 'var(--act)'), chevG: ic('chevR', 16, 'var(--fg3)'), gripS: ic('grip', 16, 'var(--fg3)'),
|
||||
photoGroups: [{ label: 'September 2026', count: '38 items', tiles: tiles(24, 0, [2, 9, 13, 20]) }, { label: 'August 2026', count: '112 items', tiles: tiles(16, 3, [4, 11]) }],
|
||||
act: D.activity.map(g => ({ label: g.label, items: g.items.map(a => ({ ...a, av: avatar(a.col, 36), tile: tile(a.kind, 30, 9), ico: I[16][K.KIND[a.kind][2]] })) })),
|
||||
tabRows: [...D.pinned.map(([label, ico]) => ({ label, ico: I[18][ico], p: 1 })), ...D.menu.map(([label, ico]) => ({ label, ico: I[18][ico], p: 0 }))].map(t => ({ ...t,
|
||||
pinS: { width: 30, height: 30, borderRadius: 999, display: 'flex', alignItems: 'center', justifyContent: 'center', background: t.p ? 'var(--acs)' : 'var(--sf2)', color: t.p ? 'var(--act)' : 'var(--fg3)' },
|
||||
pinI: I[14][t.p ? 'pin' : 'pinOff'] })),
|
||||
bioLabel: mac ? 'Lock with Touch ID' : 'Lock with Windows Hello', bioIco: I[18][mac ? 'fingerprint' : 'face'],
|
||||
syncPath: mac ? '~/Noo/rocha.family' : 'C:\\Users\\Marina\\Noo',
|
||||
swipeTitle: mac ? 'Trackpad swipe on a file' : 'Touch swipe on a file',
|
||||
shareTile: tile('pdf', 40, 12), avYou: avatar('#CBA5FD', 32), avAna: avatar('#DA9AC7', 32)
|
||||
};
|
||||
}
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -0,0 +1,433 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<script src="./support.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
<x-dc>
|
||||
<helmet>
|
||||
<script src="noo-kit.js"></script>
|
||||
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Instrument+Sans:wght@400;500;600&family=Schibsted+Grotesk:wght@500;600&display=swap">
|
||||
<style>
|
||||
body{margin:0}
|
||||
a{color:#8D0DE3;text-decoration:none}
|
||||
a:hover{color:#6E08B3}
|
||||
</style>
|
||||
</helmet>
|
||||
<sc-if value="{{ ready }}" hint-placeholder-val="{{ false }}">
|
||||
<div style="{{ root }}">
|
||||
|
||||
<sc-if value="{{ ios }}">
|
||||
<div style="height:54px;flex:none;display:flex;align-items:center;justify-content:space-between;padding:0 30px 0 46px;position:relative;font:600 17px/1 var(--ft);color:var(--fg1)">
|
||||
<span>9:41</span>
|
||||
<div style="position:absolute;left:50%;top:11px;width:124px;height:36px;margin-left:-62px;border-radius:20px;background:#000000"></div>
|
||||
<div style="display:flex;gap:6px;align-items:center"><span style="{{ i16.signal }}"></span><span style="{{ i16.wifi }}"></span><span style="{{ i24.battery }}"></span></div>
|
||||
</div>
|
||||
</sc-if>
|
||||
<sc-if value="{{ android }}">
|
||||
<div style="height:40px;flex:none;display:flex;align-items:center;justify-content:space-between;padding:0 24px;font:500 14px/1 var(--ft);color:var(--fg1)">
|
||||
<span>9:41</span>
|
||||
<div style="display:flex;gap:6px;align-items:center"><span style="{{ i16.wifi }}"></span><span style="{{ i16.signal }}"></span><span style="{{ i16.battery }}"></span></div>
|
||||
</div>
|
||||
</sc-if>
|
||||
|
||||
<sc-if value="{{ aBar }}">
|
||||
<div style="height:64px;flex:none;display:flex;align-items:center;gap:4px;padding:0 8px 0 4px;color:var(--fg1)">
|
||||
<div style="width:48px;height:48px;display:flex;align-items:center;justify-content:center"><span style="{{ i24.menu }}"></span></div>
|
||||
<div style="flex:1;font:500 22px/1 var(--fd);letter-spacing:-0.02em">{{ title }}</div>
|
||||
<div style="width:48px;height:48px;display:flex;align-items:center;justify-content:center"><span style="{{ i24.search }}"></span></div>
|
||||
<div style="width:48px;height:48px;display:flex;align-items:center;justify-content:center"><div style="width:32px;height:32px;border-radius:999px;background:var(--acs);color:var(--act);display:flex;align-items:center;justify-content:center;font:600 13px/1 var(--ft)">MR</div></div>
|
||||
</div>
|
||||
</sc-if>
|
||||
<sc-if value="{{ aSet }}">
|
||||
<div style="height:64px;flex:none;display:flex;align-items:center;gap:4px;padding:0 8px 0 4px;color:var(--fg1)">
|
||||
<div style="width:48px;height:48px;display:flex;align-items:center;justify-content:center"><span style="{{ i24.back }}"></span></div>
|
||||
<div style="flex:1;font:500 22px/1 var(--fd);letter-spacing:-0.02em">Settings</div>
|
||||
</div>
|
||||
</sc-if>
|
||||
<sc-if value="{{ iBar }}">
|
||||
<div style="height:44px;flex:none;display:flex;align-items:center;justify-content:space-between;padding:0 16px;color:var(--act)">
|
||||
<span style="{{ i24.menu }}"></span>
|
||||
<div style="display:flex;gap:18px;align-items:center"><span style="{{ i24.plus }}"></span><div style="width:30px;height:30px;border-radius:999px;background:var(--acs);color:var(--act);display:flex;align-items:center;justify-content:center;font:600 12px/1 var(--ft)">MR</div></div>
|
||||
</div>
|
||||
<div style="flex:none;padding:2px 16px 12px;font:600 34px/0.9 var(--fd);letter-spacing:-0.03em;color:var(--fg1)">{{ title }}</div>
|
||||
<div style="flex:none;margin:0 16px 12px;height:38px;border-radius:12px;background:var(--sf);display:flex;align-items:center;gap:8px;padding:0 10px;color:var(--fg3);font:400 16px/1 var(--ft)"><span style="{{ i18.search }}"></span>Search</div>
|
||||
</sc-if>
|
||||
<sc-if value="{{ iSet }}">
|
||||
<div style="height:44px;flex:none;display:flex;align-items:center;gap:2px;padding:0 10px;color:var(--act);font:400 17px/1 var(--ft)"><span style="{{ i24.chevL }}"></span>Files</div>
|
||||
<div style="flex:none;padding:2px 16px 14px;font:600 34px/0.9 var(--fd);letter-spacing:-0.03em;color:var(--fg1)">Settings</div>
|
||||
</sc-if>
|
||||
|
||||
<div style="flex:1;min-height:0;position:relative;overflow:hidden;display:flex;flex-direction:column">
|
||||
|
||||
<sc-if value="{{ s.files }}">
|
||||
<div style="flex:none;display:flex;align-items:center;gap:8px;padding:4px 12px 12px 12px">
|
||||
<div style="height:34px;padding:0 12px;border-radius:999px;background:var(--sf);display:flex;align-items:center;gap:6px;font:500 14px/1 var(--ft);color:var(--fg1);white-space:nowrap"><span style="{{ i16.sort }}"></span>Name<span style="{{ i14.up }}"></span></div>
|
||||
<div style="height:34px;padding:0 12px;border-radius:999px;background:var(--sf);display:flex;align-items:center;gap:6px;font:500 14px/1 var(--ft);color:var(--fg1);white-space:nowrap"><span style="{{ i16.filter }}"></span><span style="white-space:nowrap">All types</span><span style="{{ i14.chevD }}"></span></div>
|
||||
<div style="flex:1"></div>
|
||||
<div style="display:flex;padding:3px;border-radius:999px;background:var(--sf);gap:2px">
|
||||
<div style="{{ segL }}"><span style="{{ i18.list }}"></span></div>
|
||||
<div style="{{ segG }}"><span style="{{ i18.grid }}"></span></div>
|
||||
</div>
|
||||
</div>
|
||||
</sc-if>
|
||||
|
||||
<sc-if value="{{ s.trash }}">
|
||||
<div style="flex:none;margin:0 12px 16px;padding:14px 16px;border-radius:20px;background:var(--sf);display:flex;gap:12px;align-items:center;color:var(--fg2)">
|
||||
<span style="{{ i20.info }}"></span>
|
||||
<div style="flex:1;font:400 14px/1.3 var(--ft);text-wrap:pretty">Items here are deleted for good after 30 days.</div>
|
||||
<div style="font:600 14px/1 var(--ft);color:var(--dg);white-space:nowrap">Empty trash</div>
|
||||
</div>
|
||||
</sc-if>
|
||||
|
||||
<sc-if value="{{ s.offline }}">
|
||||
<div style="flex:none;margin:0 12px 16px;padding:18px;border-radius:20px;background:var(--sf);display:flex;flex-direction:column;gap:14px">
|
||||
<div style="display:flex;justify-content:space-between;align-items:flex-end;gap:12px">
|
||||
<div style="display:flex;flex-direction:column;gap:6px"><div style="font:600 32px/0.9 var(--fd);letter-spacing:-0.03em">2.4 GB</div><div style="font:400 14px/1.2 var(--ft);color:var(--fg2)">of your 5 GB offline limit</div></div>
|
||||
<div style="height:36px;padding:0 14px;border-radius:999px;background:var(--acs);color:var(--act);display:flex;align-items:center;gap:6px;font:600 14px/1 var(--ft);white-space:nowrap"><span style="{{ i16.sync }}"></span>Sync now</div>
|
||||
</div>
|
||||
<div style="height:6px;border-radius:999px;background:var(--sf3);overflow:hidden"><div style="width:48%;height:100%;background:var(--ac)"></div></div>
|
||||
<div style="font:400 13px/1.2 var(--ft);color:var(--fg3)">Last synced 2 minutes ago · 1 file needs attention</div>
|
||||
</div>
|
||||
</sc-if>
|
||||
|
||||
<sc-if value="{{ s.shares }}">
|
||||
<div style="flex:none;margin:0 12px 16px;display:flex;padding:3px;border-radius:999px;background:var(--sf);gap:2px">
|
||||
<div style="flex:1;height:34px;border-radius:999px;background:var(--acs);color:var(--act);display:flex;align-items:center;justify-content:center;font:600 14px/1 var(--ft)">With you</div>
|
||||
<div style="flex:1;height:34px;border-radius:999px;color:var(--fg2);display:flex;align-items:center;justify-content:center;font:500 14px/1 var(--ft)">By you</div>
|
||||
<div style="flex:1;height:34px;border-radius:999px;color:var(--fg2);display:flex;align-items:center;justify-content:center;font:500 14px/1 var(--ft)">Links</div>
|
||||
</div>
|
||||
</sc-if>
|
||||
|
||||
<sc-if value="{{ showList }}">
|
||||
<div style="display:flex;flex-direction:column;gap:18px;padding:0 12px 16px">
|
||||
<sc-for list="{{ groups }}" as="g" hint-placeholder-count="1">
|
||||
<div style="display:flex;flex-direction:column;gap:8px">
|
||||
<sc-if value="{{ g.hasLabel }}"><div style="padding:0 8px;font:600 13px/1 var(--ft);color:var(--fg2)">{{ g.label }}</div></sc-if>
|
||||
<div style="display:flex;flex-direction:column;gap:1px;background:var(--ln);border-radius:20px;overflow:hidden">
|
||||
<sc-for list="{{ g.rows }}" as="f" hint-placeholder-count="6">
|
||||
<div style="position:relative;background:var(--dgf)">
|
||||
<sc-if value="{{ f.swiped }}"><div style="position:absolute;right:0;top:0;bottom:0;width:96px;display:flex;flex-direction:column;align-items:center;justify-content:center;gap:5px;color:#FFFFFF;font:600 12px/1 var(--ft)"><span style="{{ i20.trash }}"></span>Delete</div></sc-if>
|
||||
<div style="{{ f.rs }}">
|
||||
<div style="{{ f.tile }}"><span style="{{ f.ico }}"></span></div>
|
||||
<div style="flex:1;min-width:0;display:flex;flex-direction:column;gap:4px">
|
||||
<div style="font:500 16px/1.2 var(--ft);color:var(--fg1);white-space:nowrap;overflow:hidden;text-overflow:ellipsis">{{ f.name }}</div>
|
||||
<div style="display:flex;align-items:center;gap:5px;font:400 13px/1.2 var(--ft);color:var(--fg3);white-space:nowrap;overflow:hidden">
|
||||
<sc-if value="{{ f.hasBadge }}"><span style="{{ f.badge }}"></span></sc-if>
|
||||
<sc-if value="{{ f.shared }}"><span style="{{ i14.users }}"></span></sc-if>
|
||||
<span style="flex:0 1 auto;min-width:0;overflow:hidden;text-overflow:ellipsis">{{ f.meta }}</span>
|
||||
</div>
|
||||
</div>
|
||||
<sc-if value="{{ f.fav }}"><span style="{{ starSm }}"></span></sc-if>
|
||||
<div style="width:32px;height:40px;display:flex;align-items:center;justify-content:center"><span style="{{ trail }}"></span></div>
|
||||
</div>
|
||||
</div>
|
||||
</sc-for>
|
||||
</div>
|
||||
</div>
|
||||
</sc-for>
|
||||
</div>
|
||||
</sc-if>
|
||||
|
||||
<sc-if value="{{ showGrid }}">
|
||||
<div style="display:grid;grid-template-columns:minmax(0,1fr) minmax(0,1fr);gap:10px;padding:0 12px 16px">
|
||||
<sc-for list="{{ gridRows }}" as="f" hint-placeholder-count="6">
|
||||
<div style="background:var(--sf);border-radius:18px;overflow:hidden;display:flex;flex-direction:column">
|
||||
<div style="{{ f.thumb }}"><span style="{{ f.icoL }}"></span></div>
|
||||
<div style="padding:10px 8px 12px 12px;display:flex;flex-direction:column;gap:5px">
|
||||
<div style="display:flex;align-items:center;gap:4px"><div style="flex:1;min-width:0;font:500 14px/1.2 var(--ft);white-space:nowrap;overflow:hidden;text-overflow:ellipsis">{{ f.name }}</div><span style="{{ moreSm }}"></span></div>
|
||||
<div style="display:flex;align-items:center;gap:4px;font:400 12px/1.2 var(--ft);color:var(--fg3);white-space:nowrap"><sc-if value="{{ f.hasBadge }}"><span style="{{ f.badge }}"></span></sc-if><sc-if value="{{ f.fav }}"><span style="{{ starXs }}"></span></sc-if>{{ f.size }}</div>
|
||||
</div>
|
||||
</div>
|
||||
</sc-for>
|
||||
</div>
|
||||
</sc-if>
|
||||
|
||||
<sc-if value="{{ s.photos }}">
|
||||
<div style="flex:none;display:flex;gap:8px;padding:4px 12px 4px">
|
||||
<div style="height:34px;padding:0 14px;border-radius:999px;background:var(--acs);color:var(--act);display:flex;align-items:center;font:600 14px/1 var(--ft);white-space:nowrap">All</div>
|
||||
<div style="height:34px;padding:0 14px;border-radius:999px;background:var(--sf);display:flex;align-items:center;font:500 14px/1 var(--ft);white-space:nowrap">Photos</div>
|
||||
<div style="height:34px;padding:0 14px;border-radius:999px;background:var(--sf);display:flex;align-items:center;font:500 14px/1 var(--ft);white-space:nowrap">Videos</div>
|
||||
<div style="height:34px;padding:0 14px;border-radius:999px;background:var(--sf);display:flex;align-items:center;gap:6px;font:500 14px/1 var(--ft);white-space:nowrap"><span style="{{ i16.camera }}"></span>Camera</div>
|
||||
</div>
|
||||
<sc-for list="{{ photoGroups }}" as="g" hint-placeholder-count="2">
|
||||
<div style="display:flex;justify-content:space-between;align-items:baseline;padding:16px 16px 10px"><div style="font:500 18px/1 var(--fd);letter-spacing:-0.02em">{{ g.label }}</div><div style="font:400 13px/1 var(--ft);color:var(--fg3)">{{ g.count }}</div></div>
|
||||
<div style="display:grid;grid-template-columns:repeat(3,minmax(0,1fr));gap:2px">
|
||||
<sc-for list="{{ g.tiles }}" as="t" hint-placeholder-count="9">
|
||||
<div style="{{ t.s }}"><sc-if value="{{ t.vid }}"><div style="position:absolute;right:6px;bottom:6px;height:20px;padding:0 7px 0 5px;border-radius:999px;background:rgba(14,13,11,0.7);color:#FFFFFF;display:flex;align-items:center;gap:3px;font:600 11px/1 var(--ft)"><span style="{{ i14.play }}"></span>{{ t.dur }}</div></sc-if></div>
|
||||
</sc-for>
|
||||
</div>
|
||||
</sc-for>
|
||||
</sc-if>
|
||||
|
||||
<sc-if value="{{ s.activity }}">
|
||||
<div style="display:flex;flex-direction:column;gap:18px;padding:0 12px 16px">
|
||||
<sc-for list="{{ act }}" as="g" hint-placeholder-count="2">
|
||||
<div style="display:flex;flex-direction:column;gap:8px">
|
||||
<div style="padding:0 8px;font:600 13px/1 var(--ft);color:var(--fg2)">{{ g.label }}</div>
|
||||
<div style="display:flex;flex-direction:column;gap:1px;background:var(--ln);border-radius:20px;overflow:hidden">
|
||||
<sc-for list="{{ g.items }}" as="a" hint-placeholder-count="3">
|
||||
<div style="display:flex;gap:12px;padding:14px;background:var(--sf);align-items:flex-start">
|
||||
<div style="{{ a.av }}">{{ a.who }}</div>
|
||||
<div style="flex:1;min-width:0;display:flex;flex-direction:column;gap:5px">
|
||||
<div style="font:400 15px/1.3 var(--ft);color:var(--fg1);text-wrap:pretty"><span style="font-weight:600">{{ a.name }}</span> {{ a.verb }} <span style="font-weight:600">{{ a.obj }}</span> {{ a.tail }}</div>
|
||||
<div style="font:400 13px/1 var(--ft);color:var(--fg3)">{{ a.time }}</div>
|
||||
</div>
|
||||
<div style="{{ a.tile }}"><span style="{{ a.ico }}"></span></div>
|
||||
</div>
|
||||
</sc-for>
|
||||
</div>
|
||||
</div>
|
||||
</sc-for>
|
||||
</div>
|
||||
</sc-if>
|
||||
|
||||
<sc-if value="{{ s.settings }}">
|
||||
<div style="display:flex;flex-direction:column;gap:20px;padding:0 12px 16px">
|
||||
<div style="padding:18px;border-radius:20px;background:var(--sf);display:flex;flex-direction:column;gap:16px">
|
||||
<div style="display:flex;gap:14px;align-items:center">
|
||||
<div style="width:56px;height:56px;border-radius:999px;background:var(--acs);color:var(--act);display:flex;align-items:center;justify-content:center;font:600 20px/1 var(--ft);flex:none">MR</div>
|
||||
<div style="display:flex;flex-direction:column;gap:5px;flex:1;min-width:0"><div style="font:500 20px/1 var(--fd);letter-spacing:-0.02em">Marina Rocha</div><div style="font:400 14px/1 var(--ft);color:var(--fg2)">marina@rocha.family</div></div>
|
||||
</div>
|
||||
<div style="display:flex;gap:12px;align-items:center;padding:12px 14px;border-radius:14px;background:var(--sf2)">
|
||||
<span style="{{ i18.server }}"></span>
|
||||
<div style="flex:1;min-width:0;display:flex;flex-direction:column;gap:4px"><div style="font:500 15px/1.1 var(--ft)">cloud.rocha.family</div><div style="font:400 13px/1 var(--ft);color:var(--fg3)">Nextcloud 30.0.2</div></div>
|
||||
<div style="height:24px;padding:0 10px;border-radius:999px;background:var(--oks);color:var(--ok);display:flex;align-items:center;font:600 12px/1 var(--ft);white-space:nowrap">Connected</div>
|
||||
</div>
|
||||
<div style="display:flex;flex-direction:column;gap:8px">
|
||||
<div style="display:flex;justify-content:space-between;font:400 14px/1 var(--ft)"><span style="font-weight:500">Storage</span><span style="color:var(--fg2)">38.2 of 100 GB</span></div>
|
||||
<div style="height:6px;border-radius:999px;background:var(--sf3);overflow:hidden"><div style="width:38%;height:100%;background:var(--ac)"></div></div>
|
||||
</div>
|
||||
<div style="display:flex;gap:8px">
|
||||
<div style="flex:1;height:44px;border-radius:999px;background:var(--sf2);display:flex;align-items:center;justify-content:center;gap:8px;font:600 15px/1 var(--ft)"><span style="{{ i16.external }}"></span>Manage on web</div>
|
||||
<div style="flex:1;height:44px;border-radius:999px;background:var(--dgs);color:var(--dg);display:flex;align-items:center;justify-content:center;gap:8px;font:600 15px/1 var(--ft)"><span style="{{ i16.logout }}"></span>Log out</div>
|
||||
</div>
|
||||
</div>
|
||||
<div style="display:flex;flex-direction:column;gap:8px">
|
||||
<div style="padding:0 8px;font:600 13px/1 var(--ft);color:var(--fg2)">Accounts</div>
|
||||
<div style="display:flex;flex-direction:column;gap:1px;background:var(--ln);border-radius:20px;overflow:hidden">
|
||||
<div style="display:flex;align-items:center;gap:14px;padding:0 16px;height:60px;background:var(--sf)"><div style="width:36px;height:36px;border-radius:999px;background:var(--acs);color:var(--act);display:flex;align-items:center;justify-content:center;font:600 13px/1 var(--ft)">MR</div><div style="flex:1;display:flex;flex-direction:column;gap:4px"><div style="font:500 16px/1 var(--ft)">Marina Rocha</div><div style="font:400 13px/1 var(--ft);color:var(--fg3)">cloud.rocha.family</div></div><span style="{{ checkA }}"></span></div>
|
||||
<div style="display:flex;align-items:center;gap:14px;padding:0 16px;height:60px;background:var(--sf)"><div style="width:36px;height:36px;border-radius:999px;background:#85D1BD;color:#0E0D0B;display:flex;align-items:center;justify-content:center;font:600 13px/1 var(--ft)">MR</div><div style="flex:1;display:flex;flex-direction:column;gap:4px"><div style="font:500 16px/1 var(--ft)">Marina · Work</div><div style="font:400 13px/1 var(--ft);color:var(--fg3)">files.acme-studio.com</div></div></div>
|
||||
<div style="display:flex;align-items:center;gap:14px;padding:0 16px;height:52px;background:var(--sf);color:var(--act);font:600 15px/1 var(--ft)"><div style="width:36px;display:flex;justify-content:center"><span style="{{ i20.plus }}"></span></div>Add account</div>
|
||||
</div>
|
||||
</div>
|
||||
<div style="display:flex;flex-direction:column;gap:8px">
|
||||
<div style="padding:0 8px;font:600 13px/1 var(--ft);color:var(--fg2)">Security</div>
|
||||
<div style="display:flex;flex-direction:column;gap:1px;background:var(--ln);border-radius:20px;overflow:hidden">
|
||||
<div style="display:flex;align-items:center;gap:14px;padding:12px 16px;min-height:60px;box-sizing:border-box;background:var(--sf)"><span style="{{ bioIco }}"></span><div style="flex:1;display:flex;flex-direction:column;gap:4px"><div style="font:400 16px/1.1 var(--ft)">{{ bioLabel }}</div><div style="font:400 13px/1.2 var(--ft);color:var(--fg3)">Needed every time you open the app</div></div><div style="width:48px;height:28px;border-radius:999px;background:var(--ac);padding:3px;box-sizing:border-box;display:flex;justify-content:flex-end;flex:none"><div style="width:22px;height:22px;border-radius:999px;background:#FFFFFF"></div></div></div>
|
||||
<div style="display:flex;align-items:center;gap:14px;padding:0 16px;height:52px;background:var(--sf)"><span style="{{ i20.timer }}"></span><div style="flex:1;font:400 16px/1 var(--ft)">Lock after</div><div style="display:flex;align-items:center;gap:4px;font:400 15px/1 var(--ft);color:var(--fg3)">1 minute<span style="{{ i18.chevR }}"></span></div></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</sc-if>
|
||||
|
||||
<sc-if value="{{ s.settings2 }}">
|
||||
<div style="display:flex;flex-direction:column;gap:20px;padding:0 12px 16px">
|
||||
<div style="display:flex;flex-direction:column;gap:8px">
|
||||
<div style="padding:0 8px;font:600 13px/1 var(--ft);color:var(--fg2)">File sync</div>
|
||||
<div style="display:flex;flex-direction:column;gap:1px;background:var(--ln);border-radius:20px;overflow:hidden">
|
||||
<div style="display:flex;align-items:center;gap:14px;padding:12px 16px;min-height:60px;box-sizing:border-box;background:var(--sf)"><span style="{{ i20.camera }}"></span><div style="flex:1;display:flex;flex-direction:column;gap:4px"><div style="font:400 16px/1.1 var(--ft)">Auto-upload photos</div><div style="font:400 13px/1.2 var(--ft);color:var(--fg3)">To /Photos/Camera</div></div><div style="width:48px;height:28px;border-radius:999px;background:var(--ac);padding:3px;box-sizing:border-box;display:flex;justify-content:flex-end;flex:none"><div style="width:22px;height:22px;border-radius:999px;background:#FFFFFF"></div></div></div>
|
||||
<div style="display:flex;align-items:center;gap:14px;padding:0 16px;height:52px;background:var(--sf)"><span style="{{ i20.wifi }}"></span><div style="flex:1;font:400 16px/1 var(--ft)">Wi-Fi only</div><div style="width:48px;height:28px;border-radius:999px;background:var(--ac);padding:3px;box-sizing:border-box;display:flex;justify-content:flex-end;flex:none"><div style="width:22px;height:22px;border-radius:999px;background:#FFFFFF"></div></div></div>
|
||||
<div style="display:flex;align-items:center;gap:14px;padding:0 16px;height:52px;background:var(--sf)"><span style="{{ i20.charging }}"></span><div style="flex:1;font:400 16px/1 var(--ft)">Only while charging</div><div style="width:48px;height:28px;border-radius:999px;background:var(--sf3);padding:3px;box-sizing:border-box;display:flex;justify-content:flex-start;flex:none"><div style="width:22px;height:22px;border-radius:999px;background:#FFFFFF"></div></div></div>
|
||||
<div style="display:flex;align-items:center;gap:14px;padding:0 16px;height:52px;background:var(--sf)"><span style="{{ i20.sync }}"></span><div style="flex:1;font:400 16px/1 var(--ft)">Refresh offline files</div><div style="display:flex;align-items:center;gap:4px;font:400 15px/1 var(--ft);color:var(--fg3)">Every 15 min<span style="{{ i18.chevR }}"></span></div></div>
|
||||
</div>
|
||||
</div>
|
||||
<div style="display:flex;flex-direction:column;gap:8px">
|
||||
<div style="padding:0 8px;font:600 13px/1 var(--ft);color:var(--fg2)">Files cache</div>
|
||||
<div style="display:flex;flex-direction:column;gap:1px;background:var(--ln);border-radius:20px;overflow:hidden">
|
||||
<div style="display:flex;flex-direction:column;gap:10px;padding:14px 16px;background:var(--sf)"><div style="display:flex;justify-content:space-between;font:400 16px/1 var(--ft)"><span>Cache in use</span><span style="color:var(--fg3);font-size:15px">1.2 of 2 GB</span></div><div style="height:6px;border-radius:999px;background:var(--sf3);overflow:hidden"><div style="width:60%;height:100%;background:var(--ac)"></div></div></div>
|
||||
<div style="display:flex;align-items:center;gap:14px;padding:0 16px;height:52px;background:var(--sf)"><span style="{{ i20.database }}"></span><div style="flex:1;font:400 16px/1 var(--ft)">Cache limit</div><div style="display:flex;align-items:center;gap:4px;font:400 15px/1 var(--ft);color:var(--fg3)">2 GB<span style="{{ i18.chevR }}"></span></div></div>
|
||||
<div style="display:flex;align-items:center;gap:14px;padding:0 16px;height:52px;background:var(--sf);color:var(--dg)"><span style="{{ i20.trash }}"></span><div style="flex:1;font:500 16px/1 var(--ft)">Clear cache</div></div>
|
||||
</div>
|
||||
</div>
|
||||
<div style="display:flex;flex-direction:column;gap:8px">
|
||||
<div style="padding:0 8px;font:600 13px/1 var(--ft);color:var(--fg2)">Appearance</div>
|
||||
<div style="display:flex;flex-direction:column;gap:1px;background:var(--ln);border-radius:20px;overflow:hidden">
|
||||
<div style="display:flex;align-items:center;gap:12px;padding:0 12px 0 16px;height:56px;background:var(--sf)"><div style="flex:1;font:400 16px/1 var(--ft)">Theme</div><div style="display:flex;padding:3px;border-radius:999px;background:var(--sf2);gap:2px"><div style="height:30px;padding:0 12px;border-radius:999px;background:var(--acs);color:var(--act);display:flex;align-items:center;font:600 13px/1 var(--ft);white-space:nowrap">System</div><div style="height:30px;padding:0 12px;display:flex;align-items:center;font:500 13px/1 var(--ft);color:var(--fg2)">Light</div><div style="height:30px;padding:0 12px;display:flex;align-items:center;font:500 13px/1 var(--ft);color:var(--fg2)">Dark</div></div></div>
|
||||
<div style="display:flex;align-items:center;gap:12px;padding:0 12px 0 16px;height:56px;background:var(--sf)"><div style="flex:1;font:400 16px/1 var(--ft)">Default view</div><div style="display:flex;padding:3px;border-radius:999px;background:var(--sf2);gap:2px"><div style="height:30px;padding:0 12px;border-radius:999px;background:var(--acs);color:var(--act);display:flex;align-items:center;gap:6px;font:600 13px/1 var(--ft);white-space:nowrap"><span style="{{ i14.list }}"></span>List</div><div style="height:30px;padding:0 12px;display:flex;align-items:center;gap:6px;font:500 13px/1 var(--ft);color:var(--fg2)"><span style="{{ i14.grid }}"></span>Grid</div></div></div>
|
||||
<div style="display:flex;align-items:center;gap:14px;padding:0 16px;height:52px;background:var(--sf)"><div style="flex:1;font:400 16px/1 var(--ft)">Show hidden files</div><div style="width:48px;height:28px;border-radius:999px;background:var(--sf3);padding:3px;box-sizing:border-box;display:flex;justify-content:flex-start;flex:none"><div style="width:22px;height:22px;border-radius:999px;background:#FFFFFF"></div></div></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</sc-if>
|
||||
|
||||
<sc-if value="{{ s.settings3 }}">
|
||||
<div style="display:flex;flex-direction:column;gap:20px;padding:0 12px 16px">
|
||||
<div style="display:flex;flex-direction:column;gap:8px">
|
||||
<div style="padding:0 8px;display:flex;justify-content:space-between;font:600 13px/1 var(--ft);color:var(--fg2)"><span>Tabs</span><span style="font-weight:500;color:var(--fg3)">5 of 5 pinned</span></div>
|
||||
<div style="display:flex;flex-direction:column;gap:1px;background:var(--ln);border-radius:20px;overflow:hidden">
|
||||
<sc-for list="{{ tabRows }}" as="t" hint-placeholder-count="8">
|
||||
<div style="display:flex;align-items:center;gap:12px;padding:0 10px 0 10px;height:52px;background:var(--sf)">
|
||||
<span style="{{ gripS }}"></span>
|
||||
<span style="{{ t.ico }}"></span>
|
||||
<div style="flex:1;font:400 16px/1 var(--ft)">{{ t.label }}</div>
|
||||
<div style="{{ t.pinS }}"><span style="{{ t.pinI }}"></span></div>
|
||||
</div>
|
||||
</sc-for>
|
||||
</div>
|
||||
<div style="padding:0 8px;font:400 13px/1.3 var(--ft);color:var(--fg3);text-wrap:pretty">Pinned tabs sit in the bottom bar. The rest live in the menu. Drag to reorder.</div>
|
||||
</div>
|
||||
<div style="display:flex;flex-direction:column;gap:8px">
|
||||
<div style="padding:0 8px;font:600 13px/1 var(--ft);color:var(--fg2)">Swipe on a file</div>
|
||||
<div style="display:flex;flex-direction:column;gap:1px;background:var(--ln);border-radius:20px;overflow:hidden">
|
||||
<div style="display:flex;align-items:center;gap:14px;padding:0 16px;height:52px;background:var(--sf)"><span style="{{ i20.swipe }}"></span><div style="flex:1;font:400 16px/1 var(--ft)">Swipe left</div><div style="height:28px;padding:0 10px;border-radius:999px;background:var(--dgs);color:var(--dg);display:flex;align-items:center;gap:5px;font:600 13px/1 var(--ft);white-space:nowrap"><span style="{{ i14.trash }}"></span>Delete</div><span style="{{ chevG }}"></span></div>
|
||||
<div style="display:flex;align-items:center;gap:14px;padding:0 16px;height:52px;background:var(--sf)"><span style="{{ i20.swipe }}"></span><div style="flex:1;font:400 16px/1 var(--ft)">Swipe right</div><div style="height:28px;padding:0 10px;border-radius:999px;background:var(--acs);color:var(--act);display:flex;align-items:center;gap:5px;font:600 13px/1 var(--ft);white-space:nowrap"><span style="{{ i14.star }}"></span>Favorite</div><span style="{{ chevG }}"></span></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</sc-if>
|
||||
|
||||
<sc-if value="{{ fab }}">
|
||||
<div style="position:absolute;right:16px;bottom:16px;height:56px;padding:0 20px 0 16px;border-radius:999px;background:var(--ac);color:#FFFFFF;display:flex;align-items:center;gap:10px;font:600 16px/1 var(--ft)"><span style="{{ i24.plus }}"></span>Upload</div>
|
||||
</sc-if>
|
||||
</div>
|
||||
|
||||
<sc-if value="{{ aNav }}">
|
||||
<div style="flex:none;background:var(--sf);display:flex;flex-direction:column">
|
||||
<div style="display:flex;height:80px;align-items:center">
|
||||
<sc-for list="{{ nav }}" as="n" hint-placeholder-count="5">
|
||||
<div style="flex:1;display:flex;flex-direction:column;align-items:center;gap:4px">
|
||||
<sc-if value="{{ n.on }}"><div style="width:56px;height:32px;border-radius:999px;background:var(--acs);color:var(--act);display:flex;align-items:center;justify-content:center"><span style="{{ n.ico }}"></span></div><div style="font:600 12px/1 var(--ft);color:var(--fg1)">{{ n.label }}</div></sc-if>
|
||||
<sc-if value="{{ n.off }}"><div style="width:56px;height:32px;color:var(--fg2);display:flex;align-items:center;justify-content:center"><span style="{{ n.ico }}"></span></div><div style="font:500 12px/1 var(--ft);color:var(--fg2)">{{ n.label }}</div></sc-if>
|
||||
</div>
|
||||
</sc-for>
|
||||
</div>
|
||||
<div style="height:20px;display:flex;align-items:center;justify-content:center"><div style="width:108px;height:4px;border-radius:999px;background:var(--fg3)"></div></div>
|
||||
</div>
|
||||
</sc-if>
|
||||
<sc-if value="{{ iNav }}">
|
||||
<div style="flex:none;background:var(--sf);border-top:1px solid var(--ln);display:flex;flex-direction:column">
|
||||
<div style="display:flex;padding-top:8px;height:50px;box-sizing:border-box">
|
||||
<sc-for list="{{ nav }}" as="n" hint-placeholder-count="5">
|
||||
<sc-if value="{{ n.on }}"><div style="flex:1;display:flex;flex-direction:column;align-items:center;gap:4px;color:var(--act);font:600 10px/1 var(--ft)"><span style="{{ n.ico }}"></span>{{ n.label }}</div></sc-if>
|
||||
<sc-if value="{{ n.off }}"><div style="flex:1;display:flex;flex-direction:column;align-items:center;gap:4px;color:var(--fg3);font:500 10px/1 var(--ft)"><span style="{{ n.ico }}"></span>{{ n.label }}</div></sc-if>
|
||||
</sc-for>
|
||||
</div>
|
||||
<div style="height:34px;display:flex;align-items:flex-end;justify-content:center;padding-bottom:8px;box-sizing:border-box"><div style="width:134px;height:5px;border-radius:999px;background:var(--fg1)"></div></div>
|
||||
</div>
|
||||
</sc-if>
|
||||
<sc-if value="{{ aGesture }}"><div style="height:24px;flex:none;display:flex;align-items:center;justify-content:center"><div style="width:108px;height:4px;border-radius:999px;background:var(--fg3)"></div></div></sc-if>
|
||||
<sc-if value="{{ iGesture }}"><div style="height:34px;flex:none;display:flex;align-items:flex-end;justify-content:center;padding-bottom:8px;box-sizing:border-box"><div style="width:134px;height:5px;border-radius:999px;background:var(--fg1)"></div></div></sc-if>
|
||||
|
||||
<sc-if value="{{ drawer }}">
|
||||
<div style="position:absolute;inset:0;background:var(--scrim)"></div>
|
||||
<div style="position:absolute;left:0;top:0;bottom:0;width:316px;background:var(--sf);border-radius:0 28px 28px 0;display:flex;flex-direction:column;padding:64px 12px 28px;box-sizing:border-box;gap:4px">
|
||||
<div style="display:flex;gap:12px;align-items:center;padding:0 12px 14px">
|
||||
<div style="width:48px;height:48px;border-radius:999px;background:var(--acs);color:var(--act);display:flex;align-items:center;justify-content:center;font:600 17px/1 var(--ft);flex:none">MR</div>
|
||||
<div style="flex:1;min-width:0;display:flex;flex-direction:column;gap:5px"><div style="font:500 18px/1 var(--fd);letter-spacing:-0.02em">Marina Rocha</div><div style="font:400 13px/1 var(--ft);color:var(--fg3)">cloud.rocha.family</div></div>
|
||||
<div style="width:36px;height:36px;border-radius:999px;background:var(--sf2);display:flex;align-items:center;justify-content:center"><span style="{{ i18.chevD }}"></span></div>
|
||||
</div>
|
||||
<div style="display:flex;flex-direction:column;gap:8px;padding:0 12px 16px">
|
||||
<div style="height:6px;border-radius:999px;background:var(--sf3);overflow:hidden"><div style="width:38%;height:100%;background:var(--ac)"></div></div>
|
||||
<div style="font:400 13px/1 var(--ft);color:var(--fg3)">38.2 GB of 100 GB used</div>
|
||||
</div>
|
||||
<div style="height:1px;background:var(--ln);margin:0 12px 8px"></div>
|
||||
<div style="padding:8px 16px;font:600 13px/1 var(--ft);color:var(--fg2)">More</div>
|
||||
<sc-for list="{{ menuRows }}" as="m" hint-placeholder-count="3">
|
||||
<div style="height:52px;border-radius:999px;padding:0 16px;display:flex;align-items:center;gap:14px;font:500 16px/1 var(--ft)"><span style="{{ m.ico }}"></span><div style="flex:1">{{ m.label }}</div><div style="font:500 14px/1 var(--ft);color:var(--fg3)">{{ m.count }}</div></div>
|
||||
</sc-for>
|
||||
<div style="height:1px;background:var(--ln);margin:8px 12px"></div>
|
||||
<div style="height:52px;border-radius:999px;padding:0 16px;display:flex;align-items:center;gap:14px;font:500 16px/1 var(--ft)"><span style="{{ i24.settings }}"></span>Settings</div>
|
||||
<div style="flex:1"></div>
|
||||
<div style="padding:0 16px;display:flex;align-items:center;gap:8px;font:600 14px/1 var(--ft);color:var(--act)"><span style="{{ i16.pencil }}"></span>Edit tabs</div>
|
||||
</div>
|
||||
</sc-if>
|
||||
|
||||
<sc-if value="{{ share }}">
|
||||
<div style="position:absolute;inset:0;background:var(--scrim)"></div>
|
||||
<div style="position:absolute;left:0;right:0;bottom:0;background:var(--sf);border-radius:28px 28px 0 0;padding:10px 20px 40px;display:flex;flex-direction:column;gap:22px">
|
||||
<div style="align-self:center;width:36px;height:5px;border-radius:999px;background:var(--sf3)"></div>
|
||||
<div style="display:flex;gap:12px;align-items:center">
|
||||
<div style="{{ shareTile }}"><span style="{{ i24.doc }}"></span></div>
|
||||
<div style="flex:1;min-width:0;display:flex;flex-direction:column;gap:5px"><div style="font:500 19px/1 var(--fd);letter-spacing:-0.02em">Q3 Planning.pdf</div><div style="font:400 13px/1 var(--ft);color:var(--fg3)">2.4 MB · Documents</div></div>
|
||||
<div style="width:36px;height:36px;border-radius:999px;background:var(--sf2);display:flex;align-items:center;justify-content:center"><span style="{{ i18.x }}"></span></div>
|
||||
</div>
|
||||
<div style="display:flex;flex-direction:column;gap:12px">
|
||||
<div style="font:500 17px/1 var(--fd);letter-spacing:-0.02em">Share with people</div>
|
||||
<div style="height:48px;border-radius:14px;background:var(--sf2);display:flex;align-items:center;gap:10px;padding:0 14px;color:var(--fg3);font:400 15px/1 var(--ft)"><span style="{{ i20.userPlus }}"></span>Name, email or group</div>
|
||||
<div style="display:flex;flex-direction:column;gap:14px;padding-top:4px">
|
||||
<div style="display:flex;align-items:center;gap:12px"><div style="{{ avYou }}">MR</div><div style="flex:1;display:flex;flex-direction:column;gap:4px"><div style="font:500 15px/1 var(--ft)">You</div><div style="font:400 13px/1 var(--ft);color:var(--fg3)">marina@rocha.family</div></div><div style="font:500 13px/1 var(--ft);color:var(--fg3);padding-right:4px">Owner</div></div>
|
||||
<div style="display:flex;align-items:center;gap:12px"><div style="{{ avAna }}">AS</div><div style="flex:1;display:flex;flex-direction:column;gap:4px"><div style="font:500 15px/1 var(--ft)">Ana Souza</div><div style="font:400 13px/1 var(--ft);color:var(--fg3)">ana@rocha.family</div></div><div style="height:30px;padding:0 8px 0 12px;border-radius:999px;border:1px solid var(--ln);display:flex;align-items:center;gap:4px;font:500 13px/1 var(--ft);white-space:nowrap">Can edit<span style="{{ i14.chevD }}"></span></div></div>
|
||||
<div style="display:flex;align-items:center;gap:12px"><div style="width:36px;height:36px;border-radius:999px;background:var(--sf2);color:var(--fg2);display:flex;align-items:center;justify-content:center;flex:none"><span style="{{ i18.users }}"></span></div><div style="flex:1;display:flex;flex-direction:column;gap:4px"><div style="font:500 15px/1 var(--ft)">Design team</div><div style="font:400 13px/1 var(--ft);color:var(--fg3)">Group · 6 people</div></div><div style="height:30px;padding:0 8px 0 12px;border-radius:999px;border:1px solid var(--ln);display:flex;align-items:center;gap:4px;font:500 13px/1 var(--ft);white-space:nowrap">Can view<span style="{{ i14.chevD }}"></span></div></div>
|
||||
</div>
|
||||
</div>
|
||||
<div style="height:1px;background:var(--ln)"></div>
|
||||
<div style="display:flex;flex-direction:column;gap:12px">
|
||||
<div style="display:flex;justify-content:space-between;align-items:center"><div style="display:flex;flex-direction:column;gap:5px"><div style="font:500 17px/1 var(--fd);letter-spacing:-0.02em">Share link</div><div style="font:400 13px/1 var(--ft);color:var(--fg3)">Anyone with the link can view</div></div><div style="width:48px;height:28px;border-radius:999px;background:var(--ac);padding:3px;box-sizing:border-box;display:flex;justify-content:flex-end;flex:none"><div style="width:22px;height:22px;border-radius:999px;background:#FFFFFF"></div></div></div>
|
||||
<div style="border-radius:16px;background:var(--sf2);padding:6px 6px 6px 14px;display:flex;gap:10px;align-items:center;color:var(--fg2)"><span style="{{ i18.link }}"></span><div style="flex:1;min-width:0;font:400 14px/1 ui-monospace,Menlo,monospace;color:var(--fg1);white-space:nowrap;overflow:hidden;text-overflow:ellipsis">cloud.rocha.family/s/k7Pq2xW</div><div style="height:40px;padding:0 16px;border-radius:999px;background:var(--ac);color:#FFFFFF;display:flex;align-items:center;gap:6px;font:600 14px/1 var(--ft);white-space:nowrap"><span style="{{ i16.copy }}"></span>Copy link</div></div>
|
||||
<div style="display:flex;gap:8px;flex-wrap:wrap">
|
||||
<div style="height:32px;padding:0 12px;border-radius:999px;border:1px solid var(--ln);display:flex;align-items:center;gap:6px;font:500 13px/1 var(--ft);white-space:nowrap"><span style="{{ i14.eye }}"></span>Can view<span style="{{ i14.chevD }}"></span></div>
|
||||
<div style="height:32px;padding:0 12px;border-radius:999px;background:var(--acs);color:var(--act);display:flex;align-items:center;gap:6px;font:600 13px/1 var(--ft);white-space:nowrap"><span style="{{ i14.calendar }}"></span>Expires Oct 24</div>
|
||||
<div style="height:32px;padding:0 12px;border-radius:999px;border:1px solid var(--ln);display:flex;align-items:center;gap:6px;font:500 13px/1 var(--ft);white-space:nowrap"><span style="{{ i14.lock }}"></span>Add password</div>
|
||||
</div>
|
||||
</div>
|
||||
<div style="display:flex;flex-direction:column;gap:10px">
|
||||
<div style="height:52px;border-radius:999px;border:1.5px solid var(--sf3);display:flex;align-items:center;justify-content:center;gap:10px;font:600 16px/1 var(--ft)"><span style="{{ i20.send }}"></span>Send file directly</div>
|
||||
<div style="font:400 13px/1.3 var(--ft);color:var(--fg3);text-align:center">Sends a copy through another app. Link settings don’t apply.</div>
|
||||
</div>
|
||||
</div>
|
||||
</sc-if>
|
||||
|
||||
</div>
|
||||
</sc-if>
|
||||
</x-dc>
|
||||
<script type="text/x-dc" data-dc-script data-props="{"$preview":{"width":390,"height":844},"platform":{"editor":"enum","options":["ios","android"],"default":"ios","tsType":"'ios'|'android'"},"screen":{"editor":"enum","options":["files","filesGrid","photos","favorites","offline","shares","recent","activity","trash","drawer","share","settings","settings2","settings3"],"default":"files","tsType":"string"},"theme":{"editor":"enum","options":["light","dark"],"default":"light","tsType":"'light'|'dark'"}}">
|
||||
class Component extends DCLogic {
|
||||
componentDidMount() {
|
||||
if (!window.NK) this._t = setInterval(() => { if (window.NK) { clearInterval(this._t); this.forceUpdate(); } }, 40);
|
||||
}
|
||||
componentWillUnmount() { clearInterval(this._t); }
|
||||
renderVals() {
|
||||
const K = window.NK;
|
||||
if (!K) return { ready: false };
|
||||
const { I, ic, D, row, TH, tile, tiles, avatar } = K;
|
||||
const ios = this.props.platform !== 'android', android = !ios;
|
||||
const sc = this.props.screen || 'files';
|
||||
const theme = this.props.theme === 'dark' ? 'dark' : 'light';
|
||||
const drawer = sc === 'drawer', share = sc === 'share';
|
||||
const grid = sc === 'filesGrid';
|
||||
const base = (drawer || share || grid) ? 'files' : sc;
|
||||
const settings = base.startsWith('settings');
|
||||
const s = {}; ['files','photos','activity','trash','favorites','offline','shares','recent','settings','settings2','settings3'].forEach(k => s[k] = base === k);
|
||||
const ROW = { display: 'flex', alignItems: 'center', gap: 14, padding: '0 6px 0 14px', height: 64, background: 'var(--sf)', position: 'relative' };
|
||||
const mk = (list, o = {}) => list.map(f => { const r = row(f, o); r.rs = { ...ROW, transform: r.swiped ? 'translateX(-96px)' : 'none' }; return r; });
|
||||
const noSwipe = drawer || share;
|
||||
let groups = [], trail = ic(ios ? 'moreH' : 'moreV', 20, 'var(--fg3)');
|
||||
if (base === 'files') groups = [{ rows: mk(D.files, { noSwipe }) }];
|
||||
if (base === 'favorites') { groups = [{ rows: mk(D.favorites, { noFav: 1 }) }]; trail = ic('star', 20, 'var(--act)'); }
|
||||
if (base === 'offline') groups = [{ rows: mk(D.offline) }];
|
||||
if (base === 'shares') groups = [{ rows: mk(D.shares) }];
|
||||
if (base === 'recent') groups = D.recent.map(g => ({ label: g.label, rows: mk(g.rows) }));
|
||||
if (base === 'trash') { groups = [{ rows: mk(D.trash) }]; trail = ic('restore', 20, 'var(--act)'); }
|
||||
groups = groups.map(g => ({ ...g, hasLabel: !!g.label }));
|
||||
const title = settings ? 'Settings' : D.titles[base];
|
||||
const seg = on => ({ width: 36, height: 28, borderRadius: 999, display: 'flex', alignItems: 'center', justifyContent: 'center', background: on ? 'var(--acs)' : 'transparent', color: on ? 'var(--act)' : 'var(--fg3)' });
|
||||
return {
|
||||
ready: true, ios, android, s, title, groups, trail, drawer, share,
|
||||
root: { ...TH[theme], width: 390, height: 844, borderRadius: ios ? 48 : 36, overflow: 'hidden', position: 'relative', display: 'flex', flexDirection: 'column', background: 'var(--bg)', color: 'var(--fg1)', fontFamily: 'var(--ft)' },
|
||||
i14: I[14], i16: I[16], i18: I[18], i20: I[20], i24: I[24],
|
||||
aBar: android && !settings, aSet: android && settings, iBar: ios && !settings, iSet: ios && settings,
|
||||
aNav: android && !settings, iNav: ios && !settings, aGesture: android && settings, iGesture: ios && settings,
|
||||
showList: groups.length > 0 && !grid, showGrid: grid,
|
||||
gridRows: D.files.slice(0, 8).map(f => row(f, { noSwipe: 1 })),
|
||||
segL: seg(!grid), segG: seg(grid),
|
||||
fab: android && (base === 'files' || base === 'photos'),
|
||||
starSm: ic('star', 16, 'var(--act)'), starXs: ic('star', 12, 'var(--act)'), moreSm: ic(ios ? 'moreH' : 'moreV', 16, 'var(--fg3)'),
|
||||
checkA: ic('check', 20, 'var(--act)'), chevG: ic('chevR', 18, 'var(--fg3)'), gripS: ic('grip', 18, 'var(--fg3)'),
|
||||
photoGroups: [{ label: 'September 2026', count: '38 items', tiles: tiles(18, 0, [2, 9, 13]) }, { label: 'August 2026', count: '112 items', tiles: tiles(9, 3, [4]) }],
|
||||
act: D.activity.map(g => ({ label: g.label, items: g.items.map(a => ({ ...a, av: avatar(a.col, 36), tile: tile(a.kind, 32, 10), ico: I[16][K.KIND[a.kind][2]] })) })),
|
||||
nav: D.pinned.map(([label, ico, key]) => ({ label, ico: I[24][ico], on: key === base, off: key !== base })),
|
||||
menuRows: D.menu.map(([label, ico, key, count]) => ({ label, ico: I[24][ico], count })),
|
||||
tabRows: [...D.pinned.map(([label, ico]) => ({ label, ico: I[20][ico], p: 1 })), ...D.menu.map(([label, ico]) => ({ label, ico: I[20][ico], p: 0 }))].map(t => ({ ...t,
|
||||
pinS: { width: 36, height: 36, borderRadius: 999, display: 'flex', alignItems: 'center', justifyContent: 'center', background: t.p ? 'var(--acs)' : 'var(--sf2)', color: t.p ? 'var(--act)' : 'var(--fg3)' },
|
||||
pinI: I[16][t.p ? 'pin' : 'pinOff'] })),
|
||||
bioLabel: ios ? 'Lock with Face ID' : 'Lock with fingerprint', bioIco: I[20][ios ? 'face' : 'fingerprint'],
|
||||
shareTile: tile('pdf', 44, 12), avYou: { ...avatar('#CBA5FD', 36) }, avAna: avatar('#DA9AC7', 36)
|
||||
};
|
||||
}
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -0,0 +1,202 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<script src="./support.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
<x-dc>
|
||||
<helmet>
|
||||
<script src="noo-kit.js"></script>
|
||||
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Instrument+Sans:wght@400;500;600&family=Schibsted+Grotesk:wght@500;600&display=swap">
|
||||
<style>
|
||||
body{margin:0;background:#F3EFE6}
|
||||
a{color:#8D0DE3;text-decoration:none}
|
||||
a:hover{color:#6E08B3}
|
||||
</style>
|
||||
</helmet>
|
||||
<div style="max-width:1440px;margin:0 auto;padding:64px 40px 96px;display:flex;flex-direction:column;gap:48px;font-family:'Instrument Sans',system-ui,sans-serif;color:#0E0D0B">
|
||||
<div style="display:flex;flex-direction:column;gap:16px">
|
||||
<div style="font:600 64px/0.9 'Schibsted Grotesk',system-ui,sans-serif;letter-spacing:-0.03em">Noo design system</div>
|
||||
<div style="font:400 18px/1.35 'Instrument Sans',system-ui,sans-serif;color:#5A5852;max-width:760px;text-wrap:pretty">Every component is shown in light and dark. The full rules for code are in <a href="DESIGN_SYSTEM.md">DESIGN_SYSTEM.md</a>. You can see every screen in <a href="Noo Screens.dc.html">Noo Screens</a>.</div>
|
||||
</div>
|
||||
|
||||
<sc-if value="{{ ready }}" hint-placeholder-val="{{ false }}">
|
||||
<div style="display:flex;flex-direction:column;gap:14px">
|
||||
<div style="font:500 28px/1 'Schibsted Grotesk',system-ui,sans-serif;letter-spacing:-0.02em">Type</div>
|
||||
<div style="background:#FFFFFF;border-radius:20px;padding:8px 24px">
|
||||
<sc-for list="{{ type }}" as="t" hint-placeholder-count="9">
|
||||
<div style="display:grid;grid-template-columns:200px minmax(0,1fr);gap:24px;align-items:center;padding:16px 0;border-bottom:1px solid #EAE8E2">
|
||||
<div style="font:400 13px/1.3 ui-monospace,Menlo,monospace;color:#7C7A72">{{ t.spec }}</div>
|
||||
<div style="{{ t.s }}">{{ t.sample }}</div>
|
||||
</div>
|
||||
</sc-for>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div style="display:grid;grid-template-columns:repeat(auto-fit,minmax(min(100%,600px),1fr));gap:24px">
|
||||
<sc-for list="{{ themes }}" as="th" hint-placeholder-count="2">
|
||||
<div style="{{ th.vars }}">
|
||||
<div style="display:flex;flex-direction:column;gap:28px;padding:28px;border-radius:28px;background:var(--bg);color:var(--fg1);font-family:var(--ft)">
|
||||
<div style="font:600 32px/0.9 var(--fd);letter-spacing:-0.03em">{{ th.label }}</div>
|
||||
|
||||
<div style="display:flex;flex-direction:column;gap:12px">
|
||||
<div style="font:600 13px/1 var(--ft);color:var(--fg2)">Color</div>
|
||||
<div style="display:grid;grid-template-columns:repeat(auto-fill,minmax(120px,1fr));gap:8px">
|
||||
<sc-for list="{{ th.swatches }}" as="c" hint-placeholder-count="16">
|
||||
<div style="display:flex;flex-direction:column;gap:6px;padding:6px;border-radius:14px;background:var(--sf)">
|
||||
<div style="{{ c.s }}"></div>
|
||||
<div style="padding:0 4px 4px;display:flex;flex-direction:column;gap:3px"><div style="font:600 12px/1 var(--ft)">{{ c.name }}</div><div style="font:400 11px/1 ui-monospace,Menlo,monospace;color:var(--fg3)">{{ c.hex }}</div></div>
|
||||
</div>
|
||||
</sc-for>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div style="display:flex;flex-direction:column;gap:12px">
|
||||
<div style="font:600 13px/1 var(--ft);color:var(--fg2)">File-type tiles</div>
|
||||
<div style="display:flex;gap:14px;flex-wrap:wrap">
|
||||
<sc-for list="{{ kinds }}" as="k" hint-placeholder-count="7">
|
||||
<div style="display:flex;flex-direction:column;align-items:center;gap:6px"><div style="{{ k.tile }}"><span style="{{ k.ico }}"></span></div><div style="font:500 12px/1 var(--ft);color:var(--fg2)">{{ k.name }}</div></div>
|
||||
</sc-for>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div style="display:flex;flex-direction:column;gap:12px">
|
||||
<div style="font:600 13px/1 var(--ft);color:var(--fg2)">Buttons</div>
|
||||
<div style="display:flex;gap:10px;flex-wrap:wrap;align-items:center">
|
||||
<div style="height:44px;padding:0 20px 0 16px;border-radius:999px;background:var(--ac);color:#FFFFFF;display:flex;align-items:center;gap:8px;font:600 15px/1 var(--ft);white-space:nowrap"><span style="{{ i18.plus }}"></span>Primary</div>
|
||||
<div style="height:44px;padding:0 20px;border-radius:999px;background:var(--acs);color:var(--act);display:flex;align-items:center;gap:8px;font:600 15px/1 var(--ft);white-space:nowrap"><span style="{{ i16.sync }}"></span>Tonal</div>
|
||||
<div style="height:44px;padding:0 20px;border-radius:999px;background:var(--sf2);display:flex;align-items:center;font:600 15px/1 var(--ft);white-space:nowrap">Secondary</div>
|
||||
<div style="height:44px;padding:0 20px;border-radius:999px;background:var(--dgs);color:var(--dg);display:flex;align-items:center;gap:8px;font:600 15px/1 var(--ft);white-space:nowrap"><span style="{{ i16.logout }}"></span>Danger</div>
|
||||
<div style="height:44px;padding:0 20px;border-radius:999px;border:1.5px solid var(--sf3);display:flex;align-items:center;gap:8px;font:600 15px/1 var(--ft);white-space:nowrap"><span style="{{ i16.send }}"></span>Outline</div>
|
||||
<div style="height:56px;padding:0 20px 0 16px;border-radius:999px;background:var(--ac);color:#FFFFFF;display:flex;align-items:center;gap:10px;font:600 16px/1 var(--ft);white-space:nowrap"><span style="{{ i24.plus }}"></span>FAB · Android</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div style="display:flex;flex-direction:column;gap:12px">
|
||||
<div style="font:600 13px/1 var(--ft);color:var(--fg2)">Chips, segmented, toggles, search</div>
|
||||
<div style="display:flex;gap:10px;flex-wrap:wrap;align-items:center">
|
||||
<div style="height:34px;padding:0 12px;border-radius:999px;background:var(--sf);display:flex;align-items:center;gap:6px;font:500 14px/1 var(--ft);white-space:nowrap"><span style="{{ i16.sort }}"></span>Name<span style="{{ i14.up }}"></span></div>
|
||||
<div style="height:34px;padding:0 12px;border-radius:999px;border:1px solid var(--ln);display:flex;align-items:center;gap:6px;font:500 14px/1 var(--ft);white-space:nowrap">Modified<span style="{{ i14.chevD }}"></span></div>
|
||||
<div style="height:34px;padding:0 12px;border-radius:999px;background:var(--acs);color:var(--act);display:flex;align-items:center;gap:6px;font:600 14px/1 var(--ft);white-space:nowrap">Available offline<span style="{{ i14.x }}"></span></div>
|
||||
<div style="display:flex;padding:3px;border-radius:999px;background:var(--sf);gap:2px"><div style="width:36px;height:28px;border-radius:999px;background:var(--acs);color:var(--act);display:flex;align-items:center;justify-content:center"><span style="{{ i18.list }}"></span></div><div style="width:36px;height:28px;color:var(--fg3);display:flex;align-items:center;justify-content:center"><span style="{{ i18.grid }}"></span></div></div>
|
||||
<div style="display:flex;padding:3px;border-radius:999px;background:var(--sf);gap:2px"><div style="height:30px;padding:0 14px;border-radius:999px;background:var(--acs);color:var(--act);display:flex;align-items:center;font:600 13px/1 var(--ft)">With you</div><div style="height:30px;padding:0 14px;display:flex;align-items:center;font:500 13px/1 var(--ft);color:var(--fg2)">By you</div><div style="height:30px;padding:0 14px;display:flex;align-items:center;font:500 13px/1 var(--ft);color:var(--fg2)">Links</div></div>
|
||||
<div style="width:48px;height:28px;border-radius:999px;background:var(--ac);padding:3px;box-sizing:border-box;display:flex;justify-content:flex-end"><div style="width:22px;height:22px;border-radius:999px;background:#FFFFFF"></div></div>
|
||||
<div style="width:48px;height:28px;border-radius:999px;background:var(--sf3);padding:3px;box-sizing:border-box;display:flex;justify-content:flex-start"><div style="width:22px;height:22px;border-radius:999px;background:#FFFFFF"></div></div>
|
||||
</div>
|
||||
<div style="height:38px;border-radius:12px;background:var(--sf);display:flex;align-items:center;gap:8px;padding:0 12px;color:var(--fg3);font:400 16px/1 var(--ft)"><span style="{{ i18.search }}"></span>Search</div>
|
||||
</div>
|
||||
|
||||
<div style="display:flex;flex-direction:column;gap:12px">
|
||||
<div style="font:600 13px/1 var(--ft);color:var(--fg2)">Grouped list · file rows · swipe</div>
|
||||
<div style="display:flex;flex-direction:column;gap:1px;background:var(--ln);border-radius:20px;overflow:hidden">
|
||||
<sc-for list="{{ rows }}" as="f" hint-placeholder-count="4">
|
||||
<div style="position:relative;background:var(--dgf)">
|
||||
<sc-if value="{{ f.swiped }}"><div style="position:absolute;right:0;top:0;bottom:0;width:96px;display:flex;flex-direction:column;align-items:center;justify-content:center;gap:5px;color:#FFFFFF;font:600 12px/1 var(--ft)"><span style="{{ i20.trash }}"></span>Delete</div></sc-if>
|
||||
<div style="{{ f.rs }}">
|
||||
<div style="{{ f.tile }}"><span style="{{ f.ico }}"></span></div>
|
||||
<div style="flex:1;min-width:0;display:flex;flex-direction:column;gap:4px">
|
||||
<div style="font:500 16px/1.2 var(--ft);white-space:nowrap;overflow:hidden;text-overflow:ellipsis">{{ f.name }}</div>
|
||||
<div style="display:flex;align-items:center;gap:5px;font:400 13px/1.2 var(--ft);color:var(--fg3);white-space:nowrap"><sc-if value="{{ f.hasBadge }}"><span style="{{ f.badge }}"></span></sc-if><sc-if value="{{ f.shared }}"><span style="{{ i14.users }}"></span></sc-if>{{ f.meta }}</div>
|
||||
</div>
|
||||
<sc-if value="{{ f.fav }}"><span style="{{ starSm }}"></span></sc-if>
|
||||
<div style="width:32px;display:flex;justify-content:center"><span style="{{ moreT }}"></span></div>
|
||||
</div>
|
||||
</div>
|
||||
</sc-for>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div style="display:flex;flex-direction:column;gap:12px">
|
||||
<div style="font:600 13px/1 var(--ft);color:var(--fg2)">Settings rows · progress · badges · avatars</div>
|
||||
<div style="display:flex;flex-direction:column;gap:1px;background:var(--ln);border-radius:20px;overflow:hidden">
|
||||
<div style="display:flex;align-items:center;gap:14px;padding:12px 16px;min-height:60px;box-sizing:border-box;background:var(--sf)"><span style="{{ i20.fingerprint }}"></span><div style="flex:1;display:flex;flex-direction:column;gap:4px"><div style="font:400 16px/1.1 var(--ft)">Toggle row</div><div style="font:400 13px/1.2 var(--ft);color:var(--fg3)">With a subtitle</div></div><div style="width:48px;height:28px;border-radius:999px;background:var(--ac);padding:3px;box-sizing:border-box;display:flex;justify-content:flex-end;flex:none"><div style="width:22px;height:22px;border-radius:999px;background:#FFFFFF"></div></div></div>
|
||||
<div style="display:flex;align-items:center;gap:14px;padding:0 16px;height:52px;background:var(--sf)"><span style="{{ i20.timer }}"></span><div style="flex:1;font:400 16px/1 var(--ft)">Value row</div><div style="display:flex;align-items:center;gap:4px;font:400 15px/1 var(--ft);color:var(--fg3)">1 minute<span style="{{ i18.chevR }}"></span></div></div>
|
||||
<div style="display:flex;flex-direction:column;gap:10px;padding:14px 16px;background:var(--sf)"><div style="display:flex;justify-content:space-between;font:400 16px/1 var(--ft)"><span>Progress row</span><span style="color:var(--fg3);font-size:15px">1.2 of 2 GB</span></div><div style="height:6px;border-radius:999px;background:var(--sf3);overflow:hidden"><div style="width:60%;height:100%;background:var(--ac)"></div></div></div>
|
||||
<div style="display:flex;align-items:center;gap:14px;padding:0 16px;height:52px;background:var(--sf);color:var(--dg)"><span style="{{ i20.trash }}"></span><div style="flex:1;font:500 16px/1 var(--ft)">Destructive row</div></div>
|
||||
</div>
|
||||
<div style="display:flex;gap:10px;align-items:center;flex-wrap:wrap">
|
||||
<div style="height:24px;padding:0 10px;border-radius:999px;background:var(--oks);color:var(--ok);display:flex;align-items:center;font:600 12px/1 var(--ft)">Connected</div>
|
||||
<div style="height:24px;padding:0 10px;border-radius:999px;background:var(--dgs);color:var(--dg);display:flex;align-items:center;font:600 12px/1 var(--ft)">Couldn’t sync</div>
|
||||
<div style="display:flex;align-items:center;gap:5px;font:400 13px/1 var(--ft);color:var(--fg3)"><span style="{{ bOk }}"></span>Synced</div>
|
||||
<div style="display:flex;align-items:center;gap:5px;font:400 13px/1 var(--ft);color:var(--fg3)"><span style="{{ bSync }}"></span>Syncing</div>
|
||||
<div style="display:flex;align-items:center;gap:5px;font:400 13px/1 var(--ft);color:var(--fg3)"><span style="{{ bErr }}"></span>Error</div>
|
||||
<div style="flex:1"></div>
|
||||
<div style="width:36px;height:36px;border-radius:999px;background:var(--acs);color:var(--act);display:flex;align-items:center;justify-content:center;font:600 13px/1 var(--ft)">MR</div>
|
||||
<div style="{{ avA }}">AS</div>
|
||||
<div style="{{ avB }}">LP</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div style="display:flex;flex-direction:column;gap:12px">
|
||||
<div style="font:600 13px/1 var(--ft);color:var(--fg2)">Navigation · iOS tab bar / Android navigation bar / desktop sidebar</div>
|
||||
<div style="display:flex;background:var(--sf);border-radius:20px;padding:10px 0">
|
||||
<sc-for list="{{ nav }}" as="n" hint-placeholder-count="5">
|
||||
<sc-if value="{{ n.on }}"><div style="flex:1;display:flex;flex-direction:column;align-items:center;gap:4px;color:var(--act);font:600 10px/1 var(--ft)"><span style="{{ n.ico }}"></span>{{ n.label }}</div></sc-if>
|
||||
<sc-if value="{{ n.off }}"><div style="flex:1;display:flex;flex-direction:column;align-items:center;gap:4px;color:var(--fg3);font:500 10px/1 var(--ft)"><span style="{{ n.ico }}"></span>{{ n.label }}</div></sc-if>
|
||||
</sc-for>
|
||||
</div>
|
||||
<div style="display:flex;background:var(--sf);border-radius:20px;padding:14px 0">
|
||||
<sc-for list="{{ nav }}" as="n" hint-placeholder-count="5">
|
||||
<div style="flex:1;display:flex;flex-direction:column;align-items:center;gap:4px">
|
||||
<sc-if value="{{ n.on }}"><div style="width:56px;height:32px;border-radius:999px;background:var(--acs);color:var(--act);display:flex;align-items:center;justify-content:center"><span style="{{ n.ico }}"></span></div><div style="font:600 12px/1 var(--ft)">{{ n.label }}</div></sc-if>
|
||||
<sc-if value="{{ n.off }}"><div style="width:56px;height:32px;color:var(--fg2);display:flex;align-items:center;justify-content:center"><span style="{{ n.ico }}"></span></div><div style="font:500 12px/1 var(--ft);color:var(--fg2)">{{ n.label }}</div></sc-if>
|
||||
</div>
|
||||
</sc-for>
|
||||
</div>
|
||||
<div style="display:flex;gap:4px;flex-wrap:wrap">
|
||||
<div style="height:38px;border-radius:12px;padding:0 12px;display:flex;align-items:center;gap:12px;background:var(--acs);color:var(--act);font:600 14px/1 var(--ft);width:220px;box-sizing:border-box"><span style="{{ i18.folder }}"></span>Files</div>
|
||||
<div style="height:38px;border-radius:12px;padding:0 12px;display:flex;align-items:center;gap:12px;font:500 14px/1 var(--ft);width:220px;box-sizing:border-box"><span style="{{ i18.trash }}"></span><div style="flex:1">Trash</div><div style="font:500 12px/1 var(--ft);color:var(--fg3)">12</div></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</sc-for>
|
||||
</div>
|
||||
</sc-if>
|
||||
</div>
|
||||
</x-dc>
|
||||
<script type="text/x-dc" data-dc-script>
|
||||
class Component extends DCLogic {
|
||||
componentDidMount() {
|
||||
if (!window.NK) this._t = setInterval(() => { if (window.NK) { clearInterval(this._t); this.forceUpdate(); } }, 40);
|
||||
}
|
||||
componentWillUnmount() { clearInterval(this._t); }
|
||||
renderVals() {
|
||||
const K = window.NK;
|
||||
if (!K) return { ready: false };
|
||||
const { I, ic, D, row, TH, tile, avatar } = K;
|
||||
const FD = "'Schibsted Grotesk',system-ui,sans-serif", FT = "'Instrument Sans',system-ui,sans-serif";
|
||||
const t = (spec, sample, s) => ({ spec, sample, s: { ...s, color: '#0E0D0B' } });
|
||||
const names = [['bg','--bg'],['surface','--sf'],['surface-2','--sf2'],['surface-3','--sf3'],['line','--ln'],['fg-1','--fg1'],['fg-2','--fg2'],['fg-3','--fg3'],['accent','--ac'],['accent-text','--act'],['accent-soft','--acs'],['danger','--dg'],['danger-soft','--dgs'],['success','--ok'],['success-soft','--oks'],['warning','--wn'],['warning-soft','--wns'],['info','--in'],['info-soft','--ins']];
|
||||
const ROW = { display: 'flex', alignItems: 'center', gap: 14, padding: '0 6px 0 14px', height: 64, background: 'var(--sf)', position: 'relative' };
|
||||
const demo = [D.files[2], D.files[3], D.offline[2], D.offline[4], { ...D.files[4] }].map(f => { const r = row(f); r.rs = { ...ROW, transform: r.swiped ? 'translateX(-96px)' : 'none' }; return r; });
|
||||
return {
|
||||
ready: true,
|
||||
i14: I[14], i16: I[16], i18: I[18], i20: I[20], i24: I[24],
|
||||
type: [
|
||||
t('Display 600 · 34/0.9 · −3%', 'Large title', { font: `600 34px/0.9 ${FD}`, letterSpacing: '-0.03em' }),
|
||||
t('Display 600 · 32/0.9 · −3%', '2.4 GB', { font: `600 32px/0.9 ${FD}`, letterSpacing: '-0.03em' }),
|
||||
t('Display 500 · 22/1 · −2%', 'Top bar title', { font: `500 22px/1 ${FD}`, letterSpacing: '-0.02em' }),
|
||||
t('Display 500 · 18/1 · −2%', 'Card title · September 2026', { font: `500 18px/1 ${FD}`, letterSpacing: '-0.02em' }),
|
||||
t('Text 500 · 16/1.2', 'Q3 Planning.pdf', { font: `500 16px/1.2 ${FT}` }),
|
||||
t('Text 400 · 15/1.3', 'Ana Souza shared Q3 Planning.pdf with you', { font: `400 15px/1.3 ${FT}` }),
|
||||
t('Text 600 · 13/1', 'Section label', { font: `600 13px/1 ${FT}` }),
|
||||
t('Text 400 · 13/1.2 · fg-3', '2.4 MB · Yesterday', { font: `400 13px/1.2 ${FT}`, opacity: 0.62 }),
|
||||
t('Mono 400 · 14', 'cloud.rocha.family/s/k7Pq2xW', { font: '400 14px/1 ui-monospace,Menlo,monospace' })
|
||||
],
|
||||
themes: ['light', 'dark'].map(id => ({ label: id === 'light' ? 'Light' : 'Dark', vars: TH[id],
|
||||
swatches: names.map(([name, v]) => ({ name, hex: TH[id][v], s: { height: 44, borderRadius: 10, background: `var(${v})`, boxShadow: 'inset 0 0 0 1px var(--ln)' } })) })),
|
||||
kinds: Object.keys(K.KIND).map(k => ({ name: k, tile: tile(k, 40, 12), ico: I[20][K.KIND[k][2]] })),
|
||||
rows: demo, starSm: ic('star', 16, 'var(--act)'), moreT: ic('moreH', 20, 'var(--fg3)'),
|
||||
bOk: ic('ok', 14, 'var(--ok)'), bSync: ic('sync', 14, 'var(--act)'), bErr: ic('alert', 14, 'var(--dg)'),
|
||||
avA: avatar('#DA9AC7', 36), avB: avatar('#8DCDE2', 36),
|
||||
nav: D.pinned.map(([label, ico], i) => ({ label, ico: I[24][ico], on: i === 0, off: i !== 0 }))
|
||||
};
|
||||
}
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -0,0 +1,93 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<script src="./support.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
<x-dc>
|
||||
<helmet>
|
||||
<meta name="design_doc_mode" content="canvas">
|
||||
<script src="noo-kit.js"></script>
|
||||
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Instrument+Sans:wght@400;500;600&family=Schibsted+Grotesk:wght@500;600&display=swap">
|
||||
<style>
|
||||
body{margin:0;background:#EAE8E2}
|
||||
a{color:#8D0DE3;text-decoration:none}
|
||||
a:hover{color:#6E08B3}
|
||||
</style>
|
||||
</helmet>
|
||||
<div style="padding:96px;display:flex;flex-direction:column;gap:120px;font-family:'Instrument Sans',system-ui,sans-serif;color:#0E0D0B;width:max-content">
|
||||
<div style="display:flex;flex-direction:column;gap:20px;max-width:1100px">
|
||||
<div style="font:600 96px/0.9 'Schibsted Grotesk',system-ui,sans-serif;letter-spacing:-0.03em">Noo</div>
|
||||
<div style="font:400 28px/1.3 'Instrument Sans',system-ui,sans-serif;color:#5A5852;text-wrap:pretty">A Nextcloud client for iOS, Android, macOS and Windows. One brand language, navigation adapted per platform. Light and dark shown for every screen.</div>
|
||||
<div style="display:flex;gap:12px;font:600 20px/1 'Instrument Sans',system-ui,sans-serif"><a href="Noo Design System.dc.html" style="height:52px;padding:0 24px;border-radius:999px;background:#8D0DE3;color:#FFFFFF;display:flex;align-items:center;white-space:nowrap">Open the design system</a><a href="DESIGN_SYSTEM.md" style="height:52px;padding:0 24px;border-radius:999px;background:#FFFFFF;display:flex;align-items:center;white-space:nowrap">DESIGN_SYSTEM.md</a></div>
|
||||
</div>
|
||||
|
||||
<sc-for list="{{ mobile }}" as="p" hint-placeholder-count="2">
|
||||
<section style="display:flex;flex-direction:column;gap:40px">
|
||||
<div style="display:flex;align-items:baseline;gap:24px;border-bottom:2px solid #0E0D0B;padding-bottom:20px"><div style="font:600 72px/0.9 'Schibsted Grotesk',system-ui,sans-serif;letter-spacing:-0.03em">{{ p.name }}</div><div style="font:400 24px/1.2 'Instrument Sans',system-ui,sans-serif;color:#5A5852;white-space:nowrap">{{ p.note }}</div></div>
|
||||
<div style="display:flex;gap:120px">
|
||||
<sc-for list="{{ p.themes }}" as="t" hint-placeholder-count="2">
|
||||
<div style="display:flex;flex-direction:column;gap:32px">
|
||||
<div style="font:500 36px/1 'Schibsted Grotesk',system-ui,sans-serif;letter-spacing:-0.02em">{{ t.label }}</div>
|
||||
<div style="display:grid;grid-template-columns:repeat(7,390px);gap:72px 48px">
|
||||
<sc-for list="{{ screensM }}" as="sc" hint-placeholder-count="14">
|
||||
<div style="display:flex;flex-direction:column;gap:14px">
|
||||
<div style="display:flex;gap:10px;align-items:baseline;font:500 18px/1 'Instrument Sans',system-ui,sans-serif"><span style="color:#7C7A72">{{ sc.n }}</span><span style="white-space:nowrap">{{ sc.label }}</span></div>
|
||||
<div style="width:390px;height:844px;border-radius:48px;box-shadow:0 0 0 1px rgba(14,13,11,0.08),0 24px 48px rgba(30,0,47,0.10)">
|
||||
<dc-import name="Mobile Screen" platform="{{ p.id }}" screen="{{ sc.id }}" theme="{{ t.id }}" hint-size="390px,844px"></dc-import>
|
||||
</div>
|
||||
</div>
|
||||
</sc-for>
|
||||
</div>
|
||||
</div>
|
||||
</sc-for>
|
||||
</div>
|
||||
</section>
|
||||
</sc-for>
|
||||
|
||||
<sc-for list="{{ desktop }}" as="p" hint-placeholder-count="2">
|
||||
<section style="display:flex;flex-direction:column;gap:40px">
|
||||
<div style="display:flex;align-items:baseline;gap:24px;border-bottom:2px solid #0E0D0B;padding-bottom:20px"><div style="font:600 72px/0.9 'Schibsted Grotesk',system-ui,sans-serif;letter-spacing:-0.03em">{{ p.name }}</div><div style="font:400 24px/1.2 'Instrument Sans',system-ui,sans-serif;color:#5A5852;white-space:nowrap">{{ p.note }}</div></div>
|
||||
<div style="display:flex;gap:160px">
|
||||
<sc-for list="{{ p.themes }}" as="t" hint-placeholder-count="2">
|
||||
<div style="display:flex;flex-direction:column;gap:32px">
|
||||
<div style="font:500 36px/1 'Schibsted Grotesk',system-ui,sans-serif;letter-spacing:-0.02em">{{ t.label }}</div>
|
||||
<div style="display:grid;grid-template-columns:repeat(3,1280px);gap:72px 64px">
|
||||
<sc-for list="{{ screensD }}" as="sc" hint-placeholder-count="12">
|
||||
<div style="display:flex;flex-direction:column;gap:14px">
|
||||
<div style="display:flex;gap:10px;align-items:baseline;font:500 20px/1 'Instrument Sans',system-ui,sans-serif"><span style="color:#7C7A72">{{ sc.n }}</span><span style="white-space:nowrap">{{ sc.label }}</span></div>
|
||||
<div style="width:1280px;height:800px;border-radius:12px;box-shadow:0 24px 48px rgba(30,0,47,0.12)">
|
||||
<dc-import name="Desktop Screen" os="{{ p.id }}" screen="{{ sc.id }}" theme="{{ t.id }}" hint-size="1280px,800px"></dc-import>
|
||||
</div>
|
||||
</div>
|
||||
</sc-for>
|
||||
</div>
|
||||
</div>
|
||||
</sc-for>
|
||||
</div>
|
||||
</section>
|
||||
</sc-for>
|
||||
</div>
|
||||
</x-dc>
|
||||
<script type="text/x-dc" data-dc-script data-props="{"platforms":{"editor":"enum","options":["all","ios","android","mac","windows"],"default":"all","tsType":"string"},"themes":{"editor":"enum","options":["both","light","dark"],"default":"both","tsType":"string"}}">
|
||||
class Component extends DCLogic {
|
||||
renderVals() {
|
||||
const pf = this.props.platforms || 'all';
|
||||
const th = this.props.themes || 'both';
|
||||
const themes = [{ id: 'light', label: 'Light' }, { id: 'dark', label: 'Dark' }].filter(t => th === 'both' || th === t.id);
|
||||
const M = [['files','Files · list'],['filesGrid','Files · grid'],['photos','Photos'],['favorites','Favorites'],['offline','Offline'],['shares','Shares'],['recent','Recent'],['activity','Activity'],['trash','Trash'],['drawer','Menu (unpinned tabs)'],['share','Share sheet'],['settings','Settings · account & security'],['settings2','Settings · sync, cache, appearance'],['settings3','Settings · tabs & swipe']];
|
||||
const Dk = [['files','Files · list'],['filesGrid','Files · grid'],['photos','Photos'],['favorites','Favorites'],['offline','Offline'],['shares','Shares'],['recent','Recent'],['activity','Activity'],['trash','Trash'],['share','Share dialog'],['settings','Settings · account, security, sync'],['settings2','Settings · cache, appearance, tabs, swipe']];
|
||||
const num = a => a.map(([id, label], i) => ({ id, label, n: String(i + 1).padStart(2, '0') }));
|
||||
const keep = id => pf === 'all' || pf === id;
|
||||
return {
|
||||
screensM: num(M), screensD: num(Dk),
|
||||
mobile: [{ id: 'ios', name: 'iOS', note: 'Large titles, tab bar, “+” upload in the nav bar.', themes }, { id: 'android', name: 'Android', note: 'Top app bar, navigation bar with pill indicator, Upload FAB.', themes }].filter(p => keep(p.id)),
|
||||
desktop: [{ id: 'mac', name: 'macOS', note: 'Traffic lights in the sidebar, back/forward in the toolbar.', themes }, { id: 'windows', name: 'Windows', note: 'Title bar with caption buttons, same sidebar and toolbar.', themes }].filter(p => keep(p.id))
|
||||
};
|
||||
}
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -9,15 +9,35 @@ via [`LoginFlowService`](../../lib/services/login_flow_service.dart):
|
||||
1. `LoginFlowService.initiate(serverUrl)` POSTs to
|
||||
`{server}/index.php/login/v2`, gets back a browser login URL + a poll
|
||||
endpoint/token.
|
||||
2. The app opens the login URL in a Chrome Custom Tab (`url_launcher`,
|
||||
`LaunchMode.inAppBrowserView` — real Chrome, so saved passwords/autofill
|
||||
work, unlike Flutter's own embedded web view); the user authenticates and
|
||||
authorizes there. There's no way to close the tab automatically on
|
||||
success (Login Flow v2 never redirects back into the app, and a Custom
|
||||
Tab belongs to Chrome's own task) — the user switches back manually.
|
||||
3. `ServerProvider` polls `LoginFlowService.poll(pollEndpoint, token)` every
|
||||
2. The app opens the login URL for the user to authenticate/authorize in
|
||||
[`LoginWebViewView`](../../lib/views/login_webview_view.dart), a normal
|
||||
screen this app owns (`package:webview_flutter`) - pushed by `LoginView`
|
||||
the moment `loginFlowStatus` flips to `awaitingBrowser`, for every login
|
||||
(first account or an additional one), not just add-account. This used
|
||||
to be split: first login went through a Chrome Custom Tab
|
||||
(`url_launcher`, `LaunchMode.inAppBrowserView`) for Chrome's own
|
||||
autofill, and only add-account used the embedded WebView, specifically
|
||||
to avoid a Custom Tab silently reusing Chrome's existing session for a
|
||||
different account. But a Custom Tab has real costs even for the first
|
||||
login - no way to close it automatically on success (the user has to
|
||||
switch back manually), and it's a separate task outside this app's own
|
||||
navigation entirely - so both paths now use the same owned screen.
|
||||
`url_launcher` is no longer a dependency. The cost is no
|
||||
Chrome-autofill (Android's own system Autofill framework, e.g. a
|
||||
password manager, may still work in the WebView; Chrome's own
|
||||
saved-password autofill specifically cannot, since that's Chrome-only).
|
||||
`LoginWebViewView` also clears cookies (`WebViewCookieManager().
|
||||
clearCookies()`) before every load, not just once - Android's WebView
|
||||
`CookieManager` is a single store shared/persisted across every WebView
|
||||
instance in the app process, not scoped per-controller, so without this
|
||||
a second/"Add Account" login silently reuses whichever account's
|
||||
Nextcloud session cookie is already there instead of prompting for
|
||||
credentials (the same class of bug the Custom-Tab-reuse issue above
|
||||
was, just recurring one layer down once everything moved to the owned
|
||||
WebView).
|
||||
3. `SessionController` polls `LoginFlowService.poll(pollEndpoint, token)` every
|
||||
2 seconds (`Timer.periodic`, see `_pollTimer`/`_pollTimeoutTimer` in
|
||||
`server_provider.dart`) until it gets a 200 with `server`/`loginName`/
|
||||
`session_controller.dart`) until it gets a 200 with `server`/`loginName`/
|
||||
`appPassword`, a non-404 error, or a 10-minute timeout. A single dropped
|
||||
connection mid-poll (`http.ClientException`) is swallowed and retried on
|
||||
the next tick rather than aborting the whole flow.
|
||||
@@ -42,7 +62,7 @@ below.
|
||||
[`NextcloudService`](../../lib/services/nextcloud_service.dart) is the
|
||||
client for an authenticated session — constructed with `serverUrl` +
|
||||
`username` + the app password, one instance per login (held as
|
||||
`ServerProvider.service`, recreated on every login/switch/logout). It's
|
||||
`SessionController.service`, recreated on every login/switch/logout). It's
|
||||
effectively stateless per-instance (three final fields, headers rebuilt per
|
||||
request), which is what makes it trivial to have one saved per account
|
||||
rather than needing a rewrite for multi-account support.
|
||||
@@ -56,30 +76,607 @@ rather than needing a rewrite for multi-account support.
|
||||
- **Everything else** (shares, activity, trash, favorites, quota, user info,
|
||||
file versions) goes through Nextcloud's OCS APIs (`/ocs/v2.php/...`), JSON
|
||||
in, with the `OCS-APIRequest: true` header required on every OCS call.
|
||||
*Toggling* a favorite is OCS; *listing* every favorite (`fetchFavorites`,
|
||||
for the Favorites tab) is WebDAV instead - the same `SEARCH` mechanism
|
||||
`fetchAllMedia`/`fetchRecentFiles` use, filtered by `oc:favorite` instead
|
||||
of mimetype/date. Favorites is a real tab
|
||||
(`views/favorites_view.dart`/`FavoritesController.items`/
|
||||
`fetchAll`/`_allFavorites`), not a filter toggle scoped to
|
||||
whatever folder the Files tab happens to be browsing (that's what it
|
||||
used to be - see the note below on why that didn't work). It shares
|
||||
Files' own sort/hidden/storage-scope/grid-list display prefs
|
||||
(`applyFilesDisplayPrefs`, also used by the Move/Copy destination
|
||||
picker) rather than a separate parallel settings dimension. Tapping a
|
||||
favorited folder switches to the Files tab, navigated there
|
||||
(`FilesController.navigateToAbsoluteFolder` +
|
||||
`SettingsController.requestTab`); a favorited file opens directly from
|
||||
the Favorites tab itself. `ItemOperations.deleteItem`/`renameItem`/move/
|
||||
copy all re-sync `FavoritesController._allFavorites` afterward via
|
||||
`FavoritesController.syncIfLoaded` (only once Favorites has actually been
|
||||
opened this session, tracked by `_everFetched`, so those actions don't
|
||||
pay for an extra request on every edit for an account that's never
|
||||
visited the tab) since none of them know how to patch `_allFavorites` in
|
||||
place the way `ItemOperations.toggleItemFavorite` does (added/removed/
|
||||
updated by id, right inline via `FavoritesController.applyFavoriteToggle`).
|
||||
**Note**: this used to be a "favorites-only" filter toggle on the Files
|
||||
tab's controls row instead of its own tab, filtering the currently
|
||||
browsed folder's `_items`. That had two real bugs in sequence: first,
|
||||
the filter dropped every non-favorited item *including folders*, so a
|
||||
non-favorited folder (containing a favorited item nested inside)
|
||||
vanished from the listing entirely, with no way to navigate into it;
|
||||
fixing that by exempting folders from the filter was itself wrong,
|
||||
because the actual intent was for favorites-only to show every
|
||||
favorited item *account-wide*, not just direct children of whatever
|
||||
folder was open - a strict filter over the wrong scope. Converting it to
|
||||
a real tab, backed by an account-wide fetch, was the actual fix; keep
|
||||
favorites account-wide rather than reintroducing a current-folder-scoped
|
||||
filter.
|
||||
- Auth header is HTTP Basic (`username:appPassword`, base64), built in
|
||||
`_headers`/exposed as `authHeaders` for widgets that need to hit URLs
|
||||
directly (e.g. `Image.network(url, headers: service.authHeaders)` for
|
||||
thumbnails/previews).
|
||||
- Downloads stream through `Dio` (`downloadToFile`) for progress callbacks;
|
||||
small in-app previews (text/PDF) use `fetchBytes` via `package:http`.
|
||||
- **Uploads** (`uploadFileFromPath(folderPath, fileName, localFilePath,
|
||||
{onProgress})`) stream the local file via `Dio().put()` with an explicit
|
||||
`Content-Length` and `onSendProgress`, mirroring the download path. The
|
||||
`ServerProvider` wrapper always uploads into `_currentFolderPath` — the
|
||||
share-to-upload flow (`ShareUploadView`) gets a caller-chosen destination
|
||||
by navigating there first (`navigateToAbsoluteFolder`), then uploading.
|
||||
- **Receiving a shared file from another app**: `receive_sharing_intent`
|
||||
(Android `ACTION_SEND`/`ACTION_SEND_MULTIPLE`, `android:launchMode`
|
||||
`singleTask` in the manifest so a second share while running hits
|
||||
`onNewIntent` instead of spawning a new instance). `MainShellView` listens
|
||||
via `getInitialMedia()`/`getMediaStream()` and pushes `ShareUploadView`,
|
||||
which reuses the same `uploadFileFromPath` path after the user picks a
|
||||
destination folder.
|
||||
- `NextcloudService.downloadToFile` (`Dio`, progress callbacks) is still
|
||||
used for small in-app-only downloads: text/PDF previews (`fetchBytes` via
|
||||
`package:http`) and "open externally" (`FileViewerScreen._downloadToTemp`
|
||||
streams to the app's own cache dir so `open_file` can hand it to another
|
||||
app). Explicitly saving a file **to the device** - the "Download" action
|
||||
in Files/Photos' selection toolbar and the media viewer's download button
|
||||
- instead hands off to `DownloadService.kt`, an Android foreground
|
||||
service, the same way "Share to Noo" hands its upload off to
|
||||
`ShareUploadService.kt` (see that section below) rather than downloading
|
||||
in Dart and prompting `file_saver` per file: a real Service survives the
|
||||
app being closed mid-download, with one cancellable notification for the
|
||||
whole batch. `DownloadService.kt` re-implements a plain WebDAV GET in
|
||||
Kotlin for the same reason `ShareUploadService.kt`'s PUT does - keep
|
||||
`NextcloudService.downloadToFile` in sync manually if download semantics
|
||||
change - and writes straight into the device's public Downloads
|
||||
collection via `MediaStore.Downloads` (API 29+; a background Service
|
||||
can't prompt `file_saver`'s SAF picker the way the Flutter/Activity side
|
||||
can, so this is the direct equivalent) with a legacy
|
||||
`Environment.DIRECTORY_DOWNLOADS` file-write fallback pre-Android-10.
|
||||
Folders are filtered out client-side before handing off (no recursive/
|
||||
zip download support); `DetailsVersionsTab`'s version-restore download
|
||||
and `ShareSheet`'s "Share file directly" (native OS share, not saved to
|
||||
Downloads) keep using `downloadToFile` directly instead, since both need
|
||||
the bytes in-app rather than saved to Downloads.
|
||||
- **Move/Copy** (`moveItem`/`copyItem(itemPath, destFolderPath, {overwrite,
|
||||
newName})`) share one private `_moveOrCopy` helper with `renameItem`
|
||||
(itself just a same-folder MOVE) - WebDAV `MOVE`/`COPY` are the same
|
||||
request shape, just a different verb, and both are recursive by default
|
||||
for a folder ("collection"), so no extra `Depth` header is needed. They
|
||||
return the raw HTTP status rather than a bool: `412 Precondition Failed`
|
||||
is WebDAV's standard signal for "something's already there" when
|
||||
`Overwrite: F`, which is exactly the conflict `ItemOperations.moveItems`/
|
||||
`copyItems` need to detect without a separate existence-check request
|
||||
per item. `ItemOperations` attempts every item in the batch first,
|
||||
collects conflicts into `MoveCopyResult.conflicts`
|
||||
(`models/move_copy_result.dart`), and only then shows one summary
|
||||
(`MoveCopyConflictSheet`) instead of prompting per conflict as they're
|
||||
hit; resolving picks overwrite/keep-both (auto-renamed via
|
||||
`_nextAvailableName` against a fresh listing of the destination, fetched
|
||||
once up front, not per item)/skip per item via `resolveConflicts`. The
|
||||
destination-picker screen behind this
|
||||
(`views/move_copy_destination_picker.dart`) is covered in
|
||||
`architecture.md`, including why it can't reuse the Files tab's shared
|
||||
navigation state the way `ShareUploadView` does.
|
||||
- **Uploads**: there's no more in-app-only upload path - `NextcloudService`'s
|
||||
own `uploadFileFromPath` was removed once the Files tab's "+" → "Upload
|
||||
File" was unified with the share-to-upload flow (below). Every upload,
|
||||
however it's triggered, now goes through `ShareUploadView` (caller-chosen
|
||||
destination via `FilesController.navigateToAbsoluteFolder`, then
|
||||
`UploadService`/`ShareUploadService.kt`).
|
||||
- **Receiving a shared file from another app**: hand-rolled in
|
||||
`MainActivity.kt` (Android `ACTION_SEND`/`ACTION_SEND_MULTIPLE`,
|
||||
`android:launchMode` `singleTask` in the manifest so a second share while
|
||||
running hits `onNewIntent` instead of spawning a new instance) plus
|
||||
[`ShareIntentService`](../../lib/services/share_intent_service.dart) on
|
||||
the Dart side - not the `receive_sharing_intent` plugin, which this used
|
||||
to be. That plugin resolves a shared `content://` Uri by synchronously
|
||||
copying the *entire* file into the cache dir on the main thread during
|
||||
activity startup; for a large file that blocks long enough that Android
|
||||
kills the newly-launched activity for failing to draw a first frame,
|
||||
dropping the user straight back to the home screen with no error and no
|
||||
Dart code ever running. `MainActivity.kt`'s doc comment has the full
|
||||
story. The fix: `getInitialShare`/`onNewShare` only ever query cheap Uri
|
||||
metadata (name/size/mime, not content) so `ShareUploadView`'s destination
|
||||
picker - which mirrors the Files tab's own controls/filters/listing,
|
||||
reusing the same `FilesController` fields and `widgets/item_icon.dart` -
|
||||
always appears instantly regardless of file size.
|
||||
- **Uploading a shared file**: once the user picks a destination in
|
||||
`ShareUploadView`, [`UploadService`](../../lib/services/upload_service.dart)
|
||||
hands the whole batch off to `ShareUploadService.kt`, an Android
|
||||
foreground service, rather than uploading from Dart in that screen. This
|
||||
is deliberate, not just an implementation detail: the point is that
|
||||
closing the app right after confirming a destination doesn't interrupt
|
||||
the upload, the same guarantee a real file-manager app's upload
|
||||
notification gives you - a plain Dart `Future` (even one kept alive by a
|
||||
singleton service class) stops running once the Flutter engine/Activity
|
||||
are gone, only an actual Android `Service` survives that. The service
|
||||
re-implements the WebDAV PUT itself in Kotlin (`HttpURLConnection`, no
|
||||
new HTTP dependency) since it can't reach the Dart-side `NextcloudService`/
|
||||
Dio from a separate process lifecycle - `UploadService.startUpload` passes
|
||||
everything the Kotlin side needs (the pre-built `Authorization` header
|
||||
from `NextcloudService.authHeaders`, not the raw password) as Intent
|
||||
extras, a one-way handoff with no channel back to Dart afterward. Keep
|
||||
the two upload implementations in sync manually if upload semantics
|
||||
change. Progress/cancellation is entirely notification-driven (one
|
||||
ongoing, updatable notification for the whole batch; its Cancel action
|
||||
re-delivers an Intent to the same running service instance, which an
|
||||
`AtomicBoolean` the copy/upload loops poll) - there's no plumbing back to
|
||||
the Dart UI, by design, since the app may not even be running.
|
||||
|
||||
## Being picked by other apps (photo/file picker)
|
||||
|
||||
Noo can also be launched *by* another app as a `GET_CONTENT` picker (e.g.
|
||||
Google Drive/Instagram's "choose a file" flow), the reverse direction of
|
||||
"Share to Noo" above - hand-rolled the same way, not a plugin.
|
||||
|
||||
- `MainActivity.kt` matches `ACTION_GET_CONTENT` (`OPENABLE`, any
|
||||
mimeType - a single `*/*` filter, since Android matches it against
|
||||
whatever the caller actually requested) alongside its existing
|
||||
`ACTION_SEND`/`SEND_MULTIPLE` filters, and exposes the caller's requested
|
||||
mimeType/multi-select flag/app label via the
|
||||
`dev.ayushya.noo/pick_intent` method+event channel pair
|
||||
([`PickIntentService`](../../lib/services/pick_intent_service.dart)/
|
||||
[`PickRequest`](../../lib/models/pick_request.dart)) - same
|
||||
cold-start-vs-already-running split as the share-intent channels.
|
||||
- `PickController.pickRequest`/`isPicking` drive picking mode app-wide once
|
||||
`MainShellView` learns about a request at startup or via
|
||||
`onNewPickRequest`. While picking, `MainShellView` restricts the visible
|
||||
bottom-nav tabs to just Files and Photos (see `architecture.md`) -
|
||||
`FilesView`/`PhotosView` route taps through
|
||||
`itemMatchesPickFilter`/`confirmPick` instead of their normal
|
||||
open/select behavior (folders still navigate; a mime-mismatched file is
|
||||
rejected with a snackbar; matching files toggle-select or immediately
|
||||
confirm depending on `PickRequest.allowMultiple`).
|
||||
- `PickController.confirmPick` downloads the selected item(s) to a
|
||||
`picker/` scratch subfolder in the app's cache dir (`downloadToFile`,
|
||||
same as any other download) - each item into its own `picker/<item.id>/`
|
||||
subfolder, keeping the on-disk filename as plain `item.name` rather than
|
||||
prefixing it with the id to dodge collisions between same-named items;
|
||||
the caller reads that on-disk name back as the display name, so
|
||||
prefixing it there was a real bug (Drive showing e.g. `163332_photo.jpg`
|
||||
instead of `photo.jpg`) - then hands the local paths to
|
||||
`PickIntentService.finishPick`, which calls back into
|
||||
`MainActivity.kt.finishPick`: it wraps each file in a `content://` Uri
|
||||
via this app's own `FileProvider` (`${applicationId}.picker.fileprovider`,
|
||||
scoped to just that cache subfolder - see `android/app/src/main/res/xml/
|
||||
file_paths.xml`) and returns it to the caller via `setResult`. Single
|
||||
file uses `setDataAndType` (never `.data =`/`.type =` as two separate
|
||||
calls - each one silently nulls out the other field on a plain
|
||||
`Intent`); multiple files use `ClipData`. `cancelPick` mirrors this for
|
||||
backing out (system back while picking, or a picked-item mismatch) with
|
||||
`RESULT_CANCELED` instead.
|
||||
|
||||
## Device sync
|
||||
|
||||
Mirrors selected folders to app-private local storage
|
||||
(`getExternalFilesDir(null)/sync/<accountId>/...` - wiped on uninstall, no
|
||||
extra storage permission needed) and keeps them updated in the background,
|
||||
even with the app fully closed. Same rationale as the upload/download
|
||||
services for going native instead of a Dart background-task plugin (see
|
||||
above): a periodic job has to run without the Flutter engine loaded, and a
|
||||
notification action has to resolve without launching the UI. Rather than
|
||||
add `workmanager` (whose Dart `callbackDispatcher` spins up a second,
|
||||
minimal Flutter engine that has to re-register every plugin it touches),
|
||||
the whole engine is plain Kotlin using Android's WorkManager directly.
|
||||
|
||||
- [`SyncEngine.kt`](../../android/app/src/main/kotlin/dev/ayushya/noo/SyncEngine.kt)
|
||||
holds the shared primitives, reused by both workers below: a Depth-1 (or
|
||||
Depth-0, for refreshing one item) PROPFIND (`propfindChildren`/
|
||||
`propfindSelf`) requesting `d:getetag` alongside the usual props - unlike
|
||||
every PROPFIND in `nextcloud_service.dart`, which never requests it
|
||||
(`etag` is a dead field on `NextcloudItem` today); plain
|
||||
`HttpURLConnection` GET/PUT (`downloadFile`/`uploadFile`, same style as
|
||||
`DownloadService.kt`/`ShareUploadService.kt`); and `diffFolder`, which
|
||||
compares one folder's freshly-walked manifest against the persisted
|
||||
per-account sync-state map (native `SharedPreferences`, JSON keyed by
|
||||
`oc:fileid` - stable across renames/moves, unlike `path`) to decide, per
|
||||
file: download (new, or server `etag` changed), upload (local file's
|
||||
mtime/size changed and the server didn't), delete locally (missing
|
||||
server-side, unchanged locally), re-download a file whose local copy is
|
||||
missing even though state says it was mirrored (stale state from an
|
||||
earlier sync of the path - treating that as "user deleted it" used to
|
||||
skip the download and report phantom removals), or flag a
|
||||
**conflict** (both changed since the last recorded state). The
|
||||
"removed" count in the summary notification only counts local files that
|
||||
actually existed and were deleted.
|
||||
- [`SyncWorker.kt`](../../android/app/src/main/kotlin/dev/ayushya/noo/SyncWorker.kt)
|
||||
(`CoroutineWorker`) is both the periodic job and the one-off "Sync now":
|
||||
for each configured path, `propfindSelf`s it first to check whether it's
|
||||
a file or a folder - a folder gets the full recursive
|
||||
`walkRemoteTree`, a file is diffed directly as a one-item list (nothing
|
||||
else about `diffFolder`/download/upload/delete cares whether its entries
|
||||
came from a walk or a single lookup, so single-file sync needed no engine
|
||||
changes, just this one branch) - applies `diffFolder`'s decisions, then
|
||||
posts a summary notification (files updated/uploaded/removed) and, for
|
||||
any conflicts, one notification per file with two actions. A progress
|
||||
notification (`notifyProgress`) is shown lazily - only once the first
|
||||
actual download/upload starts, not unconditionally at the top of every
|
||||
run, so a periodic pass that finds nothing to transfer never flashes a
|
||||
notification at all. It shares the summary's notification ID
|
||||
(`SUMMARY_NOTIFICATION_ID`) on purpose: the final `notifySummary` call
|
||||
naturally replaces the ongoing progress notification in place once the
|
||||
run finishes (no flicker of two separate notifications), and if nothing
|
||||
ended up changing, `doWork` explicitly cancels that ID since there's no
|
||||
summary to replace it with.
|
||||
- **Live status reaches Dart via a push channel, not polling** -
|
||||
[`SyncStatusBus.kt`](../../android/app/src/main/kotlin/dev/ayushya/noo/SyncStatusBus.kt)
|
||||
is a plain in-process pub/sub (no IPC needed - the workers and
|
||||
`MainActivity` share one process) that `SyncWorker`/`ConflictResolveWorker`
|
||||
publish into (syncing started/stopped, which `fileId`s are mid-transfer
|
||||
right now, new/resolved conflicts) and `MainActivity.kt`'s
|
||||
`dev.ayushya.noo/sync_service/status` `EventChannel` forwards to Dart,
|
||||
same pattern as the share/pick-intent channels. It deliberately does
|
||||
*not* track "which files are already synced" itself - that's read fresh
|
||||
from `SyncEngine`'s durable per-account state map
|
||||
(`SyncEngine.loadState(accountId).keys`) each time a snapshot is built,
|
||||
so there's one source of truth for "synced" instead of two that could
|
||||
drift - which is also why `SyncWorker.doWork()` saves state *before*
|
||||
its final `SyncStatusBus.setSyncing(accountId, false)` publish, not
|
||||
after: that publish is what tells Dart's live listener to recompute
|
||||
`syncedFileIds`, so publishing first would hand back a snapshot still
|
||||
missing every file the run just downloaded, with no further event ever
|
||||
arriving afterward to correct it - newly-synced files would sit with no
|
||||
badge until the app restarted and force-refreshed via `getStatus()`.
|
||||
`SyncService.getStatus(accountId)` (one-shot, seeds `SyncStatusController`
|
||||
right after login/account-switch - the account id is passed explicitly
|
||||
because `SyncStatusBus` only learns an account once a sync pass has run
|
||||
in this process, so on a fresh app start it'd report empty
|
||||
`syncedFileIds`; `SyncStatusController._applySnapshot` likewise ignores
|
||||
the bus's initial null-account emission so it can't wipe that seed) and `SyncService.statusStream` (live)
|
||||
both return the same snapshot shape. `SyncStatusController.syncHeaderStatus`
|
||||
(off/syncing/done/alert - drives `SyncedHeaderScaffold`'s persistent
|
||||
chip/panel, replacing what used to be the WebDAV-refresh-loading
|
||||
indicator there) and `syncStatusFor(item)` (none/syncing/synced/conflict
|
||||
- drives the small corner badge on Files' tiles, `SyncStatusBadge`) are
|
||||
both computed from this state, not fetched per-item. Folders never get
|
||||
their own entry in the native state map (`diffFolder` only ever tracks
|
||||
individual files - `if (entry.isFolder) continue`), so `syncStatusFor`
|
||||
derives a folder's badge differently than a file's: `synced` once the
|
||||
folder's own path (or an ancestor of it) is in sync scope
|
||||
(`_isPathInSyncScope`, shared with `localSyncedFilePath`), `syncing`
|
||||
while any sync pass is running, `conflict` if a pending conflict's
|
||||
`remotePath` falls under it - not from `syncedFileIds`, which only ever
|
||||
contains individual files.
|
||||
- **In-app conflict resolution reuses the exact same enqueue path as the
|
||||
notification actions** - `ConflictResolveWorker.enqueue(...)` is a
|
||||
shared companion function; `SyncConflictReceiver` (the notification
|
||||
action) and `MainActivity.kt`'s `resolveConflict` MethodChannel method
|
||||
(the sync header's "Keep local"/"Use server" buttons,
|
||||
`SyncStatusController.resolveSyncConflict`) both just call it, so there's
|
||||
one resolution code path regardless of which surface triggered it.
|
||||
- **Conflicts are never auto-resolved.** The notification's "Keep local"/
|
||||
"Use server" actions are `PendingIntent.getBroadcast`s (same shape as the
|
||||
Cancel action on upload/download notifications, just broadcast instead of
|
||||
service-targeted) to
|
||||
[`SyncConflictReceiver`](../../android/app/src/main/kotlin/dev/ayushya/noo/SyncConflictReceiver.kt)
|
||||
- a manifest-registered `BroadcastReceiver` (works even with the app
|
||||
process dead) that can't itself block on network, so it just dismisses
|
||||
the notification and enqueues a one-shot
|
||||
[`ConflictResolveWorker`](../../android/app/src/main/kotlin/dev/ayushya/noo/ConflictResolveWorker.kt)
|
||||
to actually push the local copy up or pull the server copy down and
|
||||
refresh that file's recorded state.
|
||||
- **Keeping synced files current automatically - no "Sync now" needed.**
|
||||
Synced paths follow the Files Cache rule (Settings, right under Device
|
||||
Sync; default *Refresh periodically, 15 min*), driven by
|
||||
`SyncStatusController` (see its doc comment): *periodically* = a
|
||||
WorkManager `PeriodicWorkRequest` at `max(interval, 15)` min (Android's
|
||||
floor) via `reschedule(intervalMinutes:)`, plus an in-app `Timer` at the
|
||||
exact interval and a pass on app resume if one is due; *never cache* = no
|
||||
background job, a pass on each app open/resume; *manual* = only
|
||||
pull-to-refresh (`SyncedHeaderScaffold` calls `syncOnPull`, on any tab) and
|
||||
"Sync now". **There's no server push:** Nextcloud's push options
|
||||
(`notify_push` needs a server app plus a persistent WebSocket, which
|
||||
Android kills in the background without a foreground service; Nextcloud's
|
||||
FCM/UnifiedPush proxy needs a registered app identity) aren't viable for
|
||||
a self-hosted-server client, so it polls - and polling is made cheap by the
|
||||
**root-etag shortcut**: Nextcloud propagates any descendant change up
|
||||
through every ancestor folder's `getetag`, so each run first does one
|
||||
Depth-0 PROPFIND per synced root and skips the recursive walk if the etag
|
||||
matches the stored `SyncEngine.RootMarker` *and* every local file still
|
||||
matches its recorded size/mtime (`localMatchesState` - nothing to upload or
|
||||
re-download). A root is only marked after a fully clean pass (no failed
|
||||
transfer, no conflict), a full walk is forced at least every 6 h
|
||||
(`FULL_WALK_MAX_AGE_MS`; etag propagation is unreliable on external
|
||||
storage), and "Sync now" (`KEY_FORCE`) always walks. Automatic/pull passes
|
||||
are `force: false`: silent (progress notification only once a transfer
|
||||
starts), `ExistingWorkPolicy.KEEP` (never cancel a run in progress), and
|
||||
automatic ones also carry the Wi-Fi-only constraint. **Safety:** PROPFIND
|
||||
failures (network error, 5xx) throw `RemoteUnavailableException` and the
|
||||
path is skipped that run - previously they returned an empty listing,
|
||||
which made every synced file look deleted server-side and the diff deleted
|
||||
the local copies (a real risk once passes run every few minutes). Only a
|
||||
clean 404 means "gone".
|
||||
- `MainActivity.kt`'s `dev.ayushya.noo/sync_service` channel
|
||||
(`reschedule`/`cancel`/`syncNow`/`removeLocalSync`) is the only bridge
|
||||
from Dart: a periodic `WorkRequest`'s input `Data` and `Constraints` are
|
||||
fixed at enqueue time, so changing the synced-folder list, the active
|
||||
account, or the Wi-Fi-only setting means cancelling and re-enqueueing,
|
||||
not updating in place. [`SyncService`](../../lib/services/sync_service.dart)
|
||||
(Dart) wraps this - `SyncStatusController` calls `SyncService.reschedule`
|
||||
after every successful login/account switch and every synced-folder/
|
||||
cache-rule/`syncOnCellular` change. `reschedule` covers **every saved
|
||||
account**, not just the active one: each account with sync enabled gets its
|
||||
own periodic job (`SyncWorker.periodicNameFor(accountId)`) carrying that
|
||||
account's own credentials (read from `AccountStore`), paths and interval -
|
||||
the active account's from live `SyncStatusController` state, the others'
|
||||
from their persisted per-account prefs (`_SyncConfig.fromPrefs`). Logging
|
||||
out stops that account's background sync: `SessionController.logout`
|
||||
records it in `AccountStore`'s signed-out set (so a later `reschedule` for
|
||||
another account doesn't resurrect its job) and cancels it via
|
||||
`SyncService.cancelAccount`; activating the account again clears the flag.
|
||||
Removing an account cancels its job too. One-off runs are per-account
|
||||
(`oneOffNameFor`).
|
||||
- **Folders, not just files, are mirrored.** After applying a path's diff,
|
||||
`SyncWorker` calls `SyncEngine.mirrorFolders` (a local directory for every
|
||||
remote folder, so an empty folder created on the web appears on device) and
|
||||
`pruneRemovedFolders` (removes local directories the server no longer has,
|
||||
but only *empty* ones - the diff has already deleted the files that were in
|
||||
them - and never the sync root). Root-etag markers carry a version
|
||||
(`ROOTS_VERSION`) so bumping it forces one full walk after a change like this.
|
||||
A configured path the server 404s (deleted on the web) is recorded via
|
||||
`setRootMissing`; the snapshot's `missingRoots` lets
|
||||
`SyncStatusController._applySnapshot` drop it from the synced list.
|
||||
- **Notifications.** Sync notifications are silent (channel `device_sync_v2`,
|
||||
`IMPORTANCE_LOW` + `setSilent`), with ids and titles scoped per account
|
||||
(`summaryNotificationId`/`conflictNotificationId`) so accounts don't
|
||||
overwrite each other. "Background sync notifications" (Settings, global,
|
||||
default on) gates progress/summary for automatic runs (`KEY_NOTIFY`,
|
||||
baked into the periodic job input so it needs a reschedule); conflicts and
|
||||
user-initiated "Sync now" always notify. Manual download/upload
|
||||
notifications use `file_downloads_v2`/`share_upload_v2` at default importance
|
||||
(progress silent, completion audible). Channel importance can't be changed
|
||||
once created, so changing it means a new channel id plus
|
||||
`NooNotificationChannels.ensure(legacyIds = ...)` deleting the old one.
|
||||
- **One sync at a time.** `SyncEngine.syncLock` (a process-wide coroutine
|
||||
`Mutex`) wraps both `SyncWorker` and `ConflictResolveWorker`. WorkManager
|
||||
runs differently-named jobs concurrently, and both workers load the whole
|
||||
sync-state map, mutate it and save it back - so overlapping runs (periodic
|
||||
+ a pull, two accounts due at once) silently discarded each other's
|
||||
updates, and `SyncStatusBus` only tracks one account at a time. A run that
|
||||
has to wait simply starts when the current one finishes. The network constraint is `NetworkType.UNMETERED` by default
|
||||
(`!syncOnCellular`, Wi-Fi only) or `NetworkType.CONNECTED` if the user's
|
||||
opted into cellular sync. Turning sync off for a path
|
||||
(`SyncStatusController.removeSyncedPath`) also calls
|
||||
`SyncService.removeLocalSync`, which runs `SyncEngine.removeLocalSync` on
|
||||
a background thread (deletes the local mirror files under that path
|
||||
*and* their entries in the native sync-state map - clearing state too,
|
||||
not just the files, matters because a bare "file's gone but the server
|
||||
hasn't changed" without a state reset reads as a user-initiated local
|
||||
deletion to `diffFolder`, so a later re-add wouldn't re-download
|
||||
anything).
|
||||
- Synced-path list (`SyncStatusController.syncedPaths` - files or folders, not
|
||||
just folders despite the name of the underlying pref/native `Data` key,
|
||||
which stayed `ui_synced_folders`/`folders` to avoid a storage-key
|
||||
migration for a rename) follows the standard per-account-pref pattern
|
||||
(JSON-encoded string list, in `AccountStore.perAccountPrefKeys`); a
|
||||
parallel `_syncedPathTypes` map (path -> isFolder, `ui_synced_folder_types`)
|
||||
tracks which of those paths are folders vs individual files for the sync
|
||||
header's folder/item counts, defaulting missing entries to folder (the
|
||||
common case, and what any path added before this map existed will look
|
||||
like). **`addSyncedPaths`/`removeSyncedPaths` gate on
|
||||
`_accountLoadedGate`** (a `Completer`, deliberately starting
|
||||
*incomplete* - not pre-completed - completed once
|
||||
`_onAccountActivated`'s async per-account prefs load actually finishes,
|
||||
re-armed on `_onAccountCleared`) before touching `_syncedPaths` at all -
|
||||
without this, syncing a folder soon enough after opening the app (or an
|
||||
account switch) could race that load: the mutator spreads the *current
|
||||
in-memory* `_syncedPaths` (still `[]`, the pre-load default) and
|
||||
immediately persists the result, silently overwriting the
|
||||
previously-saved list and losing every other folder that had been
|
||||
synced before. Starting the gate pre-completed was an actual bug here -
|
||||
it meant only account *switches* (which call `_onAccountCleared`,
|
||||
re-arming it) were protected, leaving the very first cold-start load
|
||||
completely exposed to the race. A second, related guard,
|
||||
`_hasLoadedSyncedPathsForAccount`, stops `_onAccountActivated` from
|
||||
re-reading `_syncedPaths` from storage more than once per account -
|
||||
activation can fire again for the same account (e.g.
|
||||
`SessionController` re-verifying a provisional/offline login once
|
||||
connectivity returns), and a second read could clobber an in-memory
|
||||
mutation made between the first load and that one if its own persist
|
||||
hadn't landed yet. `syncEverything`
|
||||
(`ui_sync_everything`, per account) works the
|
||||
same way - when on, `SyncService` sends `['/']` as the path list instead
|
||||
of `syncedPaths`, mirroring the whole account rather than requiring
|
||||
per-item opt-in. `syncOnCellular` is a plain global pref. `syncEverything`
|
||||
and `syncOnCellular` are managed from Settings → Device Sync (a "Sync
|
||||
everything" switch, the cellular toggle, a manual "Sync now", and a
|
||||
"View offline files" row that pushes the Offline tab - see below); the
|
||||
configured path list itself, with its remove buttons, lives on the
|
||||
Offline tab now, not Settings. Individual files or folders are toggled
|
||||
from Files' selection toolbar ("Sync to device", works over the whole
|
||||
selection at once - either item type, folders or files - not just a
|
||||
single item; the action reads as "stop syncing" only once every selected
|
||||
item is already synced, otherwise it syncs whichever ones aren't yet,
|
||||
and either direction ends with a confirmation SnackBar). Multi-item
|
||||
add/remove goes through `SyncStatusController.addSyncedPaths`/
|
||||
`removeSyncedPaths` (batched), never a per-item loop of
|
||||
`addSyncedPath`/`removeSyncedPath` - looping was an actual bug: each
|
||||
`addSyncedPath` call fires its own `SyncService.syncNow`, and
|
||||
`syncNow`'s native side enqueues via `WorkManager.enqueueUniqueWork(...,
|
||||
ExistingWorkPolicy.REPLACE, ...)`, so a second item's call cancelled the
|
||||
first item's still-in-flight sync pass instead of letting it finish -
|
||||
only ever syncing the last item enqueued. The batched methods mutate
|
||||
`_syncedPaths` for the whole set and call `reschedule`/`syncNow` exactly
|
||||
once, with the complete folder list, so `SyncWorker` handles every item
|
||||
in one run (it already loops its whole `folders` list sequentially
|
||||
within a single `doWork()` call - see above).
|
||||
- **The Offline tab** (`FilesView(offline: true)` over
|
||||
[`OfflineController`](../../lib/providers/offline_controller.dart), see
|
||||
`architecture.md`'s `FolderBrowser`) is the Files tab itself - same
|
||||
breadcrumbs, controls, tiles and thumbnails - over whatever device-sync
|
||||
has actually landed on disk - deliberately no selection/multi-select
|
||||
toolbar, since delete/share/move don't make sense for an already-synced
|
||||
local mirror.
|
||||
Reads straight off `<externalFilesDir>/sync/<accountId>/<currentFolder>`
|
||||
(non-recursive `Directory.list()` per folder) via `dart:io`, not fetched
|
||||
from the server (mirrors `SyncEngine.kt#syncRoot`'s layout exactly), so
|
||||
it works with no connection and never round-trips through a
|
||||
MethodChannel just to list files. `OfflineController` refetches the
|
||||
current folder automatically whenever a `SyncService.statusStream`
|
||||
snapshot shows syncing just stopped, so newly-downloaded files show up
|
||||
without a manual pull-to-refresh. Tapping an item opens
|
||||
`FileViewerScreen` with `localPath` set (see below) - same in-app viewer
|
||||
Files uses, just reading from disk instead of the server; tapping a
|
||||
folder navigates into it, same as Files. Resolves the local path via
|
||||
`OfflineController.localPathFor(item)`, a pure function of the item's
|
||||
path - deliberately *not*
|
||||
`SyncStatusController.localSyncedFilePath`, which additionally
|
||||
re-verifies the item falls under a configured sync target
|
||||
(`_isPathInSyncScope`). That check is redundant and was actually a bug
|
||||
here: every item this controller ever hands out already came from
|
||||
listing this exact directory tree, so it's definitionally already
|
||||
local, and re-deriving "is this still in scope" from `syncedPaths`
|
||||
could disagree with what's genuinely sitting on disk (e.g. nested
|
||||
paths, timing right after a scope change) and report a visibly-listed
|
||||
file as "no longer available". Pull-to-refresh triggers
|
||||
`SyncService.syncNow` followed by a re-list. The
|
||||
configured sync targets themselves (with "stop syncing" per target, what
|
||||
used to be Settings' Device Sync card's own inline list) live in a
|
||||
bottom sheet behind the app bar's sync icon (`_ManageSyncedFoldersSheet`)
|
||||
rather than inline in the main view, so the browser itself stays a plain
|
||||
Files-style listing; Settings' own "View offline files" row just pushes
|
||||
this whole tab.
|
||||
- **`android/app/proguard-rules.pro` exists specifically for this feature,
|
||||
and keeps `androidx.work.**` wholesale rather than naming individual
|
||||
classes.** Flutter's own Gradle plugin auto-enables R8 minification for
|
||||
release builds (`FlutterPlugin.kt` sets `isMinifyEnabled = true`
|
||||
unconditionally for the `release` build type, and auto-wires this exact
|
||||
file if it exists - nothing in this project's own `build.gradle.kts`
|
||||
opts into it), which broke device sync on real-device testing **twice**
|
||||
in a row: first `WorkDatabase` (WorkManager locates its bundled Room
|
||||
database by reflecting off the abstract database class's own,
|
||||
possibly-renamed, name), then - after narrowly keeping just that class -
|
||||
`OverwritingInputMerger` (WorkManager's default input merger, also
|
||||
reflection-instantiated) broke the exact same way and silently ate every
|
||||
`enqueueUniqueWork` call, including "Sync now", with zero indication
|
||||
beyond a `WM-InputMerger` `NoSuchMethodException` in logcat - no crash,
|
||||
no Dart-visible error, just a folder that stayed empty. R8's member-level
|
||||
shrinking strips whatever a class's *reflection-only* callers don't
|
||||
reference directly, even when the class itself survives a plain `-keep
|
||||
class` with no wildcard, and WorkManager reflects into more of its own
|
||||
internals than any one test pass is likely to exercise - hence the
|
||||
wholesale keep instead of chasing individual classes one crash at a
|
||||
time. If adding another native background component reached only via
|
||||
reflection (not a manifest-declared component, which AGP already keeps
|
||||
automatically), don't assume default AndroidX consumer rules cover it -
|
||||
verify on an actual release build, not just `flutter analyze`/a debug
|
||||
build, since minification only applies to release.
|
||||
- **Files land under `Android/data/<package>/files/sync/...`
|
||||
(`getExternalFilesDir`), which no third-party file manager can browse
|
||||
without root** - Android's scoped storage sandboxes that whole directory
|
||||
tree from other apps by design, same as any app-private storage. This
|
||||
surprised real-device testing (a file manager app logged "Can't read
|
||||
directory ... trying su" and came up empty even though the sync had
|
||||
actually worked) - it's expected, not a bug. Confirm synced files
|
||||
landed via `adb shell run-as`/a rooted shell, not a regular file
|
||||
manager UI.
|
||||
- **Already-synced files skip the network** in two places:
|
||||
`SyncStatusController.localSyncedFilePath(item)` is a pure function of the
|
||||
remote path (mirrors `SyncEngine.kt`'s `syncRoot` layout exactly, so Dart
|
||||
never needs to read the native sync-state `SharedPreferences`) that
|
||||
returns the local mirror path if it exists on disk. `ShareSheet`'s "Share
|
||||
file directly" and `FilesView._downloadSelected` (only when *every*
|
||||
selected file is already synced - a mixed selection still goes through
|
||||
the normal `DownloadService` batch) both check it first.
|
||||
|
||||
## Working offline
|
||||
|
||||
[`ConnectivityController`](../../lib/providers/connectivity_controller.dart)
|
||||
wraps `connectivity_plus` (OS-level route detection - Wi-Fi/mobile/none,
|
||||
not a guarantee the Nextcloud server itself is reachable) and is the
|
||||
single source of truth every offline-aware decision in the app consults.
|
||||
**Its very first `checkConnectivity()` call is re-verified once more,
|
||||
~2 seconds later** - that first check can spuriously report "no network"
|
||||
while Android's connectivity stack is still attaching callbacks to a
|
||||
just-started process (a real cold-start quirk, not a genuine transition),
|
||||
and since `onConnectivityChanged` only fires on actual transitions, a
|
||||
false initial "offline" read would otherwise stick for the rest of the
|
||||
session with no further event ever correcting it - `SessionController`
|
||||
would keep treating the login as provisional indefinitely, and every
|
||||
network-fetching controller (Files/Photos/Favorites/Trash/Shares/Recent)
|
||||
would simply never receive its real activation signal, leaving every tab
|
||||
permanently empty despite the device being online the whole time. This
|
||||
was a real, previously-shipped regression, not a hypothetical.
|
||||
|
||||
- **Session restore never makes a doomed HTTP request.**
|
||||
`SessionController._applyCredentialsForAccount` checks
|
||||
`connectivity.isOffline` *before* calling `NextcloudService.testConnection()`
|
||||
- if there's no route at all, it skips the request entirely rather than
|
||||
letting it fail (fast or slow) and parsing the exception. Either way (no
|
||||
route, or a network-level exception once a request is attempted -
|
||||
timeout, DNS, unreachable host, a transient 5xx), the session logs in
|
||||
*provisionally*: `_isLoggedIn = true` with the already-constructed
|
||||
`_service` kept around, `_isProvisionalLogin = true`. Only an actual 401
|
||||
(`_errorMessage` contains "401") is treated as a real rejection - drops
|
||||
the stored password and logs out for real. Provisional login exists
|
||||
specifically so a genuinely offline cold start still lands on
|
||||
`MainShellView` (restricted to the Offline tab - see below) instead of
|
||||
bouncing to `LoginView`, which would strand the user with no way back in
|
||||
short of Login Flow v2 again (`switchAccount` no-ops when "switching" to
|
||||
the account that's already nominally active, and `activeAccountId` is
|
||||
never cleared by a network failure).
|
||||
- **Two account-activation signals, not one**, precisely so a provisional
|
||||
login doesn't cascade into a pile of doomed requests from every other
|
||||
controller: `addAccountActivatedListener` (fires *only* on a real,
|
||||
verified login - what `FilesController`/`PhotosController`/
|
||||
`FavoritesController`/`TrashController`/`SharesController`/
|
||||
`RecentController` all register for, since their own activation work is
|
||||
a network fetch) vs. `addAccountReadyListener` (fires on *either* a
|
||||
verified or a provisional login - what `SyncStatusController`/
|
||||
`OfflineController` register for instead, since their own activation
|
||||
work - loading prefs, listing local files, calling the native sync
|
||||
MethodChannel - is local/native-only and safe with no connection at
|
||||
all). A provisional login fires only `ready`, never `activated`; a
|
||||
verified login fires both.
|
||||
- **Reconnecting re-verifies automatically.** `SessionController` listens
|
||||
to `connectivity` itself; the moment it flips from offline to online
|
||||
while `_isProvisionalLogin` is still true, it re-runs
|
||||
`_applyCredentialsForAccount` with the same cached account/password. On
|
||||
success this is what finally fires `_notifyAccountActivated` for real,
|
||||
so Files/Photos/etc. get their first actual fetch without the user
|
||||
having to force-quit/restart the app.
|
||||
- **`MainShellView` collapses the bottom nav to just the Offline tab**
|
||||
while `connectivity.isOffline`, the same override mechanism already used
|
||||
for picking mode (see `architecture.md`) - every other tab would just
|
||||
show its own loading spinner or error state with no connection, so
|
||||
there's nothing useful to switch to. `MoreTabsButton` hides entirely in
|
||||
this state too, for the same reason it hides while picking - there's no
|
||||
hidden tab it could usefully open either.
|
||||
- **The sync header's "Offline" label wins over everything else.**
|
||||
`_syncHeaderDisplay`/`_syncSummary` (`synced_header_scaffold.dart`) both
|
||||
take a `bool isOffline` and check it first, ahead of conflicts/syncing/
|
||||
configured-targets - with no connection, *why* nothing's syncing right
|
||||
now matters more than what would otherwise be shown, so "Sync off"
|
||||
(nothing configured) and "Offline" (nothing *can* sync right now,
|
||||
regardless of configuration) stay distinct messages.
|
||||
- **`FileViewerScreen` can read a file straight from disk.** Its optional
|
||||
`localPathResolver` param (`Future<String?> Function(NextcloudItem)`,
|
||||
only ever set by the Offline tab, passing `OfflineController.
|
||||
localPathFor`) swaps every preview widget's data source -
|
||||
`_ImagePreview`/`_VideoPreview` use `Image.file`/
|
||||
`VideoPlayerController.file` instead of the `.network`/`.networkUrl`
|
||||
variants, `_PdfPreview`/`_TextPreview` read via
|
||||
`File(path).readAsBytes()` instead of `NextcloudService.fetchBytes` -
|
||||
same in-app viewer either way, no separate "offline preview" screen.
|
||||
Unlike a single up-front path, a *resolver* is what makes `siblings`
|
||||
(swipe-between-media) behave identically to Files/Photos while offline:
|
||||
the swipeable `PageView.builder` calls it again for whichever sibling
|
||||
you've swiped to (wrapped in a `FutureBuilder`, since each resolution
|
||||
is an async disk check), not just the item the viewer opened on - the
|
||||
Offline tab passes its whole current folder's `items` as `siblings`,
|
||||
same as Files does with its own. The action bar hides Favorite/Delete/
|
||||
Download-to-device (`showServerActions: false`) since those need a live
|
||||
server - Share and Open-externally still work (`_openExternally` calls
|
||||
the resolver directly instead of downloading to a temp file first;
|
||||
Share already prefers a local copy when one exists, see
|
||||
`ShareSheet._shareFileDirectly`).
|
||||
|
||||
## Multi-account storage & session persistence
|
||||
|
||||
[`AccountStore`](../../lib/services/account_store.dart) owns everything
|
||||
account-identity-related; `ServerProvider` owns everything about which
|
||||
account-identity-related; `SessionController` owns everything about which
|
||||
account is *currently* live (see `architecture.md`).
|
||||
|
||||
- **Per-account secrets**: one `flutter_secure_storage` key per account,
|
||||
@@ -98,26 +695,36 @@ account is *currently* live (see `architecture.md`).
|
||||
storage scope, show-hidden ×2, Photos sort field/ascending, Files'
|
||||
per-folder sort map, cache policy/interval — the full list is
|
||||
`AccountStore.perAccountPrefKeys`) are namespaced `acct_<accountId>_<key>`
|
||||
and reloaded on every switch via `ServerProvider._applyAccountPrefs`.
|
||||
and owned by whichever controller that domain belongs to (e.g.
|
||||
`FilesController` for grid/list/storage-scope/sort,
|
||||
`PhotosController` for Photos' own sort/filter). Each reloads its own
|
||||
slice in its `_onAccountActivated` listener, registered via
|
||||
`SessionController.addAccountActivatedListener` in its constructor -
|
||||
there's no longer one central method that reloads every domain's prefs at
|
||||
once; `SessionController` just fires the notification, and every sibling
|
||||
controller reacts independently.
|
||||
- **Legacy migration**: `AccountStore.migrateLegacyIfNeeded` runs once ever
|
||||
(guarded by the `account_migration_v1_done` flag), turning a pre-multi-
|
||||
account install's 3 flat secure-storage keys + flat browsing prefs into
|
||||
the first saved (and active) account, so upgrading users are never logged
|
||||
out. Never assume the legacy keys are gone — always check the migration
|
||||
flag rather than the keys' absence.
|
||||
- On startup, `ServerProvider._init()` awaits the migration, loads the
|
||||
account list + active id, then `_restoreSession()` looks up the active
|
||||
account's password and calls `_applyCredentialsForAccount` (the renamed,
|
||||
generation-guarded, account-aware version of what used to be
|
||||
`_applyCredentials`) to rebuild the session without re-hitting the login
|
||||
flow.
|
||||
- On startup, `SessionController`'s constructor awaits the migration, loads
|
||||
the account list + active id, then `_restoreSession()` looks up the
|
||||
active account's password and calls `_applyCredentialsForAccount`
|
||||
(generation-guarded, account-aware) to rebuild the session without
|
||||
re-hitting the login flow - firing `_notifyAccountActivated()` on
|
||||
success, which is what triggers every sibling controller's own initial
|
||||
fetch.
|
||||
- **Switching accounts** (`switchAccount`/`cycleToNextAccount`/
|
||||
`cycleToPreviousAccount`/`removeAccount`'s fallback, plus landing on a
|
||||
freshly-added account) all funnel through the single `_activateAccount`
|
||||
engine: bump `_sessionGeneration`, cancel any pending login flow, clear
|
||||
every content field *without* ever setting `isLoggedIn` false (that's the
|
||||
detail that keeps `main.dart`'s root routing from bouncing through
|
||||
`LoginView` mid-switch), reload the target account's prefs, then verify
|
||||
engine: bump `sessionGeneration`, cancel any pending login flow, call
|
||||
`_notifyAccountCleared()` (every sibling controller's registered
|
||||
`addAccountClearedListener` callback resets that controller's own state)
|
||||
*without* ever setting `isLoggedIn` false (that's the detail that keeps
|
||||
`main.dart`'s root routing from bouncing through `LoginView` mid-switch),
|
||||
then verify
|
||||
its credentials and refetch everything. This is a full teardown-and-reload
|
||||
every time — there is deliberately no simultaneous multi-account state or
|
||||
background sync; only one account's content is ever live.
|
||||
@@ -139,7 +746,7 @@ account is *currently* live (see `architecture.md`).
|
||||
that's actually destructive/irreversible - UI call sites (`AccountView`)
|
||||
gate it behind a confirmation dialog; `logout()` doesn't need one.
|
||||
- Any UI code that calls either and might have ended the session should
|
||||
check `!provider.isLoggedIn` afterward and `Navigator.popUntil((r) =>
|
||||
check `!session.isLoggedIn` afterward and `Navigator.popUntil((r) =>
|
||||
r.isFirst)` if so — otherwise a screen pushed on top (Settings) is left
|
||||
stranded over a root route that's silently swapped to `LoginView`
|
||||
underneath it. Don't pop unconditionally — removing a *non-active*
|
||||
@@ -155,7 +762,7 @@ app. [`AppLockService`](../../lib/services/app_lock_service.dart) wraps
|
||||
`authenticate()` always delegates to whatever the OS already has configured
|
||||
(biometric, or device PIN/pattern/password as fallback, via
|
||||
`biometricOnly: false`). Never build a custom in-app PIN screen for this —
|
||||
extend `AppLockService`/the `ServerProvider` gates described in
|
||||
extend `AppLockService`/the `SessionController` gates described in
|
||||
`architecture.md` instead.
|
||||
|
||||
**Android native requirements** (both already done, keep them if you touch
|
||||
|
||||
@@ -29,37 +29,48 @@ class/method already makes obvious.
|
||||
- Private helpers/widgets are prefixed with `_` and live in the same file as
|
||||
their one caller; promote to `widgets/` only once something is reused
|
||||
across files.
|
||||
- Read provider state with `context.watch<ServerProvider>()` in `build`,
|
||||
and `context.read<ServerProvider>()` for one-off calls from callbacks
|
||||
(matches `LoginView._handleContinue`).
|
||||
- Read controller state with `context.watch<XController>()` in `build`, and
|
||||
`context.read<XController>()` for one-off calls from callbacks (matches
|
||||
`LoginView._handleContinue`). Pull in only the specific controller(s) a
|
||||
widget actually needs (e.g. `FilesController` + `SyncStatusController`
|
||||
for a Files tile), not a catch-all — see `architecture.md`'s "State
|
||||
management" section for the full controller split and what each one owns.
|
||||
|
||||
## `ServerProvider` conventions
|
||||
## Controller conventions
|
||||
|
||||
- Any method that fetches data and writes it into a shared field
|
||||
(`refreshData`, `fetchAllMedia`, `fetchTrash`, `fetchShares`,
|
||||
`fetchRecent`, `_applyCredentialsForAccount`) must guard against a stale
|
||||
write from an account the user has since switched away from: capture
|
||||
`final gen = _sessionGeneration;` at entry, and check
|
||||
`if (gen != _sessionGeneration) return;` immediately after each `await`
|
||||
before touching any field or calling `notifyListeners()`. Follow this
|
||||
pattern for any new fetch method added to the provider.
|
||||
- New persisted state on `ServerProvider` must be classified global vs.
|
||||
per-account (see `architecture.md`/`server.md`) up front — global state
|
||||
uses a plain `_prefsFuture.then((p) => p.setX(key, value))`; per-account
|
||||
state goes through `_persistAccountPref(key, (p, namespacedKey) =>
|
||||
p.setX(namespacedKey, value))` and must also be handled in
|
||||
`_applyAccountPrefs` (both the "reset to default when no account" and the
|
||||
"load for this account" branches) so it's correct immediately after a
|
||||
switch, not just at startup.
|
||||
(`FilesController.refreshData`, `PhotosController.fetchAllMedia`,
|
||||
`TrashController.fetchAll`, `SharesController.fetchAll`,
|
||||
`RecentController.fetchAll`, `SessionController._applyCredentialsForAccount`)
|
||||
must guard against a stale write from an account the user has since
|
||||
switched away from: capture `final gen = session.sessionGeneration;` at
|
||||
entry, and check `if (gen != session.sessionGeneration) return;`
|
||||
immediately after each `await` before touching any field or calling
|
||||
`notifyListeners()`. Follow this pattern for any new fetch method added
|
||||
to any controller.
|
||||
- New persisted state must be classified global vs. per-account (see
|
||||
`architecture.md`/`server.md`) up front and live on whichever controller
|
||||
owns that domain — global state (`SettingsController`) uses a plain
|
||||
`_prefsFuture.then((p) => p.setX(key, value))`; per-account state goes
|
||||
through `_persistAccountPref(key, (p, namespacedKey) =>
|
||||
p.setX(namespacedKey, value))` and must also be handled in that
|
||||
controller's own `_onAccountCleared`/`_onAccountActivated` listeners
|
||||
(registered via `SessionController.addAccountClearedListener`/
|
||||
`addAccountActivatedListener` in the controller's constructor) so it's
|
||||
correct immediately after a switch, not just at startup.
|
||||
|
||||
## Testing
|
||||
|
||||
- Widget tests must mock platform channels that the app touches on startup
|
||||
— `SharedPreferences.setMockInitialValues({})` and a mock
|
||||
`MethodChannel('plugins.it_nomads.com/flutter_secure_storage')` handler —
|
||||
and disable Google Fonts network fetching
|
||||
— `SharedPreferences.setMockInitialValues({})`, a mock
|
||||
`MethodChannel('plugins.it_nomads.com/flutter_secure_storage')` handler,
|
||||
and `connectivity_plus`'s `MethodChannel('dev.fluttercommunity.plus/
|
||||
connectivity')` (`'check'` → a result list, e.g. `['wifi']`) plus its
|
||||
`EventChannel('dev.fluttercommunity.plus/connectivity_status')` (a
|
||||
`MockStreamHandler.inline` with a no-op `onListen` is enough) — and
|
||||
disable Google Fonts network fetching
|
||||
(`GoogleFonts.config.allowRuntimeFetching = false`) in `setUpAll`. Without
|
||||
these, `ServerProvider`'s session restore never resolves in the test
|
||||
these, `SessionController`'s session restore never resolves in the test
|
||||
sandbox (no plugin implementation is registered, so the read future just
|
||||
never completes) and the app stays on `_SplashView`'s indeterminate
|
||||
spinner, which makes `pumpAndSettle()` hang until its own timeout instead
|
||||
@@ -84,13 +95,19 @@ adb install -r build/app/outputs/flutter-apk/app-release.apk
|
||||
```
|
||||
|
||||
This only preserves data if the new APK's signature matches what's already
|
||||
on the device — a local build's release variant currently reuses the debug
|
||||
signing config (`android/app/build.gradle.kts`), so consecutive local
|
||||
builds share a key and `adb install -r` works cleanly. Installing a build
|
||||
signed with a different key (e.g. a CI-signed release APK from the Gitea
|
||||
release pipeline) over a differently-signed local build forces Android to
|
||||
require a full uninstall regardless of the install method used — there's no
|
||||
way around that from the tooling side.
|
||||
on the device. `android/app/build.gradle.kts` picks a release signing key
|
||||
in this order: a local `android/key.properties` (gitignored — points at a
|
||||
gitignored keystore file, e.g. `android/app/release-keystore.jks`), then
|
||||
CI env vars (`RELEASE_KEYSTORE_PATH`/`_PASSWORD`, `RELEASE_KEY_ALIAS`/
|
||||
`_PASSWORD`, set by `.gitea/workflows/build.yml` from repo secrets), then
|
||||
falls back to the debug key if neither is configured. As long as the same
|
||||
dedicated release keystore backs both `key.properties` locally and the
|
||||
Gitea secrets, local release builds and CI-built release APKs share one
|
||||
signature, so `adb install -r` works cleanly either way. A local checkout
|
||||
with no `key.properties` set up falls back to the (per-machine, ungitted)
|
||||
debug key, which won't match a CI-signed APK — installing one over the
|
||||
other still forces a full uninstall, since there's no way around Android's
|
||||
signature check from the tooling side.
|
||||
|
||||
## Dependencies
|
||||
|
||||
|
||||
@@ -1,5 +1,13 @@
|
||||
# Styling
|
||||
|
||||
**Migration in progress:** this file documents the current (pre-rework)
|
||||
Material 3 theme. The target look is
|
||||
[`design-system/DESIGN_SYSTEM.md`](design-system/DESIGN_SYSTEM.md) — warm
|
||||
neutrals, one violet accent, pill controls, Schibsted Grotesk/Instrument
|
||||
Sans, no gradients/shadows. Update this file to describe the new system as
|
||||
each area gets reworked, rather than leaving stale Material 3 guidance next
|
||||
to a design system that's already superseded it.
|
||||
|
||||
## Theme
|
||||
|
||||
All theming goes through [`AppTheme`](../../lib/theme/app_theme.dart)
|
||||
@@ -36,6 +44,29 @@ widgets. Key points:
|
||||
|
||||
## Reusable chrome
|
||||
|
||||
- `MediaGridTile` (`lib/widgets/media_grid_tile.dart`): the full-bleed image/video
|
||||
grid card with name/size scrim, shared by Files (server preview) and Offline
|
||||
(local `FileImage`, images only - no video frame-extraction plugin, so offline
|
||||
videos use the plain icon card). `ItemThumbnail` takes an optional `localFile`
|
||||
for the same offline-image case in list tiles.
|
||||
- `FilesControlsRow` (`lib/widgets/files_controls_row.dart`): the
|
||||
sort/hidden/scope/type-filter/view-mode row, shared by the Files and
|
||||
Offline tabs (`showStorageScope: false` for Offline).
|
||||
|
||||
- [`getItemIcon`/`getIconColor`/`ItemThumbnail`](../../lib/widgets/item_icon.dart)
|
||||
— the icon/color/thumbnail treatment for a file or folder, shared by any
|
||||
screen that lists `NextcloudItem`s the way the Files tab does (currently
|
||||
`files_view.dart` and `share_upload_view.dart`'s destination picker).
|
||||
Extend this rather than re-deriving per-type icons/colors at a new call
|
||||
site.
|
||||
- [`DetailsHeader`](../../lib/widgets/details/details_sheet.dart) — the
|
||||
icon-box/name/meta row every per-item bottom sheet opens on
|
||||
(`DetailsSheet`, the media viewer's collapsed peek state, and
|
||||
`ShareSheet`). Takes a `padding` override for callers whose own scroll
|
||||
view already applies horizontal insets (`ShareSheet`'s `ListView`), so it
|
||||
doesn't get doubled up. Reuse this instead of a bare title `Text` for any
|
||||
new per-item sheet - a plain title reads as under-designed next to the
|
||||
other sheets (a real instance: `ShareSheet` used to be just that).
|
||||
- [`FrostedGlassContainer`](../../lib/widgets/frosted_glass_container.dart) —
|
||||
the blurred/translucent pill background shared by all floating chrome
|
||||
(bottom nav bar, media-viewer top/bottom bars and video transport
|
||||
@@ -43,13 +74,30 @@ widgets. Key points:
|
||||
new blur/shadow combo.
|
||||
- [`FloatingBottomNavBar`](../../lib/widgets/floating_bottom_bar.dart) — the
|
||||
main tab bar; opacity/blur are user-adjustable settings
|
||||
(`ServerProvider.bottomBarOpacity`/`bottomBarBlur`), not constants — pull
|
||||
new adjustable visual knobs from the provider the same way rather than
|
||||
hardcoding them.
|
||||
(`SettingsController.bottomBarOpacity`/`bottomBarBlur`), not constants —
|
||||
pull new adjustable visual knobs from `SettingsController` the same way
|
||||
rather than hardcoding them.
|
||||
- [`SyncedHeaderScaffold`](../../lib/widgets/synced_header_scaffold.dart) —
|
||||
the pull-to-sync `CustomScrollView` header shared by 5 of the 6 tabs (see
|
||||
the pull-to-sync `CustomScrollView` header shared by all 8 tabs (see
|
||||
`architecture.md`); also where the pull-to-refresh gesture thresholds and
|
||||
the classic Material refresh spinner live.
|
||||
the classic Material refresh spinner live. Its persistent compact chip
|
||||
(icon + "Sync off"/"Syncing…"/"Synced"/"Sync issue") reflects device-sync
|
||||
status (`SyncStatusController.syncHeaderStatus`), not the WebDAV-refresh
|
||||
loading state the pull gesture itself triggers - that has its own,
|
||||
separate floating spinner bubble, so nothing was lost by handing the
|
||||
persistent text/icon over. The expanded panel's headline is a separate,
|
||||
more detailed string (`_syncSummary` in `synced_header_scaffold.dart`) -
|
||||
counts of what's actually configured to sync ("2 folders & 1 file
|
||||
synced") rather than just repeating the chip's generic label.
|
||||
Deliberately doesn't add up the individual files inside a synced folder
|
||||
("1 folder synced", not "1 folder & 4 items synced") - once a folder's
|
||||
synced, its file count is an implementation detail, not something the
|
||||
user picked.
|
||||
- [`SyncStatusBadge`](../../lib/widgets/sync_status_badge.dart) — the small
|
||||
corner badge over a thumbnail showing per-item device-sync status
|
||||
(`cloud_done`/`sync`, nothing for not-synced/conflict); used in Files'
|
||||
list and grid tiles today. Reuse this rather than a new ad hoc badge if
|
||||
another view starts showing sync status per item.
|
||||
- [`SeekBarPainter`/`SeekBarPreview`](../../lib/widgets/seek_bar_painter.dart)
|
||||
— the four `MediaProgressBarStyle` presets (Default/Wavy/Slim/Squiggly)
|
||||
for the video player's seek bar, plus a perpetually-animated
|
||||
@@ -81,3 +129,14 @@ widgets. Key points:
|
||||
exception, since those colors are content-identity cues, not theme).
|
||||
- Use `colorScheme.surfaceContainer*`/`onSurfaceVariant` tokens for
|
||||
elevation/secondary text rather than manual opacity on black/white.
|
||||
- **Anywhere the app shows its own icon in-app** (splash, lock screen,
|
||||
login screen) uses `assets/icon/app_icon_monochrome.png` — a plain white
|
||||
silhouette on transparent, tinted via `ColorFiltered(colorFilter:
|
||||
ColorFilter.mode(colorScheme.onSurface, BlendMode.srcIn), ...)` so it
|
||||
reads correctly in both light and dark mode. Never the full-color
|
||||
`app_icon.png`/adaptive-icon assets for in-app UI — those are for the
|
||||
launcher icon only. The launcher icon is maintained by hand from an
|
||||
IconKitchen export (`mipmap-*` in `android/app/src/main/res`); there is no
|
||||
generator step. `assets/icon/app_icon_monochrome.png` is deliberately a
|
||||
tightly-cropped glyph (unlike the launcher's safe-zone-padded monochrome
|
||||
layer), so it renders at a sensible size at 72-80px.
|
||||
|
||||
@@ -43,8 +43,22 @@ jobs:
|
||||
- name: Analyze
|
||||
run: flutter analyze
|
||||
|
||||
- name: Decode release keystore
|
||||
# Keeps every release build - regardless of which runner built it -
|
||||
# signed with the same key, so downloaded updates install cleanly
|
||||
# over a previous release instead of failing with "App not
|
||||
# installed" (mismatched signature). See android/app/build.gradle.kts.
|
||||
run: echo "$RELEASE_KEYSTORE_BASE64" | base64 -d > "${{ runner.temp }}/release-keystore.jks"
|
||||
env:
|
||||
RELEASE_KEYSTORE_BASE64: ${{ secrets.RELEASE_KEYSTORE_BASE64 }}
|
||||
|
||||
- name: Build release APK
|
||||
run: flutter build apk --release
|
||||
env:
|
||||
RELEASE_KEYSTORE_PATH: ${{ runner.temp }}/release-keystore.jks
|
||||
RELEASE_KEYSTORE_PASSWORD: ${{ secrets.RELEASE_KEYSTORE_PASSWORD }}
|
||||
RELEASE_KEY_ALIAS: ${{ secrets.RELEASE_KEY_ALIAS }}
|
||||
RELEASE_KEY_PASSWORD: ${{ secrets.RELEASE_KEY_PASSWORD }}
|
||||
|
||||
- name: Rename APK to Noo-<version>.apk
|
||||
run: |
|
||||
|
||||
@@ -15,6 +15,11 @@ relevant file(s) before working in that area rather than loading all of them:
|
||||
conventions, fonts, reusable chrome widgets
|
||||
- [`standards.md`](.claude/context/standards.md) — code style, comment
|
||||
conventions, linting, testing
|
||||
- [`design-system/DESIGN_SYSTEM.md`](.claude/context/design-system/DESIGN_SYSTEM.md)
|
||||
— the target visual/component spec (tokens, components, platform
|
||||
mapping, screen recipes) for the in-progress UI rework; the sibling
|
||||
`.dc.html`/`noo-kit.js` files it references are the visual/token
|
||||
reference builds, not something to read directly
|
||||
|
||||
## Common commands
|
||||
|
||||
|
||||
@@ -4,6 +4,7 @@ gradle-wrapper.jar
|
||||
/gradlew
|
||||
/gradlew.bat
|
||||
/local.properties
|
||||
/build/
|
||||
GeneratedPluginRegistrant.java
|
||||
.cxx/
|
||||
|
||||
@@ -12,3 +13,4 @@ GeneratedPluginRegistrant.java
|
||||
key.properties
|
||||
**/*.keystore
|
||||
**/*.jks
|
||||
RELEASE_SIGNING_SECRETS.txt
|
||||
|
||||
@@ -1,9 +1,35 @@
|
||||
import java.util.Properties
|
||||
|
||||
plugins {
|
||||
id("com.android.application")
|
||||
// The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
|
||||
id("dev.flutter.flutter-gradle-plugin")
|
||||
}
|
||||
|
||||
// Release signing: prefer a local android/key.properties (gitignored, for
|
||||
// a developer machine that has the release keystore), then CI env vars
|
||||
// (set by .gitea/workflows/build.yml from repo secrets), then null - which
|
||||
// falls back to debug signing below so an unconfigured checkout still
|
||||
// builds/runs fine, same as before this existed.
|
||||
val releaseKeystoreProperties = Properties().apply {
|
||||
val propsFile = rootProject.file("key.properties")
|
||||
if (propsFile.exists()) propsFile.inputStream().use { load(it) }
|
||||
}
|
||||
|
||||
fun releaseSigningValue(propertyKey: String, envKey: String): String? =
|
||||
releaseKeystoreProperties.getProperty(propertyKey) ?: System.getenv(envKey)
|
||||
|
||||
val releaseStoreFile = releaseSigningValue("storeFile", "RELEASE_KEYSTORE_PATH")
|
||||
val releaseStorePassword = releaseSigningValue("storePassword", "RELEASE_KEYSTORE_PASSWORD")
|
||||
val releaseKeyAlias = releaseSigningValue("keyAlias", "RELEASE_KEY_ALIAS")
|
||||
val releaseKeyPassword = releaseSigningValue("keyPassword", "RELEASE_KEY_PASSWORD")
|
||||
val hasReleaseSigning = listOf(
|
||||
releaseStoreFile,
|
||||
releaseStorePassword,
|
||||
releaseKeyAlias,
|
||||
releaseKeyPassword,
|
||||
).all { !it.isNullOrBlank() }
|
||||
|
||||
android {
|
||||
namespace = "dev.ayushya.noo"
|
||||
compileSdk = flutter.compileSdkVersion
|
||||
@@ -27,11 +53,27 @@ android {
|
||||
versionName = flutter.versionName
|
||||
}
|
||||
|
||||
signingConfigs {
|
||||
if (hasReleaseSigning) {
|
||||
create("release") {
|
||||
storeFile = file(releaseStoreFile!!)
|
||||
storePassword = releaseStorePassword
|
||||
keyAlias = releaseKeyAlias
|
||||
keyPassword = releaseKeyPassword
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
buildTypes {
|
||||
release {
|
||||
// TODO: Add your own signing config for the release build.
|
||||
// Signing with the debug keys for now, so `flutter run --release` works.
|
||||
signingConfig = signingConfigs.getByName("debug")
|
||||
// Falls back to the debug keystore (so an unconfigured
|
||||
// checkout can still `flutter run --release`) when no release
|
||||
// signing config is available - see the comment above.
|
||||
signingConfig = if (hasReleaseSigning) {
|
||||
signingConfigs.getByName("release")
|
||||
} else {
|
||||
signingConfigs.getByName("debug")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -42,6 +84,18 @@ kotlin {
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
// Device sync's periodic/one-off background jobs (SyncWorker,
|
||||
// ConflictResolveWorker) - see their doc comments for why this is
|
||||
// plain WorkManager rather than a Dart-side background-task plugin.
|
||||
implementation("androidx.work:work-runtime-ktx:2.9.1")
|
||||
// PROPFIND (WebDAV directory listing) - Android's HttpURLConnection
|
||||
// hard-rejects any method outside {OPTIONS,GET,HEAD,POST,PUT,DELETE,
|
||||
// TRACE,PATCH} (ProtocolException), unlike plain OpenJDK. OkHttp has
|
||||
// no such whitelist. See SyncEngine.kt.
|
||||
implementation("com.squareup.okhttp3:okhttp:4.12.0")
|
||||
}
|
||||
|
||||
flutter {
|
||||
source = "../.."
|
||||
}
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
# Device sync (SyncWorker/ConflictResolveWorker) - WorkManager instantiates
|
||||
# a lot of its own internals via reflection (Workers by class name recorded
|
||||
# at enqueue time, its bundled Room database's *_Impl class off the
|
||||
# abstract database class's own name, its default InputMerger, etc). R8's
|
||||
# member-level shrinking silently breaks any of these - e.g. stripping an
|
||||
# "unused" no-arg constructor - even when the class itself survives a
|
||||
# plain `-keep class` with no wildcard, and narrowly keeping only the
|
||||
# classes hit by one test pass just means the next reflection path (a
|
||||
# different WorkManager-internal class) breaks instead. Two separate
|
||||
# instances of this already bit real testing (WorkDatabase, then
|
||||
# OverwritingInputMerger) before landing on this broad keep - see
|
||||
# android/app/build.gradle.kts (androidx.work dependency) and
|
||||
# .claude/context/server.md's "Device sync" section.
|
||||
-keep class androidx.work.** { *; }
|
||||
-keep class * extends androidx.room.RoomDatabase { *; }
|
||||
-keep class dev.ayushya.noo.SyncWorker { *; }
|
||||
-keep class dev.ayushya.noo.ConflictResolveWorker { *; }
|
||||
-keep class dev.ayushya.noo.SyncConflictReceiver { *; }
|
||||
@@ -2,6 +2,23 @@
|
||||
<uses-permission android:name="android.permission.INTERNET"/>
|
||||
<!-- For local_auth's biometric app-lock (Settings > Security). -->
|
||||
<uses-permission android:name="android.permission.USE_BIOMETRIC"/>
|
||||
<!-- For connectivity_plus (ConnectivityController), which gates the
|
||||
Offline tab restriction and skips network requests entirely while
|
||||
offline - see session_controller.dart/main.dart. -->
|
||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
|
||||
<!-- For ShareUploadService/DownloadService, which keep a "Share to Noo"
|
||||
upload/download going (and cancellable from its notification) even
|
||||
if the app is fully closed - see each service's own doc comment. -->
|
||||
<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
|
||||
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC"/>
|
||||
<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
|
||||
<!-- DownloadService's pre-Android-10 fallback only (MediaStore.Downloads
|
||||
needs no runtime permission on API 29+, which is what targetSdk
|
||||
actually enforces) - capped with maxSdkVersion so it's not even
|
||||
requested on newer devices. -->
|
||||
<uses-permission
|
||||
android:name="android.permission.WRITE_EXTERNAL_STORAGE"
|
||||
android:maxSdkVersion="28"/>
|
||||
<application
|
||||
android:label="Noo"
|
||||
android:name="${applicationName}"
|
||||
@@ -31,7 +48,8 @@
|
||||
<category android:name="android.intent.category.LAUNCHER"/>
|
||||
</intent-filter>
|
||||
<!-- Lets other apps' share sheets ("Share to...") send a file here
|
||||
to be uploaded, via receive_sharing_intent. -->
|
||||
to be uploaded - handled by MainActivity.kt directly, not a
|
||||
plugin (see its doc comment for why). -->
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.SEND"/>
|
||||
<category android:name="android.intent.category.DEFAULT"/>
|
||||
@@ -42,7 +60,45 @@
|
||||
<category android:name="android.intent.category.DEFAULT"/>
|
||||
<data android:mimeType="*/*"/>
|
||||
</intent-filter>
|
||||
<!-- Lets Noo be picked as a source ("Google Photos", "Files", ...)
|
||||
from another app's own file/photo picker chooser - handled by
|
||||
MainActivity.kt/PickIntentService, not a plugin. A single
|
||||
"*/*" filter matches any mimeType the caller requests
|
||||
(image/*, video/*, or a generic file pick). -->
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.GET_CONTENT"/>
|
||||
<category android:name="android.intent.category.DEFAULT"/>
|
||||
<category android:name="android.intent.category.OPENABLE"/>
|
||||
<data android:mimeType="*/*"/>
|
||||
</intent-filter>
|
||||
</activity>
|
||||
<service
|
||||
android:name=".ShareUploadService"
|
||||
android:exported="false"
|
||||
android:foregroundServiceType="dataSync"/>
|
||||
<service
|
||||
android:name=".DownloadService"
|
||||
android:exported="false"
|
||||
android:foregroundServiceType="dataSync"/>
|
||||
<!-- The "Keep local"/"Use server" actions on a sync-conflict
|
||||
notification (SyncWorker/SyncEngine) - must be a manifest-
|
||||
registered receiver, not a runtime-registered one, since it
|
||||
needs to work even when the app process isn't running. -->
|
||||
<receiver
|
||||
android:name=".SyncConflictReceiver"
|
||||
android:exported="false"/>
|
||||
<!-- Hands back the file(s) a caller picked via the GET_CONTENT filter
|
||||
above - only the app's own cache/picker/ subfolder is exposed,
|
||||
see file_paths.xml. -->
|
||||
<provider
|
||||
android:name="androidx.core.content.FileProvider"
|
||||
android:authorities="${applicationId}.picker.fileprovider"
|
||||
android:exported="false"
|
||||
android:grantUriPermissions="true">
|
||||
<meta-data
|
||||
android:name="android.support.FILE_PROVIDER_PATHS"
|
||||
android:resource="@xml/file_paths"/>
|
||||
</provider>
|
||||
<!-- Don't delete the meta-data below.
|
||||
This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
|
||||
<meta-data
|
||||
@@ -59,12 +115,6 @@
|
||||
<action android:name="android.intent.action.PROCESS_TEXT"/>
|
||||
<data android:mimeType="text/plain"/>
|
||||
</intent>
|
||||
<!-- Needed so url_launcher can find a browser for Nextcloud Login Flow v2. -->
|
||||
<intent>
|
||||
<action android:name="android.intent.action.VIEW"/>
|
||||
<category android:name="android.intent.category.BROWSABLE"/>
|
||||
<data android:scheme="https"/>
|
||||
</intent>
|
||||
<!-- Needed so open_file can find apps to open downloaded files. -->
|
||||
<intent>
|
||||
<action android:name="android.intent.action.VIEW"/>
|
||||
|
||||
@@ -0,0 +1,109 @@
|
||||
package dev.ayushya.noo
|
||||
|
||||
import android.content.Context
|
||||
import androidx.work.CoroutineWorker
|
||||
import androidx.work.OneTimeWorkRequestBuilder
|
||||
import androidx.work.WorkManager
|
||||
import androidx.work.WorkerParameters
|
||||
import androidx.work.workDataOf
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.sync.withLock
|
||||
import kotlinx.coroutines.withContext
|
||||
import java.io.File
|
||||
|
||||
/**
|
||||
* Resolves one sync conflict, triggered either by [SyncConflictReceiver]
|
||||
* (a notification action) or directly from Dart (in-app resolution via the
|
||||
* `dev.ayushya.noo/sync_service` MethodChannel's `resolveConflict`, see
|
||||
* `MainActivity.kt`) - "local" pushes the on-device copy up (overwriting
|
||||
* the server), "server" pulls the server copy down (overwriting the local
|
||||
* mirror). Either way, the sync-state entry for this file is refreshed
|
||||
* afterward so the next [SyncWorker] pass doesn't immediately re-flag it.
|
||||
*/
|
||||
class ConflictResolveWorker(appContext: Context, params: WorkerParameters) :
|
||||
CoroutineWorker(appContext, params) {
|
||||
|
||||
companion object {
|
||||
const val KEY_ACCOUNT_ID = "accountId"
|
||||
const val KEY_SERVER_URL = "serverUrl"
|
||||
const val KEY_USERNAME = "username"
|
||||
const val KEY_AUTH_HEADER = "authHeader"
|
||||
const val KEY_FILE_ID = "fileId"
|
||||
const val KEY_REMOTE_PATH = "remotePath"
|
||||
const val KEY_REL_PATH = "relPath"
|
||||
const val KEY_RESOLUTION = "resolution"
|
||||
|
||||
/** The one place a resolution gets enqueued - both callers above share it. */
|
||||
fun enqueue(
|
||||
context: Context,
|
||||
accountId: String?,
|
||||
serverUrl: String?,
|
||||
username: String?,
|
||||
authHeader: String?,
|
||||
fileId: String?,
|
||||
remotePath: String?,
|
||||
relPath: String?,
|
||||
resolution: String?,
|
||||
) {
|
||||
val data = workDataOf(
|
||||
KEY_ACCOUNT_ID to accountId,
|
||||
KEY_SERVER_URL to serverUrl,
|
||||
KEY_USERNAME to username,
|
||||
KEY_AUTH_HEADER to authHeader,
|
||||
KEY_FILE_ID to fileId,
|
||||
KEY_REMOTE_PATH to remotePath,
|
||||
KEY_REL_PATH to relPath,
|
||||
KEY_RESOLUTION to resolution,
|
||||
)
|
||||
val request = OneTimeWorkRequestBuilder<ConflictResolveWorker>()
|
||||
.setInputData(data)
|
||||
.build()
|
||||
WorkManager.getInstance(context).enqueue(request)
|
||||
}
|
||||
}
|
||||
|
||||
override suspend fun doWork(): Result = withContext(Dispatchers.IO) {
|
||||
// Same lock as SyncWorker: both load/mutate/save the whole state map.
|
||||
SyncEngine.syncLock.withLock { performResolve() }
|
||||
}
|
||||
|
||||
private suspend fun performResolve(): Result = withContext(Dispatchers.IO) {
|
||||
val accountId = inputData.getString(KEY_ACCOUNT_ID) ?: return@withContext Result.failure()
|
||||
val serverUrl = inputData.getString(KEY_SERVER_URL) ?: return@withContext Result.failure()
|
||||
val username = inputData.getString(KEY_USERNAME) ?: return@withContext Result.failure()
|
||||
val authHeader = inputData.getString(KEY_AUTH_HEADER) ?: return@withContext Result.failure()
|
||||
val fileId = inputData.getString(KEY_FILE_ID) ?: return@withContext Result.failure()
|
||||
val remotePath = inputData.getString(KEY_REMOTE_PATH) ?: return@withContext Result.failure()
|
||||
val relPath = inputData.getString(KEY_REL_PATH) ?: return@withContext Result.failure()
|
||||
val resolution = inputData.getString(KEY_RESOLUTION) ?: return@withContext Result.failure()
|
||||
|
||||
val syncRoot = SyncEngine.syncRoot(applicationContext, accountId)
|
||||
val localFile = File(syncRoot, relPath)
|
||||
val ok = when (resolution) {
|
||||
"local" -> localFile.exists() &&
|
||||
SyncEngine.uploadFile(serverUrl, username, authHeader, remotePath, localFile)
|
||||
"server" -> SyncEngine.downloadFile(serverUrl, username, authHeader, remotePath, localFile)
|
||||
else -> false
|
||||
}
|
||||
if (!ok) return@withContext Result.retry()
|
||||
|
||||
// Refresh the recorded state from the server's post-resolution
|
||||
// etag, so this file isn't immediately re-flagged as a conflict on
|
||||
// the next sync pass.
|
||||
val fresh = runCatching {
|
||||
SyncEngine.propfindSelf(serverUrl, username, authHeader, remotePath)
|
||||
}.getOrNull()
|
||||
val state = SyncEngine.loadState(applicationContext, accountId).toMutableMap()
|
||||
state[fileId] = SyncEngine.FileState(
|
||||
relPath = relPath,
|
||||
etag = fresh?.etag ?: "",
|
||||
lastModified = fresh?.lastModified ?: 0L,
|
||||
size = localFile.length(),
|
||||
localMTime = localFile.lastModified(),
|
||||
)
|
||||
SyncEngine.saveState(applicationContext, accountId, state)
|
||||
SyncStatusBus.removeConflict(accountId, fileId)
|
||||
|
||||
Result.success()
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,140 @@
|
||||
package dev.ayushya.noo
|
||||
|
||||
import java.io.File
|
||||
import java.io.OutputStream
|
||||
import java.net.HttpURLConnection
|
||||
import java.net.URL
|
||||
|
||||
/**
|
||||
* Shared low-level WebDAV GET/PUT primitives (plain `HttpURLConnection`, no
|
||||
* new HTTP dependency) - used by [DownloadService], [ShareUploadService],
|
||||
* and [SyncEngine], which each independently re-implemented this same
|
||||
* ~20-line connect/stream/disconnect shape before this existed. Progress
|
||||
* reporting and cancellation are optional: the two foreground Services
|
||||
* pass both (user-visible, cancellable transfers); [SyncEngine]'s
|
||||
* background callers pass neither.
|
||||
*
|
||||
* Deliberately does *not* know about `OCS-APIRequest` - that header is for
|
||||
* OCS REST endpoints (shares/activity/quota), not plain WebDAV GET/PUT,
|
||||
* and was previously sent by mistake on some of these calls; dropped here
|
||||
* so every caller gets the same (correct) minimal header set.
|
||||
*/
|
||||
object DavTransfer {
|
||||
const val CONNECT_TIMEOUT_MS = 15000
|
||||
const val READ_TIMEOUT_MS = 30000
|
||||
const val UPLOAD_READ_TIMEOUT_MS = 60000
|
||||
private const val BUFFER_SIZE = 256 * 1024
|
||||
private const val PROGRESS_THROTTLE_MS = 200
|
||||
|
||||
/** GETs [url] into [destination] (a plain file), creating parent dirs as needed. */
|
||||
fun get(
|
||||
url: URL,
|
||||
authHeader: String,
|
||||
destination: File,
|
||||
onProgress: ((received: Long, total: Long?) -> Unit)? = null,
|
||||
isCancelled: (() -> Boolean)? = null,
|
||||
): Boolean {
|
||||
destination.parentFile?.mkdirs()
|
||||
return getInto(url, authHeader, { destination.outputStream() }, onProgress, isCancelled)
|
||||
}
|
||||
|
||||
/**
|
||||
* GETs [url] into whatever [openOutput] returns - a plain `File` output
|
||||
* stream or, for [DownloadService]'s MediaStore-staged entries, a
|
||||
* `ContentResolver`-provided one the caller owns.
|
||||
*/
|
||||
fun getInto(
|
||||
url: URL,
|
||||
authHeader: String,
|
||||
openOutput: () -> OutputStream?,
|
||||
onProgress: ((received: Long, total: Long?) -> Unit)? = null,
|
||||
isCancelled: (() -> Boolean)? = null,
|
||||
): Boolean {
|
||||
val connection = url.openConnection() as HttpURLConnection
|
||||
return try {
|
||||
connection.requestMethod = "GET"
|
||||
connection.setRequestProperty("Authorization", authHeader)
|
||||
connection.connectTimeout = CONNECT_TIMEOUT_MS
|
||||
connection.readTimeout = READ_TIMEOUT_MS
|
||||
connection.connect()
|
||||
if (connection.responseCode !in 200..299) return false
|
||||
|
||||
val total = connection.contentLengthLong.takeIf { it > 0 }
|
||||
val output = openOutput() ?: return false
|
||||
output.use { out ->
|
||||
connection.inputStream.use { input ->
|
||||
copyWithProgress(input, out, total, onProgress, isCancelled)
|
||||
}
|
||||
}
|
||||
isCancelled?.invoke() != true
|
||||
} catch (e: Exception) {
|
||||
false
|
||||
} finally {
|
||||
connection.disconnect()
|
||||
}
|
||||
}
|
||||
|
||||
/** PUTs [source]'s bytes to [url]. */
|
||||
fun put(
|
||||
url: URL,
|
||||
authHeader: String,
|
||||
source: File,
|
||||
contentType: String? = null,
|
||||
onProgress: ((sent: Long, total: Long) -> Unit)? = null,
|
||||
isCancelled: (() -> Boolean)? = null,
|
||||
): Boolean {
|
||||
val length = source.length()
|
||||
val connection = url.openConnection() as HttpURLConnection
|
||||
return try {
|
||||
connection.requestMethod = "PUT"
|
||||
connection.doOutput = true
|
||||
connection.setFixedLengthStreamingMode(length)
|
||||
connection.setRequestProperty("Authorization", authHeader)
|
||||
if (contentType != null) connection.setRequestProperty("Content-Type", contentType)
|
||||
connection.connectTimeout = CONNECT_TIMEOUT_MS
|
||||
connection.readTimeout = UPLOAD_READ_TIMEOUT_MS
|
||||
|
||||
connection.outputStream.use { output ->
|
||||
source.inputStream().use { input ->
|
||||
copyWithProgress(input, output, length, { sent, total ->
|
||||
onProgress?.invoke(sent, total ?: length)
|
||||
}, isCancelled)
|
||||
}
|
||||
}
|
||||
if (isCancelled?.invoke() == true) {
|
||||
false
|
||||
} else {
|
||||
connection.responseCode in 200..299
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
false
|
||||
} finally {
|
||||
connection.disconnect()
|
||||
}
|
||||
}
|
||||
|
||||
private fun copyWithProgress(
|
||||
input: java.io.InputStream,
|
||||
output: OutputStream,
|
||||
total: Long?,
|
||||
onProgress: ((Long, Long?) -> Unit)?,
|
||||
isCancelled: (() -> Boolean)?,
|
||||
) {
|
||||
val buffer = ByteArray(BUFFER_SIZE)
|
||||
var transferred = 0L
|
||||
var lastEmit = 0L
|
||||
while (isCancelled?.invoke() != true) {
|
||||
val read = input.read(buffer)
|
||||
if (read == -1) break
|
||||
output.write(buffer, 0, read)
|
||||
transferred += read
|
||||
if (onProgress != null) {
|
||||
val now = System.currentTimeMillis()
|
||||
if (now - lastEmit >= PROGRESS_THROTTLE_MS) {
|
||||
lastEmit = now
|
||||
onProgress(transferred, total)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,280 @@
|
||||
package dev.ayushya.noo
|
||||
|
||||
import android.app.Notification
|
||||
import android.app.NotificationManager
|
||||
import android.app.PendingIntent
|
||||
import android.app.Service
|
||||
import android.content.ContentValues
|
||||
import android.content.Context
|
||||
import android.content.Intent
|
||||
import android.content.pm.ServiceInfo
|
||||
import android.net.Uri
|
||||
import android.os.Build
|
||||
import android.os.Environment
|
||||
import android.os.IBinder
|
||||
import android.provider.MediaStore
|
||||
import androidx.core.app.NotificationCompat
|
||||
import androidx.core.app.ServiceCompat
|
||||
import org.json.JSONArray
|
||||
import java.io.File
|
||||
import java.net.URL
|
||||
|
||||
/**
|
||||
* Foreground service that downloads one or more files over WebDAV straight
|
||||
* into the device's public Downloads folder, independent of MainActivity/
|
||||
* the Flutter engine being alive - the download counterpart of
|
||||
* ShareUploadService.kt (see its doc comment: only a real Android Service
|
||||
* survives the app being closed mid-transfer, the same guarantee a real
|
||||
* file-manager app's download notification gives you). GET itself is
|
||||
* [DavTransfer.getInto]; this file owns only what's specific to
|
||||
* downloading - MediaStore staging and the notification/queue plumbing.
|
||||
*
|
||||
* Started via the `dev.ayushya.noo/download_service` MethodChannel
|
||||
* (MainActivity.kt). Shows one persistent, cancellable notification for
|
||||
* the whole batch; a second batch arriving mid-download queues behind the
|
||||
* first (see [TransferQueue]) instead of being dropped.
|
||||
*/
|
||||
class DownloadService : Service() {
|
||||
companion object {
|
||||
const val ACTION_CANCEL = "dev.ayushya.noo.action.CANCEL_DOWNLOAD"
|
||||
const val EXTRA_FILES = "files" // JSON array of {path, name, mimeType, size}
|
||||
const val EXTRA_SERVER_URL = "serverUrl"
|
||||
const val EXTRA_USERNAME = "username"
|
||||
const val EXTRA_AUTH_HEADER = "authHeader"
|
||||
|
||||
private const val CHANNEL_ID = "file_downloads_v2"
|
||||
private const val NOTIFICATION_ID = 4301
|
||||
}
|
||||
|
||||
private data class DownloadFile(
|
||||
val path: String,
|
||||
val name: String,
|
||||
val mimeType: String?,
|
||||
val size: Long?,
|
||||
)
|
||||
|
||||
private data class DownloadBatch(
|
||||
val files: List<DownloadFile>,
|
||||
val serverUrl: String,
|
||||
val username: String,
|
||||
val authHeader: String,
|
||||
)
|
||||
|
||||
@Volatile
|
||||
private var cancelled = false
|
||||
private val queue = TransferQueue<DownloadBatch> { runDownloads(it) }
|
||||
|
||||
override fun onBind(intent: Intent?): IBinder? = null
|
||||
|
||||
override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
|
||||
if (intent?.action == ACTION_CANCEL) {
|
||||
cancelled = true
|
||||
queue.clearPending()
|
||||
return START_NOT_STICKY
|
||||
}
|
||||
|
||||
val filesJson = intent?.getStringExtra(EXTRA_FILES)
|
||||
val serverUrl = intent?.getStringExtra(EXTRA_SERVER_URL)
|
||||
val username = intent?.getStringExtra(EXTRA_USERNAME)
|
||||
val authHeader = intent?.getStringExtra(EXTRA_AUTH_HEADER)
|
||||
if (filesJson == null || serverUrl == null || username == null || authHeader == null) {
|
||||
stopSelf()
|
||||
return START_NOT_STICKY
|
||||
}
|
||||
|
||||
NooNotificationChannels.ensure(
|
||||
this,
|
||||
CHANNEL_ID,
|
||||
"File downloads",
|
||||
// Default (not low) importance so a finished download actually
|
||||
// alerts; the progress updates themselves stay silent below.
|
||||
NotificationManager.IMPORTANCE_DEFAULT,
|
||||
"Progress and completion of files downloaded from Noo",
|
||||
legacyIds = listOf("file_downloads"),
|
||||
)
|
||||
ServiceCompat.startForeground(
|
||||
this,
|
||||
NOTIFICATION_ID,
|
||||
buildProgressNotification("Preparing to download…", null, indeterminate = true),
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
|
||||
ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
|
||||
} else {
|
||||
0
|
||||
},
|
||||
)
|
||||
|
||||
queue.enqueue(DownloadBatch(parseFiles(filesJson), serverUrl, username, authHeader))
|
||||
return START_NOT_STICKY
|
||||
}
|
||||
|
||||
private fun parseFiles(json: String): List<DownloadFile> {
|
||||
val arr = JSONArray(json)
|
||||
return (0 until arr.length()).map { i ->
|
||||
val obj = arr.getJSONObject(i)
|
||||
DownloadFile(
|
||||
path = obj.getString("path"),
|
||||
name = obj.getString("name"),
|
||||
mimeType = if (obj.isNull("mimeType")) null else obj.getString("mimeType"),
|
||||
size = if (obj.isNull("size")) null else obj.getLong("size"),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
private fun runDownloads(batch: DownloadBatch) {
|
||||
cancelled = false
|
||||
var succeeded = 0
|
||||
var failed = 0
|
||||
val cleanServer = batch.serverUrl.trimEnd('/')
|
||||
|
||||
for ((index, file) in batch.files.withIndex()) {
|
||||
if (cancelled) break
|
||||
val label = if (batch.files.size == 1) {
|
||||
file.name
|
||||
} else {
|
||||
"${file.name} (${index + 1}/${batch.files.size})"
|
||||
}
|
||||
try {
|
||||
var cleanPath = file.path.trim()
|
||||
if (!cleanPath.startsWith("/")) cleanPath = "/$cleanPath"
|
||||
val encodedPath = cleanPath.split("/").joinToString("/") { Uri.encode(it) }
|
||||
val url = URL("$cleanServer/remote.php/dav/files/${batch.username}$encodedPath")
|
||||
val ok = downloadFile(file, url, batch.authHeader) { received, total ->
|
||||
notify(
|
||||
buildProgressNotification(
|
||||
"Downloading $label…",
|
||||
progressFraction(received, total),
|
||||
indeterminate = total == null,
|
||||
),
|
||||
)
|
||||
}
|
||||
if (ok) succeeded++ else failed++
|
||||
} catch (e: Exception) {
|
||||
failed++
|
||||
}
|
||||
}
|
||||
|
||||
val finalText = when {
|
||||
cancelled -> "Download cancelled"
|
||||
failed == 0 && batch.files.size == 1 -> "Downloaded ${batch.files.first().name}"
|
||||
failed == 0 -> "Downloaded $succeeded of ${batch.files.size} files"
|
||||
else -> "Downloaded $succeeded of ${batch.files.size} files - $failed failed"
|
||||
}
|
||||
manager().notify(NOTIFICATION_ID, buildFinalNotification(finalText))
|
||||
|
||||
if (queue.pendingCount == 0) {
|
||||
stopForeground(STOP_FOREGROUND_DETACH)
|
||||
stopSelf()
|
||||
}
|
||||
}
|
||||
|
||||
private fun progressFraction(received: Long, total: Long?): Float? {
|
||||
if (total == null || total <= 0) return null
|
||||
return (received.toFloat() / total.toFloat()).coerceIn(0f, 1f)
|
||||
}
|
||||
|
||||
/// Streams the GET response straight into the public Downloads
|
||||
/// collection via MediaStore (API 29+) - scoped storage means a
|
||||
/// background Service can't prompt a SAF picker the way `file_saver`
|
||||
/// does from the Flutter/Activity side, so this writes directly to the
|
||||
/// Downloads collection instead, same place a browser download lands.
|
||||
/// Pre-Q devices fall back to the legacy public Downloads directory.
|
||||
private fun downloadFile(
|
||||
file: DownloadFile,
|
||||
url: URL,
|
||||
authHeader: String,
|
||||
onProgress: (Long, Long?) -> Unit,
|
||||
): Boolean {
|
||||
val mimeType = file.mimeType ?: "application/octet-stream"
|
||||
var outputUri: Uri? = null
|
||||
val ok = DavTransfer.getInto(
|
||||
url,
|
||||
authHeader,
|
||||
openOutput = {
|
||||
val uri = createDownloadsEntry(file.name, mimeType)
|
||||
if (uri != null) {
|
||||
outputUri = uri
|
||||
contentResolver.openOutputStream(uri)
|
||||
} else {
|
||||
null
|
||||
}
|
||||
},
|
||||
onProgress = { received, total -> onProgress(received, file.size ?: total) },
|
||||
isCancelled = { cancelled },
|
||||
)
|
||||
|
||||
outputUri?.let { uri ->
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
|
||||
val values = ContentValues().apply { put(MediaStore.Downloads.IS_PENDING, 0) }
|
||||
contentResolver.update(uri, values, null, null)
|
||||
}
|
||||
if (!ok) contentResolver.delete(uri, null, null)
|
||||
}
|
||||
return ok
|
||||
}
|
||||
|
||||
private fun createDownloadsEntry(name: String, mimeType: String): Uri? {
|
||||
return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
|
||||
val values = ContentValues().apply {
|
||||
put(MediaStore.Downloads.DISPLAY_NAME, name)
|
||||
put(MediaStore.Downloads.MIME_TYPE, mimeType)
|
||||
put(MediaStore.Downloads.IS_PENDING, 1)
|
||||
}
|
||||
contentResolver.insert(MediaStore.Downloads.EXTERNAL_CONTENT_URI, values)
|
||||
} else {
|
||||
@Suppress("DEPRECATION")
|
||||
val downloadsDir =
|
||||
Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)
|
||||
if (!downloadsDir.exists()) downloadsDir.mkdirs()
|
||||
Uri.fromFile(File(downloadsDir, name))
|
||||
}
|
||||
}
|
||||
|
||||
private fun manager() =
|
||||
getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
|
||||
|
||||
private fun notify(notification: Notification) {
|
||||
manager().notify(NOTIFICATION_ID, notification)
|
||||
}
|
||||
|
||||
private fun buildProgressNotification(
|
||||
text: String,
|
||||
progress: Float?,
|
||||
indeterminate: Boolean,
|
||||
): Notification {
|
||||
val cancelIntent = Intent(this, DownloadService::class.java).apply { action = ACTION_CANCEL }
|
||||
val cancelPendingIntent = PendingIntent.getService(
|
||||
this,
|
||||
0,
|
||||
cancelIntent,
|
||||
PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE,
|
||||
)
|
||||
val builder = NotificationCompat.Builder(this, CHANNEL_ID)
|
||||
.setSmallIcon(android.R.drawable.stat_sys_download)
|
||||
.setContentTitle("Downloading from Noo")
|
||||
.setContentText(text)
|
||||
.setOnlyAlertOnce(true)
|
||||
.setSilent(true)
|
||||
.setOngoing(true)
|
||||
.addAction(android.R.drawable.ic_menu_close_clear_cancel, "Cancel", cancelPendingIntent)
|
||||
when {
|
||||
indeterminate -> builder.setProgress(100, 0, true)
|
||||
progress != null -> builder.setProgress(100, (progress * 100).toInt(), false)
|
||||
}
|
||||
return builder.build()
|
||||
}
|
||||
|
||||
private fun buildFinalNotification(text: String): Notification {
|
||||
return NotificationCompat.Builder(this, CHANNEL_ID)
|
||||
.setSmallIcon(android.R.drawable.stat_sys_download_done)
|
||||
.setContentTitle("Noo")
|
||||
.setContentText(text)
|
||||
.setOngoing(false)
|
||||
.setAutoCancel(true)
|
||||
.build()
|
||||
}
|
||||
|
||||
override fun onDestroy() {
|
||||
cancelled = true
|
||||
super.onDestroy()
|
||||
}
|
||||
}
|
||||
@@ -1,8 +1,572 @@
|
||||
package dev.ayushya.noo
|
||||
|
||||
import android.Manifest
|
||||
import android.content.ClipData
|
||||
import android.content.Intent
|
||||
import android.content.pm.PackageManager
|
||||
import android.net.Uri
|
||||
import android.os.Build
|
||||
import android.os.Handler
|
||||
import android.os.Looper
|
||||
import android.provider.OpenableColumns
|
||||
import androidx.core.app.ActivityCompat
|
||||
import androidx.core.content.ContextCompat
|
||||
import androidx.core.content.FileProvider
|
||||
import androidx.work.Constraints
|
||||
import androidx.work.ExistingPeriodicWorkPolicy
|
||||
import androidx.work.ExistingWorkPolicy
|
||||
import androidx.work.NetworkType
|
||||
import androidx.work.OneTimeWorkRequestBuilder
|
||||
import androidx.work.PeriodicWorkRequestBuilder
|
||||
import androidx.work.WorkManager
|
||||
import androidx.work.workDataOf
|
||||
import io.flutter.embedding.android.FlutterFragmentActivity
|
||||
import io.flutter.embedding.engine.FlutterEngine
|
||||
import io.flutter.plugin.common.EventChannel
|
||||
import io.flutter.plugin.common.MethodCall
|
||||
import io.flutter.plugin.common.MethodChannel
|
||||
import org.json.JSONArray
|
||||
import java.io.File
|
||||
import java.util.concurrent.TimeUnit
|
||||
|
||||
// FlutterFragmentActivity (not the default FlutterActivity) is required by
|
||||
// local_auth's Android implementation, which hosts its biometric/device
|
||||
// credential prompt via a Fragment.
|
||||
class MainActivity : FlutterFragmentActivity()
|
||||
//
|
||||
// Also hand-rolls "Share to Noo" intent handling instead of using the
|
||||
// receive_sharing_intent plugin: that plugin resolves a shared content:// URI
|
||||
// by synchronously copying the *entire* file into the app's cache dir on the
|
||||
// main thread, during activity startup, before Flutter has even drawn its
|
||||
// first frame - fine for a photo, but for a large video/archive it blocks
|
||||
// long enough that Android decides this newly-launched activity failed to
|
||||
// render and kills it (silently back to the home screen - no crash, no
|
||||
// Dart-side error, since Dart never got a chance to run). Other file-manager
|
||||
// apps show their destination picker instantly regardless of file size
|
||||
// because they defer touching the file's actual bytes until the user picks
|
||||
// a destination - `getInitialShare`/`onNewShare` only ever query cheap Uri
|
||||
// metadata (name/size/mime, not content). The actual copy+upload then runs
|
||||
// in ShareUploadService (see its own doc comment), not here, so it survives
|
||||
// the app being closed right after the user confirms a destination.
|
||||
class MainActivity : FlutterFragmentActivity() {
|
||||
private val shareIntentChannelName = "dev.ayushya.noo/share_intent"
|
||||
private val newShareChannelName = "dev.ayushya.noo/share_intent/new"
|
||||
private val uploadServiceChannelName = "dev.ayushya.noo/upload_service"
|
||||
private val downloadServiceChannelName = "dev.ayushya.noo/download_service"
|
||||
private val pickIntentChannelName = "dev.ayushya.noo/pick_intent"
|
||||
private val newPickChannelName = "dev.ayushya.noo/pick_intent/new"
|
||||
private val syncServiceChannelName = "dev.ayushya.noo/sync_service"
|
||||
private val syncStatusChannelName = "dev.ayushya.noo/sync_service/status"
|
||||
private val notificationPermissionRequestCode = 4202
|
||||
// Lazy, not a field initializer - `packageName` reads through the
|
||||
// Activity's base Context, which isn't attached yet while this class's
|
||||
// fields are being constructed (crashes with an NPE if evaluated then).
|
||||
private val pickerFileProviderAuthority by lazy { "$packageName.picker.fileprovider" }
|
||||
|
||||
private val mainHandler = Handler(Looper.getMainLooper())
|
||||
private var newShareSink: EventChannel.EventSink? = null
|
||||
private var newPickSink: EventChannel.EventSink? = null
|
||||
private var syncStatusListener: ((SyncStatusBus.Status) -> Unit)? = null
|
||||
|
||||
override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
|
||||
super.configureFlutterEngine(flutterEngine)
|
||||
|
||||
MethodChannel(flutterEngine.dartExecutor.binaryMessenger, shareIntentChannelName)
|
||||
.setMethodCallHandler { call, result ->
|
||||
when (call.method) {
|
||||
"getInitialShare" -> result.success(extractShareMetadata(intent))
|
||||
else -> result.notImplemented()
|
||||
}
|
||||
}
|
||||
|
||||
EventChannel(flutterEngine.dartExecutor.binaryMessenger, newShareChannelName)
|
||||
.setStreamHandler(object : EventChannel.StreamHandler {
|
||||
override fun onListen(arguments: Any?, events: EventChannel.EventSink) {
|
||||
newShareSink = events
|
||||
}
|
||||
override fun onCancel(arguments: Any?) {
|
||||
newShareSink = null
|
||||
}
|
||||
})
|
||||
|
||||
MethodChannel(flutterEngine.dartExecutor.binaryMessenger, uploadServiceChannelName)
|
||||
.setMethodCallHandler { call, result ->
|
||||
when (call.method) {
|
||||
"startUpload" -> {
|
||||
startUploadService(call, result)
|
||||
}
|
||||
else -> result.notImplemented()
|
||||
}
|
||||
}
|
||||
|
||||
MethodChannel(flutterEngine.dartExecutor.binaryMessenger, downloadServiceChannelName)
|
||||
.setMethodCallHandler { call, result ->
|
||||
when (call.method) {
|
||||
"startDownload" -> {
|
||||
startDownloadService(call, result)
|
||||
}
|
||||
else -> result.notImplemented()
|
||||
}
|
||||
}
|
||||
|
||||
MethodChannel(flutterEngine.dartExecutor.binaryMessenger, pickIntentChannelName)
|
||||
.setMethodCallHandler { call, result ->
|
||||
when (call.method) {
|
||||
"getPickRequest" -> result.success(extractPickRequest(intent))
|
||||
"finishPick" -> finishPick(call, result)
|
||||
"cancelPick" -> cancelPick(result)
|
||||
else -> result.notImplemented()
|
||||
}
|
||||
}
|
||||
|
||||
EventChannel(flutterEngine.dartExecutor.binaryMessenger, newPickChannelName)
|
||||
.setStreamHandler(object : EventChannel.StreamHandler {
|
||||
override fun onListen(arguments: Any?, events: EventChannel.EventSink) {
|
||||
newPickSink = events
|
||||
}
|
||||
override fun onCancel(arguments: Any?) {
|
||||
newPickSink = null
|
||||
}
|
||||
})
|
||||
|
||||
MethodChannel(flutterEngine.dartExecutor.binaryMessenger, syncServiceChannelName)
|
||||
.setMethodCallHandler { call, result ->
|
||||
when (call.method) {
|
||||
"reschedule" -> rescheduleSyncWork(call, result)
|
||||
"cancel" -> cancelSyncWork(call, result)
|
||||
"syncNow" -> syncNow(call, result)
|
||||
"getSyncStatus" -> result.success(
|
||||
syncStatusMap(SyncStatusBus.snapshot(), call.argument<String>("accountId")),
|
||||
)
|
||||
"resolveConflict" -> resolveConflict(call, result)
|
||||
"removeLocalSync" -> removeLocalSync(call, result)
|
||||
else -> result.notImplemented()
|
||||
}
|
||||
}
|
||||
|
||||
EventChannel(flutterEngine.dartExecutor.binaryMessenger, syncStatusChannelName)
|
||||
.setStreamHandler(object : EventChannel.StreamHandler {
|
||||
override fun onListen(arguments: Any?, events: EventChannel.EventSink) {
|
||||
val listener: (SyncStatusBus.Status) -> Unit = { status ->
|
||||
mainHandler.post { events.success(syncStatusMap(status)) }
|
||||
}
|
||||
syncStatusListener = listener
|
||||
SyncStatusBus.subscribe(listener)
|
||||
}
|
||||
override fun onCancel(arguments: Any?) {
|
||||
syncStatusListener?.let { SyncStatusBus.unsubscribe(it) }
|
||||
syncStatusListener = null
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
/// [accountIdOverride] is the account Dart is asking about - needed
|
||||
/// because [SyncStatusBus] only learns an account once a sync pass has
|
||||
/// run in this process, so on a fresh app start its `accountId` is null
|
||||
/// and the durable per-file synced state (which is what actually says
|
||||
/// "this file is mirrored") would otherwise be reported as empty.
|
||||
private fun syncStatusMap(
|
||||
status: SyncStatusBus.Status,
|
||||
accountIdOverride: String? = null,
|
||||
): Map<String, Any?> {
|
||||
val accountId = accountIdOverride ?: status.accountId
|
||||
// Live syncing/conflict state on the bus belongs to whichever
|
||||
// account last synced - don't attribute it to a different one.
|
||||
val busMatches = status.accountId == null || status.accountId == accountId
|
||||
val syncedFileIds = accountId?.let {
|
||||
SyncEngine.loadState(applicationContext, it).keys.toList()
|
||||
} ?: emptyList()
|
||||
return mapOf(
|
||||
"accountId" to accountId,
|
||||
"syncing" to (busMatches && status.syncing),
|
||||
"syncingFileIds" to if (busMatches) status.syncingFileIds.toList() else emptyList(),
|
||||
"syncedFileIds" to syncedFileIds,
|
||||
"missingRoots" to (accountId?.let {
|
||||
SyncEngine.loadMissingRoots(applicationContext, it).toList()
|
||||
} ?: emptyList()),
|
||||
"conflicts" to (if (busMatches) status.conflicts else emptyList()).map {
|
||||
mapOf(
|
||||
"accountId" to it.accountId,
|
||||
"fileId" to it.fileId,
|
||||
"remotePath" to it.remotePath,
|
||||
"relPath" to it.relPath,
|
||||
"name" to it.name,
|
||||
)
|
||||
},
|
||||
)
|
||||
}
|
||||
|
||||
/// In-app conflict resolution (the header's "Keep local"/"Use server"
|
||||
/// buttons) - shares [ConflictResolveWorker.enqueue] with
|
||||
/// [SyncConflictReceiver], the only other caller, so there's one
|
||||
/// resolution code path regardless of whether it's triggered from a
|
||||
/// notification or from inside the app.
|
||||
private fun resolveConflict(call: MethodCall, result: MethodChannel.Result) {
|
||||
ConflictResolveWorker.enqueue(
|
||||
this,
|
||||
accountId = call.argument<String>("accountId"),
|
||||
serverUrl = call.argument<String>("serverUrl"),
|
||||
username = call.argument<String>("username"),
|
||||
authHeader = call.argument<String>("authHeader"),
|
||||
fileId = call.argument<String>("fileId"),
|
||||
remotePath = call.argument<String>("remotePath"),
|
||||
relPath = call.argument<String>("relPath"),
|
||||
resolution = call.argument<String>("resolution"),
|
||||
)
|
||||
result.success(null)
|
||||
}
|
||||
|
||||
override fun onNewIntent(intent: Intent) {
|
||||
super.onNewIntent(intent)
|
||||
setIntent(intent)
|
||||
val shared = extractShareMetadata(intent)
|
||||
if (shared.isNotEmpty()) {
|
||||
mainHandler.post { newShareSink?.success(shared) }
|
||||
}
|
||||
val pickRequest = extractPickRequest(intent)
|
||||
if (pickRequest != null) {
|
||||
mainHandler.post { newPickSink?.success(pickRequest) }
|
||||
}
|
||||
}
|
||||
|
||||
/// Cheap Uri metadata only (display name / size / mime type) via a
|
||||
/// single ContentResolver query - never reads the file's actual bytes,
|
||||
/// so this is fast regardless of how large the shared file is.
|
||||
private fun extractShareMetadata(intent: Intent): List<Map<String, Any?>> {
|
||||
val uris: List<Uri> = when (intent.action) {
|
||||
Intent.ACTION_SEND -> listOfNotNull(intentStreamUri(intent))
|
||||
Intent.ACTION_SEND_MULTIPLE -> intentStreamUris(intent)
|
||||
else -> emptyList()
|
||||
}
|
||||
return uris.map { uriMetadata(it) }
|
||||
}
|
||||
|
||||
@Suppress("DEPRECATION")
|
||||
private fun intentStreamUri(intent: Intent): Uri? {
|
||||
return if (Build.VERSION.SDK_INT >= 33) {
|
||||
intent.getParcelableExtra(Intent.EXTRA_STREAM, Uri::class.java)
|
||||
} else {
|
||||
intent.getParcelableExtra(Intent.EXTRA_STREAM)
|
||||
}
|
||||
}
|
||||
|
||||
@Suppress("DEPRECATION")
|
||||
private fun intentStreamUris(intent: Intent): List<Uri> {
|
||||
val list = if (Build.VERSION.SDK_INT >= 33) {
|
||||
intent.getParcelableArrayListExtra(Intent.EXTRA_STREAM, Uri::class.java)
|
||||
} else {
|
||||
intent.getParcelableArrayListExtra<Uri>(Intent.EXTRA_STREAM)
|
||||
}
|
||||
return list ?: emptyList()
|
||||
}
|
||||
|
||||
private fun uriMetadata(uri: Uri): Map<String, Any?> {
|
||||
var name = uri.lastPathSegment ?: "shared_file"
|
||||
var size: Long? = null
|
||||
try {
|
||||
contentResolver.query(
|
||||
uri,
|
||||
arrayOf(OpenableColumns.DISPLAY_NAME, OpenableColumns.SIZE),
|
||||
null,
|
||||
null,
|
||||
null,
|
||||
)?.use { cursor ->
|
||||
if (cursor.moveToFirst()) {
|
||||
val nameIdx = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME)
|
||||
if (nameIdx >= 0) cursor.getString(nameIdx)?.let { name = it }
|
||||
val sizeIdx = cursor.getColumnIndex(OpenableColumns.SIZE)
|
||||
if (sizeIdx >= 0 && !cursor.isNull(sizeIdx)) size = cursor.getLong(sizeIdx)
|
||||
}
|
||||
}
|
||||
} catch (_: Exception) {
|
||||
// Fall back to the Uri-derived name / unknown size below.
|
||||
}
|
||||
val mimeType = contentResolver.getType(uri)
|
||||
return mapOf("uri" to uri.toString(), "name" to name, "mimeType" to mimeType, "size" to size)
|
||||
}
|
||||
|
||||
/// Starts ShareUploadService with everything it needs to run entirely on
|
||||
/// its own (see its doc comment) - the Intent extras are the full
|
||||
/// contract between this call and that service, kept in sync manually
|
||||
/// since they cross the Kotlin/Dart boundary as loosely-typed args.
|
||||
private fun startUploadService(call: MethodCall, result: MethodChannel.Result) {
|
||||
val filesJson = call.argument<String>("files")
|
||||
val serverUrl = call.argument<String>("serverUrl")
|
||||
val username = call.argument<String>("username")
|
||||
val authHeader = call.argument<String>("authHeader")
|
||||
val remoteFolder = call.argument<String>("remoteFolder")
|
||||
if (filesJson == null || serverUrl == null || username == null ||
|
||||
authHeader == null || remoteFolder == null
|
||||
) {
|
||||
result.error("bad_args", "Missing required upload arguments", null)
|
||||
return
|
||||
}
|
||||
|
||||
if (Build.VERSION.SDK_INT >= 33 &&
|
||||
ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS) !=
|
||||
PackageManager.PERMISSION_GRANTED
|
||||
) {
|
||||
// Fire-and-forget: the service works fine even if this is denied,
|
||||
// it just won't be able to show progress/cancel in a notification.
|
||||
ActivityCompat.requestPermissions(
|
||||
this,
|
||||
arrayOf(Manifest.permission.POST_NOTIFICATIONS),
|
||||
notificationPermissionRequestCode,
|
||||
)
|
||||
}
|
||||
|
||||
val serviceIntent = Intent(this, ShareUploadService::class.java).apply {
|
||||
putExtra(ShareUploadService.EXTRA_FILES, filesJson)
|
||||
putExtra(ShareUploadService.EXTRA_SERVER_URL, serverUrl)
|
||||
putExtra(ShareUploadService.EXTRA_USERNAME, username)
|
||||
putExtra(ShareUploadService.EXTRA_AUTH_HEADER, authHeader)
|
||||
putExtra(ShareUploadService.EXTRA_REMOTE_FOLDER, remoteFolder)
|
||||
}
|
||||
ContextCompat.startForegroundService(this, serviceIntent)
|
||||
result.success(null)
|
||||
}
|
||||
|
||||
/// Starts DownloadService with everything it needs to run entirely on
|
||||
/// its own (see its doc comment) - same contract shape as
|
||||
/// [startUploadService], kept in sync manually for the same reason.
|
||||
private fun startDownloadService(call: MethodCall, result: MethodChannel.Result) {
|
||||
val filesJson = call.argument<String>("files")
|
||||
val serverUrl = call.argument<String>("serverUrl")
|
||||
val username = call.argument<String>("username")
|
||||
val authHeader = call.argument<String>("authHeader")
|
||||
if (filesJson == null || serverUrl == null || username == null || authHeader == null) {
|
||||
result.error("bad_args", "Missing required download arguments", null)
|
||||
return
|
||||
}
|
||||
|
||||
if (Build.VERSION.SDK_INT >= 33 &&
|
||||
ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS) !=
|
||||
PackageManager.PERMISSION_GRANTED
|
||||
) {
|
||||
// Fire-and-forget: the service works fine even if this is denied,
|
||||
// it just won't be able to show progress/cancel in a notification.
|
||||
ActivityCompat.requestPermissions(
|
||||
this,
|
||||
arrayOf(Manifest.permission.POST_NOTIFICATIONS),
|
||||
notificationPermissionRequestCode,
|
||||
)
|
||||
}
|
||||
|
||||
val serviceIntent = Intent(this, DownloadService::class.java).apply {
|
||||
putExtra(DownloadService.EXTRA_FILES, filesJson)
|
||||
putExtra(DownloadService.EXTRA_SERVER_URL, serverUrl)
|
||||
putExtra(DownloadService.EXTRA_USERNAME, username)
|
||||
putExtra(DownloadService.EXTRA_AUTH_HEADER, authHeader)
|
||||
}
|
||||
ContextCompat.startForegroundService(this, serviceIntent)
|
||||
result.success(null)
|
||||
}
|
||||
|
||||
/// Shared arg-parsing for `reschedule`/`syncNow` - both need the same
|
||||
/// account/credentials/folder-list shape, just enqueue differently.
|
||||
private fun syncWorkData(call: MethodCall, force: Boolean = false): androidx.work.Data? {
|
||||
val accountId = call.argument<String>("accountId")
|
||||
val serverUrl = call.argument<String>("serverUrl")
|
||||
val username = call.argument<String>("username")
|
||||
val authHeader = call.argument<String>("authHeader")
|
||||
val foldersJson = call.argument<String>("folders")
|
||||
if (accountId == null || serverUrl == null || username == null ||
|
||||
authHeader == null || foldersJson == null
|
||||
) {
|
||||
return null
|
||||
}
|
||||
return workDataOf(
|
||||
SyncWorker.KEY_ACCOUNT_ID to accountId,
|
||||
SyncWorker.KEY_SERVER_URL to serverUrl,
|
||||
SyncWorker.KEY_USERNAME to username,
|
||||
SyncWorker.KEY_AUTH_HEADER to authHeader,
|
||||
SyncWorker.KEY_FOLDERS to foldersJson,
|
||||
SyncWorker.KEY_FORCE to force,
|
||||
SyncWorker.KEY_NOTIFY to (call.argument<Boolean>("notify") ?: true),
|
||||
)
|
||||
}
|
||||
|
||||
/// Re-enqueues (or cancels, if the folder list is now empty) the
|
||||
/// periodic device-sync job - called from Dart whenever the synced-
|
||||
/// folder list, active account, or Wi-Fi-only setting changes, since a
|
||||
/// periodic WorkRequest's input Data/constraints are fixed at enqueue
|
||||
/// time and can only be changed by cancelling and re-enqueueing.
|
||||
private fun rescheduleSyncWork(call: MethodCall, result: MethodChannel.Result) {
|
||||
val accountId = call.argument<String>("accountId")
|
||||
if (accountId == null) {
|
||||
result.error("bad_args", "Missing accountId", null)
|
||||
return
|
||||
}
|
||||
val data = syncWorkData(call)
|
||||
val foldersJson = call.argument<String>("folders")
|
||||
val wifiOnly = call.argument<Boolean>("wifiOnly") ?: true
|
||||
// Null = periodic background sync is off (Files Cache set to
|
||||
// "never"/"manual") - only foreground triggers and pull-to-refresh
|
||||
// sync then. See SyncStatusController's doc comment.
|
||||
val intervalMinutes = call.argument<Int>("intervalMinutes")
|
||||
val workManager = WorkManager.getInstance(this)
|
||||
// The single shared job from before per-account scheduling.
|
||||
workManager.cancelUniqueWork(SyncWorker.UNIQUE_PERIODIC_NAME)
|
||||
|
||||
if (data == null || foldersJson == null || JSONArray(foldersJson).length() == 0 ||
|
||||
intervalMinutes == null
|
||||
) {
|
||||
workManager.cancelUniqueWork(SyncWorker.periodicNameFor(accountId))
|
||||
result.success(null)
|
||||
return
|
||||
}
|
||||
|
||||
val constraints = Constraints.Builder()
|
||||
.setRequiredNetworkType(if (wifiOnly) NetworkType.UNMETERED else NetworkType.CONNECTED)
|
||||
.build()
|
||||
// Follows the Files Cache "refresh periodically" interval. Android
|
||||
// won't run periodic work more often than every 15 minutes, so
|
||||
// shorter intervals are clamped up (the app's own in-foreground
|
||||
// timer covers the shorter cadence while it's open).
|
||||
val request = PeriodicWorkRequestBuilder<SyncWorker>(
|
||||
maxOf(intervalMinutes, 15).toLong(),
|
||||
TimeUnit.MINUTES,
|
||||
)
|
||||
.setInputData(data)
|
||||
.setConstraints(constraints)
|
||||
.build()
|
||||
workManager.enqueueUniquePeriodicWork(
|
||||
SyncWorker.periodicNameFor(accountId),
|
||||
ExistingPeriodicWorkPolicy.UPDATE,
|
||||
request,
|
||||
)
|
||||
result.success(null)
|
||||
}
|
||||
|
||||
/// Cancels one account's periodic job (e.g. when it's removed).
|
||||
private fun cancelSyncWork(call: MethodCall, result: MethodChannel.Result) {
|
||||
val accountId = call.argument<String>("accountId")
|
||||
val workManager = WorkManager.getInstance(this)
|
||||
if (accountId != null) {
|
||||
workManager.cancelUniqueWork(SyncWorker.periodicNameFor(accountId))
|
||||
}
|
||||
workManager.cancelUniqueWork(SyncWorker.UNIQUE_PERIODIC_NAME)
|
||||
result.success(null)
|
||||
}
|
||||
|
||||
/// Deletes a path's local mirror once the user turns sync off for it -
|
||||
/// see [SyncEngine.removeLocalSync]. Runs off the main thread since it
|
||||
/// walks/deletes a directory tree; `result.success` is posted back via
|
||||
/// [mainHandler] since MethodChannel results must be delivered on the
|
||||
/// platform thread.
|
||||
private fun removeLocalSync(call: MethodCall, result: MethodChannel.Result) {
|
||||
val accountId = call.argument<String>("accountId")
|
||||
val path = call.argument<String>("path")
|
||||
if (accountId == null || path == null) {
|
||||
result.error("bad_args", "Missing required arguments", null)
|
||||
return
|
||||
}
|
||||
Thread {
|
||||
SyncEngine.removeLocalSync(applicationContext, accountId, path)
|
||||
mainHandler.post { result.success(null) }
|
||||
}.start()
|
||||
}
|
||||
|
||||
/// One-off immediate run (Settings' "Sync now"), independent of the
|
||||
/// periodic schedule.
|
||||
private fun syncNow(call: MethodCall, result: MethodChannel.Result) {
|
||||
// `force` = an explicit "Sync now" / newly-added path: full walk,
|
||||
// visible progress, and it supersedes any in-flight run. Otherwise
|
||||
// (pull-to-refresh, foreground timer, app resume) it's a quiet
|
||||
// check that never interrupts a run already in progress; those may
|
||||
// additionally respect the Wi-Fi-only setting (`wifiOnly` present).
|
||||
val force = call.argument<Boolean>("force") ?: true
|
||||
val data = syncWorkData(call, force)
|
||||
if (data == null) {
|
||||
result.error("bad_args", "Missing required sync arguments", null)
|
||||
return
|
||||
}
|
||||
val wifiOnly = call.argument<Boolean>("wifiOnly")
|
||||
val builder = OneTimeWorkRequestBuilder<SyncWorker>().setInputData(data)
|
||||
if (wifiOnly != null) {
|
||||
builder.setConstraints(
|
||||
Constraints.Builder()
|
||||
.setRequiredNetworkType(
|
||||
if (wifiOnly) NetworkType.UNMETERED else NetworkType.CONNECTED,
|
||||
)
|
||||
.build(),
|
||||
)
|
||||
}
|
||||
WorkManager.getInstance(this).enqueueUniqueWork(
|
||||
// Per account so switching accounts doesn't let one account's
|
||||
// run replace/keep-out another's.
|
||||
SyncWorker.oneOffNameFor(call.argument<String>("accountId")!!),
|
||||
if (force) ExistingWorkPolicy.REPLACE else ExistingWorkPolicy.KEEP,
|
||||
builder.build(),
|
||||
)
|
||||
result.success(null)
|
||||
}
|
||||
|
||||
/// Non-null only when this Activity was launched (or re-delivered a new
|
||||
/// Intent) as another app's GET_CONTENT picker - the mimeType filter and
|
||||
/// multi-select flag the caller asked for, plus a best-effort display
|
||||
/// name for the calling app to show in the "picking mode" banner.
|
||||
private fun extractPickRequest(intent: Intent): Map<String, Any?>? {
|
||||
if (intent.action != Intent.ACTION_GET_CONTENT) return null
|
||||
val mimeType = intent.type ?: "*/*"
|
||||
val allowMultiple = intent.getBooleanExtra(Intent.EXTRA_ALLOW_MULTIPLE, false)
|
||||
val callerPackage = callingPackage
|
||||
val callerLabel = callerPackage?.let {
|
||||
try {
|
||||
val appInfo = packageManager.getApplicationInfo(it, 0)
|
||||
packageManager.getApplicationLabel(appInfo).toString()
|
||||
} catch (_: PackageManager.NameNotFoundException) {
|
||||
it
|
||||
}
|
||||
}
|
||||
return mapOf(
|
||||
"mimeType" to mimeType,
|
||||
"allowMultiple" to allowMultiple,
|
||||
"callerLabel" to callerLabel,
|
||||
)
|
||||
}
|
||||
|
||||
/// Hands the already-downloaded local files (see PickIntentService/
|
||||
/// ServerProvider.confirmPick - this Activity never touches the
|
||||
/// Nextcloud server itself) back to the caller as content:// Uris
|
||||
/// through this app's own FileProvider, then closes the picker.
|
||||
private fun finishPick(call: MethodCall, result: MethodChannel.Result) {
|
||||
val paths = call.argument<List<String>>("paths")
|
||||
val mimeTypes = call.argument<List<String>>("mimeTypes") ?: emptyList()
|
||||
if (paths.isNullOrEmpty()) {
|
||||
result.error("no_files", "No files to return to the caller", null)
|
||||
return
|
||||
}
|
||||
|
||||
val uris = paths.map { path ->
|
||||
FileProvider.getUriForFile(this, pickerFileProviderAuthority, File(path))
|
||||
}
|
||||
val resultIntent = Intent().apply {
|
||||
addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
|
||||
}
|
||||
// `Intent.setData()` and `.setType()` each silently null out the
|
||||
// other field if called separately (Android framework behavior) -
|
||||
// `setDataAndType` is the only way to have both survive on the same
|
||||
// Intent, which every GET_CONTENT caller expects for `data`.
|
||||
val firstMimeType = mimeTypes.getOrNull(0) ?: "*/*"
|
||||
if (uris.size == 1) {
|
||||
resultIntent.setDataAndType(uris[0], firstMimeType)
|
||||
} else {
|
||||
val clipMimeTypes = mimeTypes.ifEmpty { listOf("*/*") }.toTypedArray()
|
||||
val clipData = ClipData("Noo picked files", clipMimeTypes, ClipData.Item(uris[0]))
|
||||
for (i in 1 until uris.size) clipData.addItem(ClipData.Item(uris[i]))
|
||||
resultIntent.clipData = clipData
|
||||
// Some callers only read `data` even for a multi-item pick, so
|
||||
// this still points at the first file as a fallback.
|
||||
resultIntent.setDataAndType(uris[0], firstMimeType)
|
||||
}
|
||||
setResult(RESULT_OK, resultIntent)
|
||||
result.success(null)
|
||||
finish()
|
||||
}
|
||||
|
||||
private fun cancelPick(result: MethodChannel.Result) {
|
||||
setResult(RESULT_CANCELED)
|
||||
result.success(null)
|
||||
finish()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
package dev.ayushya.noo
|
||||
|
||||
import android.app.NotificationChannel
|
||||
import android.app.NotificationManager
|
||||
import android.content.Context
|
||||
import android.os.Build
|
||||
|
||||
/**
|
||||
* Shared notification-channel creation - [DownloadService],
|
||||
* [ShareUploadService], and [SyncWorker] each independently re-implemented
|
||||
* this same `if (SDK_INT >= O) { NotificationChannel(...); create }` shape
|
||||
* before this existed.
|
||||
*/
|
||||
object NooNotificationChannels {
|
||||
fun ensure(
|
||||
context: Context,
|
||||
id: String,
|
||||
name: String,
|
||||
importance: Int,
|
||||
description: String,
|
||||
// Old channel ids this one replaces. A channel's importance (and so
|
||||
// whether it makes sound) can't be changed once it's been created -
|
||||
// Android ignores later changes - so changing it means moving to a
|
||||
// new id and removing the old channel.
|
||||
legacyIds: List<String> = emptyList(),
|
||||
) {
|
||||
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return
|
||||
val manager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
|
||||
legacyIds.forEach { manager.deleteNotificationChannel(it) }
|
||||
val channel = NotificationChannel(id, name, importance).apply {
|
||||
this.description = description
|
||||
if (importance <= NotificationManager.IMPORTANCE_LOW) {
|
||||
setSound(null, null)
|
||||
enableVibration(false)
|
||||
}
|
||||
}
|
||||
manager.createNotificationChannel(channel)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,268 @@
|
||||
package dev.ayushya.noo
|
||||
|
||||
import android.app.Notification
|
||||
import android.app.NotificationManager
|
||||
import android.app.PendingIntent
|
||||
import android.app.Service
|
||||
import android.content.Context
|
||||
import android.content.Intent
|
||||
import android.content.pm.ServiceInfo
|
||||
import android.net.Uri
|
||||
import android.os.Build
|
||||
import android.os.IBinder
|
||||
import androidx.core.app.NotificationCompat
|
||||
import androidx.core.app.ServiceCompat
|
||||
import org.json.JSONArray
|
||||
import java.io.File
|
||||
import java.io.FileOutputStream
|
||||
import java.net.URL
|
||||
|
||||
/**
|
||||
* Foreground service that prepares (copies from a content:// Uri) and
|
||||
* uploads one or more "Share to Noo" files over WebDAV, independent of
|
||||
* MainActivity/the Flutter engine being alive - the whole point is that
|
||||
* closing the app right after confirming a destination in ShareUploadView
|
||||
* doesn't interrupt the upload, the same way a file-manager app's own
|
||||
* upload notification survives the app being closed.
|
||||
*
|
||||
* PUT itself is [DavTransfer.put]; this file owns only what's specific to
|
||||
* a share-upload - materializing the source content:// Uri into a real
|
||||
* file first (WebDAV PUT needs a known Content-Length, which streaming
|
||||
* straight from a content:// Uri can't always provide) and the
|
||||
* notification/queue plumbing.
|
||||
*
|
||||
* Started via the `dev.ayushya.noo/upload_service` MethodChannel
|
||||
* (MainActivity.kt) with credentials/destination passed as Intent extras -
|
||||
* never has an Activity in the loop after that. Shows one persistent,
|
||||
* cancellable notification for the whole batch; a second share arriving
|
||||
* mid-upload queues behind the first (see [TransferQueue]) instead of
|
||||
* being dropped.
|
||||
*/
|
||||
class ShareUploadService : Service() {
|
||||
companion object {
|
||||
const val ACTION_CANCEL = "dev.ayushya.noo.action.CANCEL_UPLOAD"
|
||||
const val EXTRA_FILES = "files" // JSON array of {uri, name, size}
|
||||
const val EXTRA_SERVER_URL = "serverUrl"
|
||||
const val EXTRA_USERNAME = "username"
|
||||
const val EXTRA_AUTH_HEADER = "authHeader"
|
||||
const val EXTRA_REMOTE_FOLDER = "remoteFolder"
|
||||
|
||||
private const val CHANNEL_ID = "share_upload_v2"
|
||||
private const val NOTIFICATION_ID = 4201
|
||||
}
|
||||
|
||||
private data class ShareFile(val uri: String, val name: String, val size: Long?)
|
||||
|
||||
private data class UploadBatch(
|
||||
val files: List<ShareFile>,
|
||||
val serverUrl: String,
|
||||
val username: String,
|
||||
val authHeader: String,
|
||||
val remoteFolder: String,
|
||||
)
|
||||
|
||||
@Volatile
|
||||
private var cancelled = false
|
||||
private val queue = TransferQueue<UploadBatch> { runUploads(it) }
|
||||
|
||||
override fun onBind(intent: Intent?): IBinder? = null
|
||||
|
||||
override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
|
||||
if (intent?.action == ACTION_CANCEL) {
|
||||
cancelled = true
|
||||
queue.clearPending()
|
||||
return START_NOT_STICKY
|
||||
}
|
||||
|
||||
val filesJson = intent?.getStringExtra(EXTRA_FILES)
|
||||
val serverUrl = intent?.getStringExtra(EXTRA_SERVER_URL)
|
||||
val username = intent?.getStringExtra(EXTRA_USERNAME)
|
||||
val authHeader = intent?.getStringExtra(EXTRA_AUTH_HEADER)
|
||||
val remoteFolder = intent?.getStringExtra(EXTRA_REMOTE_FOLDER)
|
||||
if (filesJson == null || serverUrl == null || username == null ||
|
||||
authHeader == null || remoteFolder == null
|
||||
) {
|
||||
stopSelf()
|
||||
return START_NOT_STICKY
|
||||
}
|
||||
|
||||
NooNotificationChannels.ensure(
|
||||
this,
|
||||
CHANNEL_ID,
|
||||
"File uploads",
|
||||
// Default (not low) importance so a finished upload actually
|
||||
// alerts; the progress updates themselves stay silent below.
|
||||
NotificationManager.IMPORTANCE_DEFAULT,
|
||||
"Progress for files shared to Noo",
|
||||
)
|
||||
ServiceCompat.startForeground(
|
||||
this,
|
||||
NOTIFICATION_ID,
|
||||
buildProgressNotification("Preparing to upload…", null, indeterminate = true),
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
|
||||
ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
|
||||
} else {
|
||||
0
|
||||
},
|
||||
)
|
||||
|
||||
queue.enqueue(UploadBatch(parseFiles(filesJson), serverUrl, username, authHeader, remoteFolder))
|
||||
return START_NOT_STICKY
|
||||
}
|
||||
|
||||
private fun parseFiles(json: String): List<ShareFile> {
|
||||
val arr = JSONArray(json)
|
||||
return (0 until arr.length()).map { i ->
|
||||
val obj = arr.getJSONObject(i)
|
||||
ShareFile(
|
||||
uri = obj.getString("uri"),
|
||||
name = obj.getString("name"),
|
||||
size = if (obj.isNull("size")) null else obj.getLong("size"),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
private fun runUploads(batch: UploadBatch) {
|
||||
cancelled = false
|
||||
var succeeded = 0
|
||||
var failed = 0
|
||||
val cleanServer = batch.serverUrl.trimEnd('/')
|
||||
var cleanFolder = batch.remoteFolder.trim()
|
||||
if (!cleanFolder.startsWith("/")) cleanFolder = "/$cleanFolder"
|
||||
if (!cleanFolder.endsWith("/")) cleanFolder = "$cleanFolder/"
|
||||
|
||||
for ((index, file) in batch.files.withIndex()) {
|
||||
if (cancelled) break
|
||||
val label = if (batch.files.size == 1) {
|
||||
file.name
|
||||
} else {
|
||||
"${file.name} (${index + 1}/${batch.files.size})"
|
||||
}
|
||||
var tempFile: File? = null
|
||||
try {
|
||||
notify(buildProgressNotification("Preparing $label…", null, indeterminate = true))
|
||||
tempFile = materialize(file) { sent, total ->
|
||||
notify(
|
||||
buildProgressNotification(
|
||||
"Preparing $label…",
|
||||
progressFraction(sent, total),
|
||||
indeterminate = total == null,
|
||||
),
|
||||
)
|
||||
}
|
||||
if (cancelled) break
|
||||
|
||||
val encodedName = Uri.encode(file.name)
|
||||
val url = URL("$cleanServer/remote.php/dav/files/${batch.username}$cleanFolder$encodedName")
|
||||
val ok = DavTransfer.put(
|
||||
url,
|
||||
batch.authHeader,
|
||||
tempFile,
|
||||
contentType = "application/octet-stream",
|
||||
onProgress = { sent, total ->
|
||||
notify(
|
||||
buildProgressNotification(
|
||||
"Uploading $label…",
|
||||
progressFraction(sent, total),
|
||||
indeterminate = false,
|
||||
),
|
||||
)
|
||||
},
|
||||
isCancelled = { cancelled },
|
||||
)
|
||||
if (ok) succeeded++ else failed++
|
||||
} catch (e: Exception) {
|
||||
failed++
|
||||
} finally {
|
||||
tempFile?.delete()
|
||||
}
|
||||
}
|
||||
|
||||
val finalText = when {
|
||||
cancelled -> "Upload cancelled"
|
||||
failed == 0 && batch.files.size == 1 -> "Uploaded ${batch.files.first().name}"
|
||||
failed == 0 -> "Uploaded $succeeded of ${batch.files.size} files"
|
||||
else -> "Uploaded $succeeded of ${batch.files.size} files - $failed failed"
|
||||
}
|
||||
manager().notify(NOTIFICATION_ID, buildFinalNotification(finalText))
|
||||
|
||||
if (queue.pendingCount == 0) {
|
||||
stopForeground(STOP_FOREGROUND_DETACH)
|
||||
stopSelf()
|
||||
}
|
||||
}
|
||||
|
||||
private fun progressFraction(sent: Long, total: Long?): Float? {
|
||||
if (total == null || total <= 0) return null
|
||||
return (sent.toFloat() / total.toFloat()).coerceIn(0f, 1f)
|
||||
}
|
||||
|
||||
private fun materialize(file: ShareFile, onProgress: (Long, Long?) -> Unit): File {
|
||||
val uri = Uri.parse(file.uri)
|
||||
val target = File(cacheDir, "share_upload_${System.currentTimeMillis()}_${file.name}")
|
||||
contentResolver.openInputStream(uri)?.use { input ->
|
||||
FileOutputStream(target).use { output ->
|
||||
val buffer = ByteArray(256 * 1024)
|
||||
var sent = 0L
|
||||
var lastEmit = 0L
|
||||
while (!cancelled) {
|
||||
val read = input.read(buffer)
|
||||
if (read == -1) break
|
||||
output.write(buffer, 0, read)
|
||||
sent += read
|
||||
val now = System.currentTimeMillis()
|
||||
if (now - lastEmit >= 200) {
|
||||
lastEmit = now
|
||||
onProgress(sent, file.size)
|
||||
}
|
||||
}
|
||||
}
|
||||
} ?: throw IllegalStateException("Could not open ${file.uri}")
|
||||
return target
|
||||
}
|
||||
|
||||
private fun manager() =
|
||||
getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
|
||||
|
||||
private fun notify(notification: Notification) {
|
||||
manager().notify(NOTIFICATION_ID, notification)
|
||||
}
|
||||
|
||||
private fun buildProgressNotification(text: String, progress: Float?, indeterminate: Boolean): Notification {
|
||||
val cancelIntent = Intent(this, ShareUploadService::class.java).apply { action = ACTION_CANCEL }
|
||||
val cancelPendingIntent = PendingIntent.getService(
|
||||
this,
|
||||
0,
|
||||
cancelIntent,
|
||||
PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE,
|
||||
)
|
||||
val builder = NotificationCompat.Builder(this, CHANNEL_ID)
|
||||
.setSmallIcon(android.R.drawable.stat_sys_upload)
|
||||
.setContentTitle("Uploading to Noo")
|
||||
.setContentText(text)
|
||||
.setOnlyAlertOnce(true)
|
||||
.setSilent(true)
|
||||
.setOngoing(true)
|
||||
.addAction(android.R.drawable.ic_menu_close_clear_cancel, "Cancel", cancelPendingIntent)
|
||||
when {
|
||||
indeterminate -> builder.setProgress(100, 0, true)
|
||||
progress != null -> builder.setProgress(100, (progress * 100).toInt(), false)
|
||||
}
|
||||
return builder.build()
|
||||
}
|
||||
|
||||
private fun buildFinalNotification(text: String): Notification {
|
||||
return NotificationCompat.Builder(this, CHANNEL_ID)
|
||||
.setSmallIcon(android.R.drawable.stat_sys_upload_done)
|
||||
.setContentTitle("Noo")
|
||||
.setContentText(text)
|
||||
.setOngoing(false)
|
||||
.setAutoCancel(true)
|
||||
.build()
|
||||
}
|
||||
|
||||
override fun onDestroy() {
|
||||
cancelled = true
|
||||
super.onDestroy()
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,49 @@
|
||||
package dev.ayushya.noo
|
||||
|
||||
import android.content.BroadcastReceiver
|
||||
import android.content.Context
|
||||
import android.content.Intent
|
||||
import androidx.core.app.NotificationManagerCompat
|
||||
|
||||
/**
|
||||
* Handles the "Keep local" / "Use server" actions on a sync-conflict
|
||||
* notification (see `SyncWorker.notifyConflicts`). A `BroadcastReceiver`
|
||||
* can't block on network itself (~10s execution budget), so this only
|
||||
* dismisses the notification and hands off to a one-shot
|
||||
* [ConflictResolveWorker] for the actual upload/download.
|
||||
*/
|
||||
class SyncConflictReceiver : BroadcastReceiver() {
|
||||
companion object {
|
||||
const val ACTION_RESOLVE = "dev.ayushya.noo.action.RESOLVE_SYNC_CONFLICT"
|
||||
const val EXTRA_ACCOUNT_ID = "accountId"
|
||||
const val EXTRA_SERVER_URL = "serverUrl"
|
||||
const val EXTRA_USERNAME = "username"
|
||||
const val EXTRA_AUTH_HEADER = "authHeader"
|
||||
const val EXTRA_FILE_ID = "fileId"
|
||||
const val EXTRA_REMOTE_PATH = "remotePath"
|
||||
const val EXTRA_REL_PATH = "relPath"
|
||||
const val EXTRA_RESOLUTION = "resolution" // "local" | "server"
|
||||
const val EXTRA_NOTIFICATION_ID = "notificationId"
|
||||
}
|
||||
|
||||
override fun onReceive(context: Context, intent: Intent) {
|
||||
if (intent.action != ACTION_RESOLVE) return
|
||||
|
||||
val notificationId = intent.getIntExtra(EXTRA_NOTIFICATION_ID, -1)
|
||||
if (notificationId != -1) {
|
||||
NotificationManagerCompat.from(context).cancel(notificationId)
|
||||
}
|
||||
|
||||
ConflictResolveWorker.enqueue(
|
||||
context,
|
||||
accountId = intent.getStringExtra(EXTRA_ACCOUNT_ID),
|
||||
serverUrl = intent.getStringExtra(EXTRA_SERVER_URL),
|
||||
username = intent.getStringExtra(EXTRA_USERNAME),
|
||||
authHeader = intent.getStringExtra(EXTRA_AUTH_HEADER),
|
||||
fileId = intent.getStringExtra(EXTRA_FILE_ID),
|
||||
remotePath = intent.getStringExtra(EXTRA_REMOTE_PATH),
|
||||
relPath = intent.getStringExtra(EXTRA_REL_PATH),
|
||||
resolution = intent.getStringExtra(EXTRA_RESOLUTION),
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,560 @@
|
||||
package dev.ayushya.noo
|
||||
|
||||
import android.content.Context
|
||||
import android.net.Uri
|
||||
import android.util.Log
|
||||
import okhttp3.MediaType.Companion.toMediaType
|
||||
import okhttp3.OkHttpClient
|
||||
import okhttp3.Request
|
||||
import okhttp3.RequestBody.Companion.toRequestBody
|
||||
import kotlinx.coroutines.sync.Mutex
|
||||
import org.json.JSONArray
|
||||
import org.json.JSONObject
|
||||
import java.io.File
|
||||
import java.net.URL
|
||||
import java.text.SimpleDateFormat
|
||||
import java.util.Locale
|
||||
import java.util.concurrent.TimeUnit
|
||||
import javax.xml.parsers.DocumentBuilderFactory
|
||||
import org.w3c.dom.Element
|
||||
|
||||
/**
|
||||
* The actual WebDAV walk/diff/GET/PUT engine for device sync - shared by
|
||||
* [SyncWorker] (periodic/manual full-folder sync) and
|
||||
* [ConflictResolveWorker] (single-file resolution from a notification
|
||||
* action), since both need the same PROPFIND/GET/PUT primitives and the
|
||||
* same on-disk sync-state bookkeeping.
|
||||
*
|
||||
* Deliberately plain Kotlin over `HttpURLConnection`, not
|
||||
* `NextcloudService`'s Dart/Dio code - this has to run from a
|
||||
* [androidx.work.CoroutineWorker], independent of the Flutter engine even
|
||||
* being loaded, the same reason `DownloadService.kt`/`ShareUploadService.kt`
|
||||
* re-implement GET/PUT natively instead of calling back into Dart.
|
||||
*/
|
||||
object SyncEngine {
|
||||
data class RemoteEntry(
|
||||
val path: String,
|
||||
val fileId: String,
|
||||
val etag: String,
|
||||
val lastModified: Long,
|
||||
val size: Long,
|
||||
val isFolder: Boolean,
|
||||
)
|
||||
|
||||
data class FileState(
|
||||
val relPath: String,
|
||||
val etag: String,
|
||||
val lastModified: Long,
|
||||
val size: Long,
|
||||
val localMTime: Long,
|
||||
)
|
||||
|
||||
/**
|
||||
* What we last saw for a configured sync root when a walk of it fully
|
||||
* completed cleanly: its own etag (Nextcloud propagates a change to any
|
||||
* descendant up through every ancestor folder's etag, so an unchanged
|
||||
* root etag means nothing beneath it changed on the server) and when
|
||||
* that full walk happened. Lets a background pass answer "did anything
|
||||
* change?" with one tiny Depth-0 PROPFIND per root instead of
|
||||
* re-walking the whole tree every time.
|
||||
*/
|
||||
data class RootMarker(val etag: String, val fullWalkAt: Long)
|
||||
|
||||
/**
|
||||
* The server couldn't be reached or answered with an error (anything
|
||||
* but a clean 404). Distinct from "the path is genuinely gone/empty":
|
||||
* treating a network blip as an empty listing made every previously
|
||||
* synced file look deleted server-side, and the diff then deleted the
|
||||
* local copies. Callers skip the affected path for this run instead.
|
||||
*/
|
||||
class RemoteUnavailableException(message: String, cause: Throwable? = null) :
|
||||
Exception(message, cause)
|
||||
|
||||
sealed class SyncAction {
|
||||
data class Download(val entry: RemoteEntry) : SyncAction()
|
||||
data class Upload(val relPath: String, val fileId: String) : SyncAction()
|
||||
data class Delete(val relPath: String, val fileId: String) : SyncAction()
|
||||
data class Conflict(val entry: RemoteEntry, val relPath: String) : SyncAction()
|
||||
}
|
||||
|
||||
/**
|
||||
* Held for the whole of any run that reads-then-rewrites a sync state
|
||||
* map ([SyncWorker], [ConflictResolveWorker]). The periodic job and the
|
||||
* one-off "sync now" jobs have different WorkManager names, so
|
||||
* WorkManager itself happily runs them at once - and both load the
|
||||
* state, mutate it, then save the *whole* map back, so whichever
|
||||
* finished last silently discarded the other's updates. One process-wide
|
||||
* lock serializes them (also keeps [SyncStatusBus], which only tracks
|
||||
* one account at a time, coherent when several accounts are due).
|
||||
*/
|
||||
val syncLock = Mutex()
|
||||
|
||||
private const val TAG = "NooSync"
|
||||
private const val STATE_PREFS = "noo_sync_state"
|
||||
private val rfc1123 =
|
||||
SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz", Locale.US)
|
||||
|
||||
// Only used for PROPFIND - unlike HttpURLConnection, OkHttp doesn't
|
||||
// reject non-standard HTTP methods.
|
||||
private val httpClient = OkHttpClient.Builder()
|
||||
.connectTimeout(15, TimeUnit.SECONDS)
|
||||
.readTimeout(30, TimeUnit.SECONDS)
|
||||
.build()
|
||||
|
||||
fun syncRoot(context: Context, accountId: String): File {
|
||||
val base = context.getExternalFilesDir(null) ?: context.filesDir
|
||||
return File(base, "sync/$accountId").apply { mkdirs() }
|
||||
}
|
||||
|
||||
private fun stateKey(accountId: String) = "state_$accountId"
|
||||
private fun rootsKey(accountId: String) = "roots_$accountId"
|
||||
private fun rootsVersionKey(accountId: String) = "roots_version_$accountId"
|
||||
private fun missingKey(accountId: String) = "missing_$accountId"
|
||||
|
||||
// Bumped whenever a walk starts doing something new (e.g. mirroring
|
||||
// empty folders) so markers recorded by an older version - which would
|
||||
// make the next run skip the walk - are ignored once.
|
||||
private const val ROOTS_VERSION = 2
|
||||
|
||||
fun loadRootMarkers(context: Context, accountId: String): MutableMap<String, RootMarker> {
|
||||
val prefs = context.getSharedPreferences(STATE_PREFS, Context.MODE_PRIVATE)
|
||||
if (prefs.getInt(rootsVersionKey(accountId), 0) != ROOTS_VERSION) return mutableMapOf()
|
||||
val json = prefs.getString(rootsKey(accountId), null) ?: return mutableMapOf()
|
||||
val obj = JSONObject(json)
|
||||
val result = mutableMapOf<String, RootMarker>()
|
||||
for (path in obj.keys()) {
|
||||
val entry = obj.getJSONObject(path)
|
||||
result[path] = RootMarker(entry.getString("etag"), entry.getLong("fullWalkAt"))
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
fun saveRootMarkers(context: Context, accountId: String, markers: Map<String, RootMarker>) {
|
||||
val obj = JSONObject()
|
||||
for ((path, m) in markers) {
|
||||
obj.put(path, JSONObject().apply {
|
||||
put("etag", m.etag)
|
||||
put("fullWalkAt", m.fullWalkAt)
|
||||
})
|
||||
}
|
||||
val prefs = context.getSharedPreferences(STATE_PREFS, Context.MODE_PRIVATE)
|
||||
prefs.edit()
|
||||
.putString(rootsKey(accountId), obj.toString())
|
||||
.putInt(rootsVersionKey(accountId), ROOTS_VERSION)
|
||||
.apply()
|
||||
}
|
||||
|
||||
/**
|
||||
* Configured sync roots the server reported as gone (a clean 404) - e.g.
|
||||
* a synced file or folder that was deleted on the web. The app removes
|
||||
* these from its synced list (there's nothing left to sync) and then
|
||||
* clears them via [removeLocalSync].
|
||||
*/
|
||||
fun loadMissingRoots(context: Context, accountId: String): Set<String> {
|
||||
val prefs = context.getSharedPreferences(STATE_PREFS, Context.MODE_PRIVATE)
|
||||
return prefs.getStringSet(missingKey(accountId), emptySet())?.toSet() ?: emptySet()
|
||||
}
|
||||
|
||||
fun setRootMissing(context: Context, accountId: String, path: String, missing: Boolean) {
|
||||
val prefs = context.getSharedPreferences(STATE_PREFS, Context.MODE_PRIVATE)
|
||||
val current = loadMissingRoots(context, accountId).toMutableSet()
|
||||
val changed = if (missing) current.add(path) else current.remove(path)
|
||||
if (changed) prefs.edit().putStringSet(missingKey(accountId), current).apply()
|
||||
}
|
||||
|
||||
/** Creates a local directory for every remote folder, so empty folders exist on device too. */
|
||||
fun mirrorFolders(entries: List<RemoteEntry>, syncRoot: File, rootRel: String) {
|
||||
if (rootRel.isNotEmpty()) File(syncRoot, rootRel).mkdirs()
|
||||
for (e in entries) {
|
||||
if (e.isFolder) File(syncRoot, e.path.trim('/')).mkdirs()
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Removes local directories under [rootRel] that no longer exist on the
|
||||
* server ([remoteFolders], relative paths) - the counterpart to
|
||||
* [mirrorFolders]. Only *empty* directories are removed: by the time this
|
||||
* runs the files that were inside a deleted server folder have already
|
||||
* been deleted by the diff, while a directory that still holds something
|
||||
* (a file this device created that hasn't synced) is left alone. Never
|
||||
* removes the sync root itself.
|
||||
*/
|
||||
fun pruneRemovedFolders(syncRoot: File, rootRel: String, remoteFolders: Set<String>) {
|
||||
val top = if (rootRel.isEmpty()) syncRoot else File(syncRoot, rootRel)
|
||||
if (!top.isDirectory) return
|
||||
|
||||
fun prune(dir: File, rel: String) {
|
||||
dir.listFiles()?.filter { it.isDirectory }?.forEach { child ->
|
||||
prune(child, if (rel.isEmpty()) child.name else "$rel/${child.name}")
|
||||
}
|
||||
if (rel.isNotEmpty() && rel !in remoteFolders && dir.list().isNullOrEmpty()) {
|
||||
dir.delete()
|
||||
}
|
||||
}
|
||||
prune(top, rootRel)
|
||||
}
|
||||
|
||||
/**
|
||||
* True if every file in [fileIds] is still on disk exactly as the sync
|
||||
* state last recorded it (same size and mtime) - i.e. there's nothing
|
||||
* local to upload and nothing missing to re-download. Pure local stat
|
||||
* calls, no network.
|
||||
*/
|
||||
fun localMatchesState(
|
||||
state: Map<String, FileState>,
|
||||
fileIds: Collection<String>,
|
||||
syncRoot: File,
|
||||
): Boolean = fileIds.all { id ->
|
||||
val s = state[id] ?: return@all false
|
||||
val f = File(syncRoot, s.relPath)
|
||||
f.exists() && f.length() == s.size && f.lastModified() == s.localMTime
|
||||
}
|
||||
|
||||
fun loadState(context: Context, accountId: String): MutableMap<String, FileState> {
|
||||
val prefs = context.getSharedPreferences(STATE_PREFS, Context.MODE_PRIVATE)
|
||||
val json = prefs.getString(stateKey(accountId), null) ?: return mutableMapOf()
|
||||
val obj = JSONObject(json)
|
||||
val result = mutableMapOf<String, FileState>()
|
||||
for (fileId in obj.keys()) {
|
||||
val entry = obj.getJSONObject(fileId)
|
||||
result[fileId] = FileState(
|
||||
relPath = entry.getString("relPath"),
|
||||
etag = entry.getString("etag"),
|
||||
lastModified = entry.getLong("lastModified"),
|
||||
size = entry.getLong("size"),
|
||||
localMTime = entry.getLong("localMTime"),
|
||||
)
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
fun saveState(context: Context, accountId: String, state: Map<String, FileState>) {
|
||||
val obj = JSONObject()
|
||||
for ((fileId, s) in state) {
|
||||
obj.put(
|
||||
fileId,
|
||||
JSONObject().apply {
|
||||
put("relPath", s.relPath)
|
||||
put("etag", s.etag)
|
||||
put("lastModified", s.lastModified)
|
||||
put("size", s.size)
|
||||
put("localMTime", s.localMTime)
|
||||
},
|
||||
)
|
||||
}
|
||||
val prefs = context.getSharedPreferences(STATE_PREFS, Context.MODE_PRIVATE)
|
||||
prefs.edit().putString(stateKey(accountId), obj.toString()).apply()
|
||||
}
|
||||
|
||||
/** Depth-1 PROPFIND of [remotePath], returning its direct children only. */
|
||||
fun propfindChildren(
|
||||
serverUrl: String,
|
||||
username: String,
|
||||
authHeader: String,
|
||||
remotePath: String,
|
||||
): List<RemoteEntry> = propfind(serverUrl, username, authHeader, remotePath, depth = "1", skipSelf = true)
|
||||
|
||||
/** Depth-0 PROPFIND of [remotePath] itself (e.g. to refresh its etag after a PUT/GET). */
|
||||
fun propfindSelf(
|
||||
serverUrl: String,
|
||||
username: String,
|
||||
authHeader: String,
|
||||
remotePath: String,
|
||||
): RemoteEntry? = propfind(serverUrl, username, authHeader, remotePath, depth = "0", skipSelf = false).firstOrNull()
|
||||
|
||||
private fun propfind(
|
||||
serverUrl: String,
|
||||
username: String,
|
||||
authHeader: String,
|
||||
remotePath: String,
|
||||
depth: String,
|
||||
skipSelf: Boolean,
|
||||
): List<RemoteEntry> {
|
||||
var cleanPath = remotePath.trim()
|
||||
if (!cleanPath.startsWith("/")) cleanPath = "/$cleanPath"
|
||||
if (depth == "1" && !cleanPath.endsWith("/")) cleanPath = "$cleanPath/"
|
||||
val encodedPath = cleanPath.split("/").joinToString("/") { Uri.encode(it) }
|
||||
val cleanServer = serverUrl.trimEnd('/')
|
||||
val url = "$cleanServer/remote.php/dav/files/$username$encodedPath"
|
||||
|
||||
val body = """<?xml version="1.0" encoding="utf-8" ?>
|
||||
<d:propfind xmlns:d="DAV:" xmlns:oc="http://owncloud.org/ns">
|
||||
<d:prop>
|
||||
<d:getlastmodified/>
|
||||
<d:getcontentlength/>
|
||||
<d:resourcetype/>
|
||||
<d:getetag/>
|
||||
<oc:fileid/>
|
||||
</d:prop>
|
||||
</d:propfind>"""
|
||||
val request = Request.Builder()
|
||||
.url(url)
|
||||
.method("PROPFIND", body.toRequestBody("application/xml".toMediaType()))
|
||||
.header("Authorization", authHeader)
|
||||
.header("Depth", depth)
|
||||
.build()
|
||||
|
||||
return try {
|
||||
httpClient.newCall(request).execute().use { response ->
|
||||
Log.d(TAG, "PROPFIND $url -> ${response.code}")
|
||||
if (response.code == 404) return emptyList() // genuinely gone
|
||||
if (!response.isSuccessful) {
|
||||
Log.w(TAG, "PROPFIND $url failed: ${response.code} ${response.body?.string()}")
|
||||
throw RemoteUnavailableException("PROPFIND $url -> ${response.code}")
|
||||
}
|
||||
|
||||
val doc = DocumentBuilderFactory.newInstance()
|
||||
.apply { isNamespaceAware = true }
|
||||
.newDocumentBuilder()
|
||||
.parse(response.body!!.byteStream())
|
||||
|
||||
parsePropfindResponse(doc, username, cleanPath, skipSelf)
|
||||
}
|
||||
} catch (e: RemoteUnavailableException) {
|
||||
throw e
|
||||
} catch (e: Exception) {
|
||||
Log.e(TAG, "PROPFIND $url threw", e)
|
||||
throw RemoteUnavailableException("PROPFIND $url threw", e)
|
||||
}
|
||||
}
|
||||
|
||||
private fun parsePropfindResponse(
|
||||
doc: org.w3c.dom.Document,
|
||||
username: String,
|
||||
cleanPath: String,
|
||||
skipSelf: Boolean,
|
||||
): List<RemoteEntry> {
|
||||
val marker = "/remote.php/dav/files/$username"
|
||||
val selfPath = cleanPath.trimEnd('/')
|
||||
val responses = doc.getElementsByTagNameNS("DAV:", "response")
|
||||
val entries = mutableListOf<RemoteEntry>()
|
||||
for (i in 0 until responses.length) {
|
||||
val responseEl = responses.item(i) as? Element ?: continue
|
||||
val hrefRaw = responseEl.getElementsByTagNameNS("DAV:", "href")
|
||||
.item(0)?.textContent ?: continue
|
||||
val decodedHref = Uri.decode(hrefRaw)
|
||||
val idx = decodedHref.indexOf(marker)
|
||||
val hrefPath = if (idx >= 0) decodedHref.substring(idx + marker.length) else decodedHref
|
||||
val hrefPathNorm = (if (hrefPath.isEmpty()) "/" else hrefPath).trimEnd('/')
|
||||
if (skipSelf && hrefPathNorm == selfPath) continue // self entry, not a child
|
||||
|
||||
val propEl = responseEl.getElementsByTagNameNS("DAV:", "prop").item(0) as? Element
|
||||
?: continue
|
||||
val resourceTypeEl =
|
||||
propEl.getElementsByTagNameNS("DAV:", "resourcetype").item(0) as? Element
|
||||
val isFolder =
|
||||
(resourceTypeEl?.getElementsByTagNameNS("DAV:", "collection")?.length ?: 0) > 0
|
||||
val etag = propEl.getElementsByTagNameNS("DAV:", "getetag")
|
||||
.item(0)?.textContent?.trim('"') ?: ""
|
||||
val lastModStr =
|
||||
propEl.getElementsByTagNameNS("DAV:", "getlastmodified").item(0)?.textContent
|
||||
val sizeStr =
|
||||
propEl.getElementsByTagNameNS("DAV:", "getcontentlength").item(0)?.textContent
|
||||
val fileId = propEl.getElementsByTagNameNS("http://owncloud.org/ns", "fileid")
|
||||
.item(0)?.textContent ?: hrefPathNorm
|
||||
|
||||
entries.add(
|
||||
RemoteEntry(
|
||||
path = hrefPathNorm,
|
||||
fileId = fileId,
|
||||
etag = etag,
|
||||
lastModified = lastModStr?.let { runCatching { rfc1123.parse(it)?.time }.getOrNull() } ?: 0L,
|
||||
size = sizeStr?.toLongOrNull() ?: 0L,
|
||||
isFolder = isFolder,
|
||||
),
|
||||
)
|
||||
}
|
||||
Log.d(TAG, "PROPFIND $cleanPath -> ${entries.size} entries")
|
||||
return entries
|
||||
}
|
||||
|
||||
/** Recursively walks [rootPath] (Depth-1 PROPFINDs, breadth-first) into a flat manifest. */
|
||||
fun walkRemoteTree(
|
||||
serverUrl: String,
|
||||
username: String,
|
||||
authHeader: String,
|
||||
rootPath: String,
|
||||
): List<RemoteEntry> {
|
||||
val result = mutableListOf<RemoteEntry>()
|
||||
val queue = ArrayDeque<String>()
|
||||
queue.add(rootPath)
|
||||
while (queue.isNotEmpty()) {
|
||||
val current = queue.removeFirst()
|
||||
val children = propfindChildren(serverUrl, username, authHeader, current)
|
||||
for (child in children) {
|
||||
result.add(child)
|
||||
if (child.isFolder) queue.add(child.path)
|
||||
}
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
fun downloadFile(
|
||||
serverUrl: String,
|
||||
username: String,
|
||||
authHeader: String,
|
||||
remotePath: String,
|
||||
destination: File,
|
||||
): Boolean {
|
||||
val url = davUrl(serverUrl, username, remotePath)
|
||||
val ok = DavTransfer.get(url, authHeader, destination)
|
||||
Log.d(
|
||||
TAG,
|
||||
if (ok) {
|
||||
"GET $url -> saved to ${destination.absolutePath} (${destination.length()} bytes)"
|
||||
} else {
|
||||
"GET $url failed"
|
||||
},
|
||||
)
|
||||
return ok
|
||||
}
|
||||
|
||||
fun uploadFile(
|
||||
serverUrl: String,
|
||||
username: String,
|
||||
authHeader: String,
|
||||
remotePath: String,
|
||||
source: File,
|
||||
): Boolean {
|
||||
val url = davUrl(serverUrl, username, remotePath)
|
||||
return DavTransfer.put(url, authHeader, source)
|
||||
}
|
||||
|
||||
private fun davUrl(serverUrl: String, username: String, remotePath: String): URL {
|
||||
val encodedPath = remotePath.split("/").joinToString("/") { Uri.encode(it) }
|
||||
return URL("${serverUrl.trimEnd('/')}/remote.php/dav/files/$username$encodedPath")
|
||||
}
|
||||
|
||||
/**
|
||||
* Diffs one synced folder's remote manifest against the persisted
|
||||
* state, returning what to do for each item - callers own actually
|
||||
* doing the GET/PUT/delete and updating state afterward, so this stays
|
||||
* pure/testable-in-principle. Also returns entries no longer present
|
||||
* remotely (deleted server-side, relative to the [priorFolderRelPaths]
|
||||
* this folder previously produced) as [SyncAction.Delete].
|
||||
*/
|
||||
fun diffFolder(
|
||||
entries: List<RemoteEntry>,
|
||||
state: Map<String, FileState>,
|
||||
priorFolderFileIds: Set<String>,
|
||||
syncRoot: File,
|
||||
): List<SyncAction> {
|
||||
val actions = mutableListOf<SyncAction>()
|
||||
val seenFileIds = mutableSetOf<String>()
|
||||
|
||||
for (entry in entries) {
|
||||
if (entry.isFolder) continue
|
||||
seenFileIds.add(entry.fileId)
|
||||
val relPath = entry.path.removePrefix("/")
|
||||
val localFile = File(syncRoot, relPath)
|
||||
val prior = state[entry.fileId]
|
||||
|
||||
if (prior == null) {
|
||||
// First time this folder's been walked with sync enabled -
|
||||
// nothing locally recorded yet to protect, so just pull it.
|
||||
actions.add(SyncAction.Download(entry))
|
||||
continue
|
||||
}
|
||||
|
||||
val serverChanged = entry.etag != prior.etag
|
||||
val localExists = localFile.exists()
|
||||
val localChanged = localExists &&
|
||||
(localFile.lastModified() != prior.localMTime || localFile.length() != prior.size)
|
||||
|
||||
when {
|
||||
!localExists -> {
|
||||
// State says this file was mirrored but the local copy
|
||||
// is gone (stale state left over from an earlier sync of
|
||||
// this path, or the file was removed outside the app).
|
||||
// It's inside a path the user asked to sync, so pull it
|
||||
// back down. This used to be treated as "the user
|
||||
// deleted it, respect that" and emitted a Delete - which
|
||||
// dropped the state, skipped the download, and reported
|
||||
// phantom "N removed" for files that were never on disk.
|
||||
actions.add(SyncAction.Download(entry))
|
||||
}
|
||||
serverChanged && localChanged -> actions.add(SyncAction.Conflict(entry, relPath))
|
||||
serverChanged -> actions.add(SyncAction.Download(entry))
|
||||
localChanged -> actions.add(SyncAction.Upload(relPath, entry.fileId))
|
||||
else -> {} // unchanged, nothing to do
|
||||
}
|
||||
}
|
||||
|
||||
// Anything this folder had state for last time but that didn't show
|
||||
// up in this walk at all was deleted server-side.
|
||||
for (fileId in priorFolderFileIds) {
|
||||
if (fileId !in seenFileIds) {
|
||||
val prior = state[fileId] ?: continue
|
||||
actions.add(SyncAction.Delete(prior.relPath, fileId))
|
||||
}
|
||||
}
|
||||
|
||||
Log.d(
|
||||
TAG,
|
||||
"diffFolder: ${entries.size} entries -> " +
|
||||
"${actions.count { it is SyncAction.Download }} downloads, " +
|
||||
"${actions.count { it is SyncAction.Upload }} uploads, " +
|
||||
"${actions.count { it is SyncAction.Delete }} deletes, " +
|
||||
"${actions.count { it is SyncAction.Conflict }} conflicts",
|
||||
)
|
||||
return actions
|
||||
}
|
||||
|
||||
/**
|
||||
* Deletes [path]'s local mirror (a single file, or a whole folder's
|
||||
* worth of files) and removes its entries from the persisted sync-state
|
||||
* map, called when the user turns sync off for that path - without
|
||||
* clearing the state too, a later re-add would see the (now missing)
|
||||
* local file as "deleted, server unchanged" and skip re-downloading it
|
||||
* (see [diffFolder]'s `!localExists && !serverChanged` branch) instead
|
||||
* of pulling it back down.
|
||||
*/
|
||||
fun removeLocalSync(context: Context, accountId: String, path: String) {
|
||||
val root = syncRoot(context, accountId)
|
||||
val state = loadState(context, accountId).toMutableMap()
|
||||
|
||||
var cleanPath = path.trim()
|
||||
if (cleanPath.startsWith("/")) cleanPath = cleanPath.substring(1)
|
||||
cleanPath = cleanPath.trimEnd('/')
|
||||
val prefix = if (cleanPath.isEmpty()) "" else "$cleanPath/"
|
||||
|
||||
val toRemove = state.filterValues { s ->
|
||||
s.relPath == cleanPath || (prefix.isNotEmpty() && s.relPath.startsWith(prefix))
|
||||
}.keys
|
||||
for (fileId in toRemove) state.remove(fileId)
|
||||
saveState(context, accountId, state)
|
||||
|
||||
setRootMissing(context, accountId, "/" + cleanPath, false)
|
||||
setRootMissing(context, accountId, cleanPath, false)
|
||||
|
||||
// A root marker for this path (or an ancestor/descendant that also
|
||||
// covers some of what was just deleted) would make the next
|
||||
// background pass think nothing changed and skip re-downloading.
|
||||
val removedPath = "/" + cleanPath
|
||||
val markers = loadRootMarkers(context, accountId)
|
||||
val staleKeys = markers.keys.filter { key ->
|
||||
val k = key.trimEnd('/')
|
||||
k.isEmpty() || removedPath == "/" || k == removedPath ||
|
||||
k.startsWith("$removedPath/") || removedPath.startsWith("$k/")
|
||||
}
|
||||
if (staleKeys.isNotEmpty()) {
|
||||
staleKeys.forEach { markers.remove(it) }
|
||||
saveRootMarkers(context, accountId, markers)
|
||||
}
|
||||
|
||||
val target = if (cleanPath.isEmpty()) root else File(root, cleanPath)
|
||||
if (target.exists()) target.deleteRecursively()
|
||||
Log.d(TAG, "removeLocalSync($path) -> removed ${toRemove.size} state entries")
|
||||
}
|
||||
|
||||
fun folderIsSyncedUnder(itemPath: String, syncedFolders: List<String>): String? {
|
||||
val normalizedItem = itemPath.trimEnd('/')
|
||||
for (folder in syncedFolders) {
|
||||
val normalizedFolder = folder.trimEnd('/')
|
||||
if (normalizedItem == normalizedFolder || normalizedItem.startsWith("$normalizedFolder/")) {
|
||||
return folder
|
||||
}
|
||||
}
|
||||
return null
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,80 @@
|
||||
package dev.ayushya.noo
|
||||
|
||||
/**
|
||||
* In-memory, in-process pub/sub for live device-sync status -
|
||||
* [SyncWorker]/[ConflictResolveWorker] publish into this, `MainActivity`'s
|
||||
* `dev.ayushya.noo/sync_service/status` EventChannel forwards it to Dart.
|
||||
* Plain in-memory state is enough (no IPC/persistence needed) since the
|
||||
* workers and the Activity always run in the same process; contrast with
|
||||
* [SyncEngine]'s on-disk per-account state map, which *is* durable and is
|
||||
* what actually answers "is this file synced" (this bus only ever tracks
|
||||
* the transient "syncing right now" / "unresolved conflict" parts of that
|
||||
* picture).
|
||||
*/
|
||||
object SyncStatusBus {
|
||||
data class Conflict(
|
||||
val accountId: String,
|
||||
val fileId: String,
|
||||
val remotePath: String,
|
||||
val relPath: String,
|
||||
val name: String,
|
||||
)
|
||||
|
||||
data class Status(
|
||||
val accountId: String?,
|
||||
val syncing: Boolean,
|
||||
val syncingFileIds: Set<String>,
|
||||
val conflicts: List<Conflict>,
|
||||
)
|
||||
|
||||
@Volatile
|
||||
private var current = Status(accountId = null, syncing = false, syncingFileIds = emptySet(), conflicts = emptyList())
|
||||
private val listeners = mutableListOf<(Status) -> Unit>()
|
||||
|
||||
@Synchronized
|
||||
fun subscribe(listener: (Status) -> Unit) {
|
||||
listeners.add(listener)
|
||||
listener(current)
|
||||
}
|
||||
|
||||
@Synchronized
|
||||
fun unsubscribe(listener: (Status) -> Unit) {
|
||||
listeners.remove(listener)
|
||||
}
|
||||
|
||||
fun snapshot(): Status = current
|
||||
|
||||
@Synchronized
|
||||
fun setSyncing(accountId: String, syncing: Boolean) {
|
||||
current = current.copy(accountId = accountId, syncing = syncing)
|
||||
if (!syncing) current = current.copy(syncingFileIds = emptySet())
|
||||
publish()
|
||||
}
|
||||
|
||||
@Synchronized
|
||||
fun markFileSyncing(accountId: String, fileId: String, syncing: Boolean) {
|
||||
val ids = current.syncingFileIds.toMutableSet()
|
||||
if (syncing) ids.add(fileId) else ids.remove(fileId)
|
||||
current = current.copy(accountId = accountId, syncingFileIds = ids)
|
||||
publish()
|
||||
}
|
||||
|
||||
@Synchronized
|
||||
fun addConflicts(accountId: String, newConflicts: List<Conflict>) {
|
||||
if (newConflicts.isEmpty()) return
|
||||
val existingIds = current.conflicts.map { it.fileId }.toSet()
|
||||
val merged = current.conflicts + newConflicts.filter { it.fileId !in existingIds }
|
||||
current = current.copy(accountId = accountId, conflicts = merged)
|
||||
publish()
|
||||
}
|
||||
|
||||
@Synchronized
|
||||
fun removeConflict(accountId: String, fileId: String) {
|
||||
current = current.copy(accountId = accountId, conflicts = current.conflicts.filter { it.fileId != fileId })
|
||||
publish()
|
||||
}
|
||||
|
||||
private fun publish() {
|
||||
listeners.toList().forEach { it(current) }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,472 @@
|
||||
package dev.ayushya.noo
|
||||
|
||||
import android.app.Notification
|
||||
import android.app.NotificationManager
|
||||
import android.app.PendingIntent
|
||||
import android.content.Context
|
||||
import android.content.Intent
|
||||
import android.util.Log
|
||||
import androidx.core.app.NotificationCompat
|
||||
import androidx.work.CoroutineWorker
|
||||
import androidx.work.WorkerParameters
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.sync.withLock
|
||||
import kotlinx.coroutines.withContext
|
||||
import org.json.JSONArray
|
||||
import java.io.File
|
||||
|
||||
/**
|
||||
* The periodic (and manual "Sync now") device-sync job. Runs entirely
|
||||
* independent of the Flutter engine (see [SyncEngine]'s doc comment) -
|
||||
* enqueued/re-enqueued from `MainActivity.kt`'s
|
||||
* `dev.ayushya.noo/sync_service` MethodChannel whenever the synced-folder
|
||||
* list, account, or network setting changes, since a periodic
|
||||
* `WorkRequest`'s input `Data` is fixed at enqueue time.
|
||||
*/
|
||||
class SyncWorker(appContext: Context, params: WorkerParameters) :
|
||||
CoroutineWorker(appContext, params) {
|
||||
|
||||
companion object {
|
||||
const val KEY_ACCOUNT_ID = "accountId"
|
||||
const val KEY_SERVER_URL = "serverUrl"
|
||||
const val KEY_USERNAME = "username"
|
||||
const val KEY_AUTH_HEADER = "authHeader"
|
||||
const val KEY_FOLDERS = "folders" // JSON array of remote file/folder paths
|
||||
|
||||
// True for a user-initiated "Sync now": always does a full walk of
|
||||
// every root (never trusts the root-etag shortcut) and shows the
|
||||
// "Checking for changes..." notification immediately. False for
|
||||
// periodic/automatic runs, which stay silent unless something
|
||||
// actually transfers.
|
||||
const val KEY_FORCE = "force"
|
||||
|
||||
// Whether automatic (non-force) runs may post progress/summary
|
||||
// notifications - the "Background sync notifications" setting.
|
||||
// Conflicts are always notified (they need a decision), and a
|
||||
// user-initiated run (force) always shows progress.
|
||||
const val KEY_NOTIFY = "notify"
|
||||
|
||||
// Even when a root's etag hasn't changed, walk it in full at least
|
||||
// this often: etag propagation isn't reliable everywhere (external
|
||||
// storage mounts in particular), so this bounds how stale a mirror
|
||||
// can get if the cheap check is ever wrong.
|
||||
private const val FULL_WALK_MAX_AGE_MS = 6L * 60 * 60 * 1000
|
||||
|
||||
// Pre-multi-account name of the single shared periodic job - only
|
||||
// kept so it can be cancelled when migrating to per-account jobs.
|
||||
const val UNIQUE_PERIODIC_NAME = "noo_sync_periodic"
|
||||
|
||||
// Each account with sync enabled gets its own periodic job (with
|
||||
// that account's own credentials/paths/interval baked in), so
|
||||
// background sync works for every enabled account, not just
|
||||
// whichever one was active last.
|
||||
fun periodicNameFor(accountId: String) = "${UNIQUE_PERIODIC_NAME}_$accountId"
|
||||
fun oneOffNameFor(accountId: String) = "noo_sync_now_$accountId"
|
||||
|
||||
// Low importance = no sound/vibration. Importance can't be changed
|
||||
// on an existing channel, hence the new id (the old "device_sync"
|
||||
// channel, which made noise, is deleted when this one is created).
|
||||
private const val CHANNEL_ID = "device_sync_v2"
|
||||
private const val LEGACY_CHANNEL_ID = "device_sync"
|
||||
|
||||
// Notification ids are per account so two accounts syncing never
|
||||
// overwrite each other's progress/summary/conflict notifications.
|
||||
// Progress and the final summary share one id per account - the
|
||||
// summary's notify() call naturally replaces the ongoing progress
|
||||
// notification in place (no flicker of two separate notifications),
|
||||
// and if there was nothing to actually sync, doWork explicitly
|
||||
// cancels it since no summary gets posted to replace it.
|
||||
private const val SUMMARY_NOTIFICATION_ID_BASE = 100_000
|
||||
private const val CONFLICT_NOTIFICATION_ID_BASE = 200_000
|
||||
fun summaryNotificationId(accountId: String) =
|
||||
SUMMARY_NOTIFICATION_ID_BASE + (accountId.hashCode() and 0xFFFF)
|
||||
fun conflictNotificationId(accountId: String, relPath: String) =
|
||||
CONFLICT_NOTIFICATION_ID_BASE + ((accountId + "|" + relPath).hashCode() and 0xFFFF)
|
||||
private const val TAG = "NooSync"
|
||||
}
|
||||
|
||||
// totalTransfers is only known once at least one path's been diffed -
|
||||
// grows across the run as each configured path is diffed in turn.
|
||||
private var totalTransfers = 0
|
||||
private var completedTransfers = 0
|
||||
private var progressShown = false
|
||||
|
||||
// Set at the top of performSync - the notify* helpers below need the
|
||||
// account (for its notification ids / title) and whether this run may
|
||||
// show progress at all.
|
||||
private var notifyAccountId = ""
|
||||
private var notifyUsername = ""
|
||||
private var showProgressNotifications = true
|
||||
|
||||
override suspend fun doWork(): Result = withContext(Dispatchers.IO) {
|
||||
// One sync at a time, app-wide - see SyncEngine.syncLock. A run that
|
||||
// has to wait just starts once the current one finishes.
|
||||
SyncEngine.syncLock.withLock { performSync() }
|
||||
}
|
||||
|
||||
private suspend fun performSync(): Result = withContext(Dispatchers.IO) {
|
||||
val accountId = inputData.getString(KEY_ACCOUNT_ID) ?: return@withContext Result.failure()
|
||||
val serverUrl = inputData.getString(KEY_SERVER_URL) ?: return@withContext Result.failure()
|
||||
val username = inputData.getString(KEY_USERNAME) ?: return@withContext Result.failure()
|
||||
val authHeader = inputData.getString(KEY_AUTH_HEADER) ?: return@withContext Result.failure()
|
||||
val foldersJson = inputData.getString(KEY_FOLDERS) ?: "[]"
|
||||
val force = inputData.getBoolean(KEY_FORCE, false)
|
||||
notifyAccountId = accountId
|
||||
notifyUsername = username
|
||||
showProgressNotifications = force || inputData.getBoolean(KEY_NOTIFY, true)
|
||||
val folders = (0 until JSONArray(foldersJson).length()).map { JSONArray(foldersJson).getString(it) }
|
||||
Log.d(TAG, "doWork: account=$accountId server=$serverUrl user=$username folders=$folders")
|
||||
if (folders.isEmpty()) return@withContext Result.success()
|
||||
|
||||
val syncRoot = SyncEngine.syncRoot(applicationContext, accountId)
|
||||
val state = SyncEngine.loadState(applicationContext, accountId).toMutableMap()
|
||||
val markers = SyncEngine.loadRootMarkers(applicationContext, accountId)
|
||||
|
||||
var downloaded = 0
|
||||
var uploaded = 0
|
||||
var deleted = 0
|
||||
val conflicts = mutableListOf<Pair<SyncEngine.RemoteEntry, String>>()
|
||||
|
||||
SyncStatusBus.setSyncing(accountId, true)
|
||||
// For a user-initiated run, shown immediately rather than lazily on
|
||||
// the first transfer - the PROPFIND walk/diff below (per configured
|
||||
// path, potentially recursive) can itself take real time, and the
|
||||
// user just asked for a sync so they expect to see it happening.
|
||||
// Automatic runs stay silent until something actually transfers.
|
||||
if (force) notifyProgress("Checking for changes…")
|
||||
try {
|
||||
for (path in folders) {
|
||||
try {
|
||||
// A configured path can be a file or a folder now - check
|
||||
// which before deciding whether to walk it recursively or
|
||||
// just diff the single item.
|
||||
val self = SyncEngine.propfindSelf(serverUrl, username, authHeader, path)
|
||||
val pathPrefix = path.trimEnd('/') + "/"
|
||||
val priorFileIdsForPath = state.filterValues {
|
||||
it.relPath == path.trimStart('/') || it.relPath.startsWith(pathPrefix.trimStart('/'))
|
||||
}.keys
|
||||
|
||||
// Cheap "did anything change?" check: an unchanged root etag
|
||||
// means nothing beneath it changed on the server, and if
|
||||
// every local file is also still exactly as recorded there's
|
||||
// nothing to upload or re-download either - so skip the walk
|
||||
// (one Depth-0 PROPFIND instead of one per subfolder).
|
||||
val marker = markers[path]
|
||||
if (!force && self != null && self.isFolder && marker != null &&
|
||||
marker.etag == self.etag &&
|
||||
System.currentTimeMillis() - marker.fullWalkAt < FULL_WALK_MAX_AGE_MS &&
|
||||
priorFileIdsForPath.isNotEmpty() &&
|
||||
SyncEngine.localMatchesState(state, priorFileIdsForPath, syncRoot)
|
||||
) {
|
||||
Log.d(TAG, "skip $path: server etag unchanged, local intact")
|
||||
continue
|
||||
}
|
||||
|
||||
// The server says this synced path no longer exists (a
|
||||
// clean 404, not a network error): flag it so the app drops
|
||||
// it from the synced list instead of leaving a dead entry.
|
||||
SyncEngine.setRootMissing(applicationContext, accountId, path, self == null)
|
||||
|
||||
val entries = when {
|
||||
self == null -> emptyList()
|
||||
self.isFolder -> SyncEngine.walkRemoteTree(serverUrl, username, authHeader, path)
|
||||
else -> listOf(self)
|
||||
}
|
||||
var pathClean = true
|
||||
|
||||
val actions = SyncEngine.diffFolder(entries, state, priorFileIdsForPath, syncRoot)
|
||||
totalTransfers += actions.count {
|
||||
it is SyncEngine.SyncAction.Download || it is SyncEngine.SyncAction.Upload
|
||||
}
|
||||
for (action in actions) {
|
||||
when (action) {
|
||||
is SyncEngine.SyncAction.Download -> {
|
||||
val relPath = action.entry.path.removePrefix("/")
|
||||
notifyProgress(relPath.substringAfterLast('/'))
|
||||
SyncStatusBus.markFileSyncing(accountId, action.entry.fileId, true)
|
||||
val dest = File(syncRoot, relPath)
|
||||
if (SyncEngine.downloadFile(serverUrl, username, authHeader, action.entry.path, dest)) {
|
||||
state[action.entry.fileId] = SyncEngine.FileState(
|
||||
relPath = relPath,
|
||||
etag = action.entry.etag,
|
||||
lastModified = action.entry.lastModified,
|
||||
size = action.entry.size,
|
||||
localMTime = dest.lastModified(),
|
||||
)
|
||||
downloaded++
|
||||
} else {
|
||||
pathClean = false
|
||||
}
|
||||
SyncStatusBus.markFileSyncing(accountId, action.entry.fileId, false)
|
||||
completedTransfers++
|
||||
}
|
||||
is SyncEngine.SyncAction.Upload -> {
|
||||
notifyProgress(action.relPath.substringAfterLast('/'))
|
||||
SyncStatusBus.markFileSyncing(accountId, action.fileId, true)
|
||||
val localFile = File(syncRoot, action.relPath)
|
||||
val remotePath = "/${action.relPath}"
|
||||
if (localFile.exists() &&
|
||||
SyncEngine.uploadFile(serverUrl, username, authHeader, remotePath, localFile)
|
||||
) {
|
||||
val prior = state[action.fileId]
|
||||
state[action.fileId] = SyncEngine.FileState(
|
||||
relPath = action.relPath,
|
||||
etag = prior?.etag ?: "",
|
||||
lastModified = localFile.lastModified(),
|
||||
size = localFile.length(),
|
||||
localMTime = localFile.lastModified(),
|
||||
)
|
||||
uploaded++
|
||||
} else {
|
||||
pathClean = false
|
||||
}
|
||||
SyncStatusBus.markFileSyncing(accountId, action.fileId, false)
|
||||
completedTransfers++
|
||||
}
|
||||
is SyncEngine.SyncAction.Delete -> {
|
||||
// Only counts toward the "removed" summary if a
|
||||
// local copy actually existed and was deleted -
|
||||
// dropping stale state for a file that was never
|
||||
// on disk isn't a removal the user should hear
|
||||
// about.
|
||||
val localFile = File(syncRoot, action.relPath)
|
||||
if (localFile.exists() && localFile.delete()) deleted++
|
||||
state.remove(action.fileId)
|
||||
}
|
||||
is SyncEngine.SyncAction.Conflict -> {
|
||||
conflicts.add(action.entry to action.relPath)
|
||||
pathClean = false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Mirror the folder structure itself: empty folders
|
||||
// created on the server appear on device, and folders
|
||||
// deleted on the server (whose files the diff above has
|
||||
// already removed) don't linger as empty directories.
|
||||
if (self == null || self.isFolder) {
|
||||
val rootRel = path.trim('/')
|
||||
if (self != null) SyncEngine.mirrorFolders(entries, syncRoot, rootRel)
|
||||
val remoteFolders = entries.filter { it.isFolder }
|
||||
.map { it.path.trim('/') }
|
||||
.toMutableSet()
|
||||
if (self != null) remoteFolders.add(rootRel)
|
||||
SyncEngine.pruneRemovedFolders(syncRoot, rootRel, remoteFolders)
|
||||
}
|
||||
|
||||
// Only remember this root's etag once the whole path synced
|
||||
// without a hitch - anything left over (a failed transfer, an
|
||||
// unresolved conflict) has to be retried by a real walk next
|
||||
// time, not skipped because the etag "hasn't changed".
|
||||
if (self != null && self.isFolder && pathClean) {
|
||||
markers[path] = SyncEngine.RootMarker(self.etag, System.currentTimeMillis())
|
||||
} else {
|
||||
markers.remove(path)
|
||||
}
|
||||
} catch (e: SyncEngine.RemoteUnavailableException) {
|
||||
// Couldn't reach the server for this path - leave its state
|
||||
// and marker untouched and try again next run. Crucially,
|
||||
// never diff against an empty listing here: that would look
|
||||
// like the whole folder was deleted server-side.
|
||||
Log.w(TAG, "skipping $path this run: ${e.message}")
|
||||
}
|
||||
}
|
||||
} finally {
|
||||
markers.keys.retainAll(folders.toSet())
|
||||
SyncEngine.saveRootMarkers(applicationContext, accountId, markers)
|
||||
// State must be saved *before* announcing that syncing has
|
||||
// stopped - `syncStatusMap` (MainActivity.kt) recomputes
|
||||
// `syncedFileIds` fresh from `SyncEngine.loadState` every time
|
||||
// this bus publishes, so publishing first would hand Dart a
|
||||
// snapshot that's still missing every file this run just
|
||||
// downloaded, and nothing would ever correct it afterward
|
||||
// (no further bus event fires post-save) - newly-synced files
|
||||
// would never show their "synced" badge until the next app
|
||||
// restart forced a fresh `getStatus()` read.
|
||||
SyncEngine.saveState(applicationContext, accountId, state)
|
||||
SyncStatusBus.setSyncing(accountId, false)
|
||||
}
|
||||
|
||||
Log.d(
|
||||
TAG,
|
||||
"doWork done: downloaded=$downloaded uploaded=$uploaded deleted=$deleted conflicts=${conflicts.size}",
|
||||
)
|
||||
|
||||
if ((downloaded > 0 || uploaded > 0 || deleted > 0) && showProgressNotifications) {
|
||||
// Replaces the ongoing progress notification in place (same
|
||||
// ID) with a final, dismissible summary.
|
||||
notifySummary(downloaded, uploaded, deleted)
|
||||
} else if (progressShown) {
|
||||
// Nothing actually transferred (e.g. every diffed action was a
|
||||
// Delete/Conflict, or the progress notification was shown for a
|
||||
// run that ended up empty) - nothing to replace it with, so
|
||||
// just clear it rather than leaving a stale "Syncing…" behind.
|
||||
manager().cancel(summaryNotificationId(accountId))
|
||||
}
|
||||
if (conflicts.isNotEmpty()) {
|
||||
SyncStatusBus.addConflicts(
|
||||
accountId,
|
||||
conflicts.map { (entry, relPath) ->
|
||||
SyncStatusBus.Conflict(
|
||||
accountId = accountId,
|
||||
fileId = entry.fileId,
|
||||
remotePath = entry.path,
|
||||
relPath = relPath,
|
||||
name = relPath.substringAfterLast('/'),
|
||||
)
|
||||
},
|
||||
)
|
||||
notifyConflicts(accountId, serverUrl, username, authHeader, conflicts)
|
||||
}
|
||||
|
||||
Result.success()
|
||||
}
|
||||
|
||||
/// Called once immediately at the start of every run that actually has
|
||||
/// folders configured (covers the PROPFIND walk/diff phase, which can
|
||||
/// itself take real time), then again per file as transfers happen.
|
||||
/// `totalTransfers` grows as each configured path is diffed (paths are
|
||||
/// diffed one at a time), so early on this shows an indeterminate bar;
|
||||
/// it becomes determinate once the true total for this run is known. A
|
||||
/// run that turns out to have nothing to transfer cancels this
|
||||
/// notification at the end instead of leaving it stuck (see the
|
||||
/// `progressShown` check in `doWork`).
|
||||
private fun notifyProgress(fileName: String) {
|
||||
if (!showProgressNotifications) return
|
||||
progressShown = true
|
||||
createChannel()
|
||||
val text = if (totalTransfers > 1) {
|
||||
"$fileName (${completedTransfers + 1}/$totalTransfers)"
|
||||
} else {
|
||||
fileName
|
||||
}
|
||||
val builder = NotificationCompat.Builder(applicationContext, CHANNEL_ID)
|
||||
.setSmallIcon(android.R.drawable.stat_notify_sync)
|
||||
.setContentTitle("Syncing to device · $notifyUsername")
|
||||
.setContentText(text)
|
||||
.setOnlyAlertOnce(true)
|
||||
.setSilent(true)
|
||||
.setOngoing(true)
|
||||
if (totalTransfers > 0) {
|
||||
builder.setProgress(totalTransfers, completedTransfers, false)
|
||||
} else {
|
||||
builder.setProgress(0, 0, true)
|
||||
}
|
||||
manager().notify(summaryNotificationId(notifyAccountId), builder.build())
|
||||
}
|
||||
|
||||
private fun notifySummary(downloaded: Int, uploaded: Int, deleted: Int) {
|
||||
createChannel()
|
||||
val parts = mutableListOf<String>()
|
||||
if (downloaded > 0) parts.add("$downloaded updated")
|
||||
if (uploaded > 0) parts.add("$uploaded uploaded")
|
||||
if (deleted > 0) parts.add("$deleted removed")
|
||||
val text = parts.joinToString(", ")
|
||||
|
||||
val notification = NotificationCompat.Builder(applicationContext, CHANNEL_ID)
|
||||
.setSmallIcon(android.R.drawable.stat_notify_sync)
|
||||
.setContentTitle("Noo sync · $notifyUsername")
|
||||
.setContentText(text)
|
||||
.setAutoCancel(true)
|
||||
.setSilent(true)
|
||||
.build()
|
||||
manager().notify(summaryNotificationId(notifyAccountId), notification)
|
||||
}
|
||||
|
||||
private fun notifyConflicts(
|
||||
accountId: String,
|
||||
serverUrl: String,
|
||||
username: String,
|
||||
authHeader: String,
|
||||
conflicts: List<Pair<SyncEngine.RemoteEntry, String>>,
|
||||
) {
|
||||
createChannel()
|
||||
for ((index, conflict) in conflicts.withIndex()) {
|
||||
val (entry, relPath) = conflict
|
||||
val fileName = relPath.substringAfterLast('/')
|
||||
val notificationId = conflictNotificationId(accountId, relPath)
|
||||
|
||||
val useLocalIntent = conflictActionIntent(
|
||||
accountId,
|
||||
serverUrl,
|
||||
username,
|
||||
authHeader,
|
||||
entry.fileId,
|
||||
entry.path,
|
||||
relPath,
|
||||
"local",
|
||||
notificationId,
|
||||
)
|
||||
val useServerIntent = conflictActionIntent(
|
||||
accountId,
|
||||
serverUrl,
|
||||
username,
|
||||
authHeader,
|
||||
entry.fileId,
|
||||
entry.path,
|
||||
relPath,
|
||||
"server",
|
||||
notificationId,
|
||||
)
|
||||
|
||||
val notification = NotificationCompat.Builder(applicationContext, CHANNEL_ID)
|
||||
.setSmallIcon(android.R.drawable.stat_notify_error)
|
||||
.setContentTitle("Sync conflict: $fileName")
|
||||
.setContentText("$username - changed both on this device and on the server.")
|
||||
.setAutoCancel(true)
|
||||
.setSilent(true)
|
||||
.addAction(0, "Keep local", useLocalIntent)
|
||||
.addAction(0, "Use server", useServerIntent)
|
||||
.build()
|
||||
manager().notify(notificationId, notification)
|
||||
}
|
||||
}
|
||||
|
||||
private fun conflictActionIntent(
|
||||
accountId: String,
|
||||
serverUrl: String,
|
||||
username: String,
|
||||
authHeader: String,
|
||||
fileId: String,
|
||||
remotePath: String,
|
||||
relPath: String,
|
||||
resolution: String,
|
||||
notificationId: Int,
|
||||
): PendingIntent {
|
||||
val intent = Intent(applicationContext, SyncConflictReceiver::class.java).apply {
|
||||
action = SyncConflictReceiver.ACTION_RESOLVE
|
||||
putExtra(SyncConflictReceiver.EXTRA_ACCOUNT_ID, accountId)
|
||||
putExtra(SyncConflictReceiver.EXTRA_SERVER_URL, serverUrl)
|
||||
putExtra(SyncConflictReceiver.EXTRA_USERNAME, username)
|
||||
putExtra(SyncConflictReceiver.EXTRA_AUTH_HEADER, authHeader)
|
||||
putExtra(SyncConflictReceiver.EXTRA_FILE_ID, fileId)
|
||||
putExtra(SyncConflictReceiver.EXTRA_REMOTE_PATH, remotePath)
|
||||
putExtra(SyncConflictReceiver.EXTRA_REL_PATH, relPath)
|
||||
putExtra(SyncConflictReceiver.EXTRA_RESOLUTION, resolution)
|
||||
putExtra(SyncConflictReceiver.EXTRA_NOTIFICATION_ID, notificationId)
|
||||
}
|
||||
// Request code must be unique per (file, resolution) pair, else the
|
||||
// two actions' PendingIntents collide and only one survives.
|
||||
val requestCode = (accountId + relPath + resolution).hashCode()
|
||||
return PendingIntent.getBroadcast(
|
||||
applicationContext,
|
||||
requestCode,
|
||||
intent,
|
||||
PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE,
|
||||
)
|
||||
}
|
||||
|
||||
private fun manager() =
|
||||
applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
|
||||
|
||||
private fun createChannel() {
|
||||
NooNotificationChannels.ensure(
|
||||
applicationContext,
|
||||
CHANNEL_ID,
|
||||
"Device sync",
|
||||
NotificationManager.IMPORTANCE_LOW,
|
||||
"Updates and conflicts for folders synced to this device",
|
||||
legacyIds = listOf(LEGACY_CHANNEL_ID),
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,41 @@
|
||||
package dev.ayushya.noo
|
||||
|
||||
import java.util.concurrent.LinkedBlockingQueue
|
||||
|
||||
/**
|
||||
* A tiny sequential work queue for [DownloadService]/[ShareUploadService]:
|
||||
* each enqueued batch runs to completion before the next starts, instead
|
||||
* of a second batch arriving mid-transfer being silently dropped - the
|
||||
* previous behavior both services independently accepted as a known
|
||||
* limitation (see their old doc comments). One daemon worker thread,
|
||||
* started lazily on first use and parked on the queue for the life of the
|
||||
* process.
|
||||
*/
|
||||
class TransferQueue<T>(private val process: (T) -> Unit) {
|
||||
private val queue = LinkedBlockingQueue<T>()
|
||||
|
||||
@Volatile
|
||||
private var started = false
|
||||
|
||||
/** How many batches (including whatever's currently running) are queued. */
|
||||
val pendingCount: Int
|
||||
get() = queue.size
|
||||
|
||||
@Synchronized
|
||||
fun enqueue(batch: T) {
|
||||
queue.put(batch)
|
||||
if (!started) {
|
||||
started = true
|
||||
Thread {
|
||||
while (true) {
|
||||
process(queue.take())
|
||||
}
|
||||
}.apply { isDaemon = true }.start()
|
||||
}
|
||||
}
|
||||
|
||||
/** Drops every batch that hasn't started running yet (not the current one). */
|
||||
fun clearPending() {
|
||||
queue.clear()
|
||||
}
|
||||
}
|
||||
|
Before Width: | Height: | Size: 5.5 KiB |
|
Before Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 9.6 KiB |
|
Before Width: | Height: | Size: 2.5 KiB |
|
Before Width: | Height: | Size: 7.4 KiB |
|
Before Width: | Height: | Size: 5.5 KiB |
|
Before Width: | Height: | Size: 9.1 KiB |
|
Before Width: | Height: | Size: 21 KiB |
|
Before Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 32 KiB |
|
Before Width: | Height: | Size: 39 KiB |
|
Before Width: | Height: | Size: 24 KiB |
|
Before Width: | Height: | Size: 67 KiB |
|
Before Width: | Height: | Size: 60 KiB |
|
Before Width: | Height: | Size: 34 KiB |
@@ -1,14 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<background android:drawable="@drawable/ic_launcher_background"/>
|
||||
<foreground>
|
||||
<inset
|
||||
android:drawable="@drawable/ic_launcher_foreground"
|
||||
android:inset="16%" />
|
||||
</foreground>
|
||||
<monochrome>
|
||||
<inset
|
||||
android:drawable="@drawable/ic_launcher_monochrome"
|
||||
android:inset="16%" />
|
||||
</monochrome>
|
||||
</adaptive-icon>
|
||||
<background android:drawable="@mipmap/ic_launcher_background"/>
|
||||
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
|
||||
<monochrome android:drawable="@mipmap/ic_launcher_monochrome"/>
|
||||
</adaptive-icon>
|
||||
|
Before Width: | Height: | Size: 5.3 KiB After Width: | Height: | Size: 9.1 KiB |
|
After Width: | Height: | Size: 11 KiB |
|
After Width: | Height: | Size: 10 KiB |
|
After Width: | Height: | Size: 4.3 KiB |
|
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 4.9 KiB |
|
After Width: | Height: | Size: 5.2 KiB |
|
After Width: | Height: | Size: 6.3 KiB |
|
After Width: | Height: | Size: 2.7 KiB |
|
Before Width: | Height: | Size: 7.9 KiB After Width: | Height: | Size: 14 KiB |
|
After Width: | Height: | Size: 17 KiB |
|
After Width: | Height: | Size: 16 KiB |
|
After Width: | Height: | Size: 6.7 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 26 KiB |
|
After Width: | Height: | Size: 20 KiB |
|
After Width: | Height: | Size: 25 KiB |
|
After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 41 KiB |
|
After Width: | Height: | Size: 36 KiB |
|
After Width: | Height: | Size: 39 KiB |
|
After Width: | Height: | Size: 16 KiB |
@@ -0,0 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Exposes only the app's own "picker" cache subfolder as content:// Uris -
|
||||
used to hand a file back to another app that launched Noo as a
|
||||
GET_CONTENT picker (see PickIntentService/MainActivity.kt). -->
|
||||
<paths xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<cache-path name="picker" path="picker/" />
|
||||
</paths>
|
||||
@@ -19,21 +19,6 @@ subprojects {
|
||||
project.evaluationDependsOn(":app")
|
||||
}
|
||||
|
||||
// receive_sharing_intent declares Java 11 for its Java sources but leaves
|
||||
// its Kotlin compilation to default to whatever JDK runs the build - with
|
||||
// JDK 17 that mismatch (Java 11 vs Kotlin 17) fails with "Inconsistent JVM
|
||||
// Target Compatibility". Pin just this plugin's Kotlin target down to match
|
||||
// its own declared Java target, rather than touching every subproject.
|
||||
project(":receive_sharing_intent") {
|
||||
afterEvaluate {
|
||||
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
|
||||
compilerOptions {
|
||||
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
tasks.register<Delete>("clean") {
|
||||
delete(rootProject.layout.buildDirectory)
|
||||
}
|
||||
|
||||
|
Before Width: | Height: | Size: 263 KiB After Width: | Height: | Size: 124 KiB |
|
Before Width: | Height: | Size: 143 KiB After Width: | Height: | Size: 36 KiB |
|
Before Width: | Height: | Size: 59 KiB After Width: | Height: | Size: 39 KiB |
|
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 16 KiB |
@@ -1,10 +1,26 @@
|
||||
import 'dart:async';
|
||||
import 'package:dynamic_color/dynamic_color.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:permission_handler/permission_handler.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
import 'package:receive_sharing_intent/receive_sharing_intent.dart';
|
||||
import 'package:shared_preferences/shared_preferences.dart';
|
||||
import 'models/app_tab.dart';
|
||||
import 'providers/server_provider.dart';
|
||||
import 'models/pick_request.dart';
|
||||
import 'providers/connectivity_controller.dart';
|
||||
import 'providers/favorites_controller.dart';
|
||||
import 'providers/files_controller.dart';
|
||||
import 'providers/item_operations.dart';
|
||||
import 'providers/offline_controller.dart';
|
||||
import 'providers/photos_controller.dart';
|
||||
import 'providers/pick_controller.dart';
|
||||
import 'providers/recent_controller.dart';
|
||||
import 'providers/session_controller.dart';
|
||||
import 'providers/settings_controller.dart';
|
||||
import 'providers/shares_controller.dart';
|
||||
import 'providers/sync_status_controller.dart';
|
||||
import 'providers/trash_controller.dart';
|
||||
import 'services/pick_intent_service.dart';
|
||||
import 'services/share_intent_service.dart';
|
||||
import 'theme/app_theme.dart';
|
||||
import 'views/lock_screen_view.dart';
|
||||
import 'views/login_view.dart';
|
||||
@@ -16,8 +32,69 @@ import 'widgets/floating_bottom_bar.dart';
|
||||
void main() {
|
||||
WidgetsFlutterBinding.ensureInitialized();
|
||||
runApp(
|
||||
ChangeNotifierProvider(
|
||||
create: (_) => ServerProvider(),
|
||||
MultiProvider(
|
||||
// Split out of the former single `ServerProvider` god object - see
|
||||
// `.claude/context/architecture.md`'s "State management" section.
|
||||
// Order matters: each `create` below reads earlier providers via
|
||||
// `context.read`, which is safe here since none of them are ever
|
||||
// replaced/recreated for the app's lifetime (account switching is
|
||||
// internal state on SessionController, not a new provider instance).
|
||||
providers: [
|
||||
ChangeNotifierProvider(create: (_) => ConnectivityController()),
|
||||
ChangeNotifierProvider(
|
||||
create: (context) => SessionController(context.read()),
|
||||
),
|
||||
ChangeNotifierProvider(create: (_) => SettingsController()),
|
||||
// Before SyncStatusController, which follows its Files Cache rule
|
||||
// for how often synced files refresh.
|
||||
ChangeNotifierProvider(
|
||||
create: (context) => FilesController(context.read()),
|
||||
),
|
||||
ChangeNotifierProvider(
|
||||
// Eager (`lazy: false`) - this controller only loads its persisted
|
||||
// state when SessionController fires the account-ready event, and
|
||||
// that fires once at startup, before any widget has read this
|
||||
// provider. Lazily created, it would register its listener too
|
||||
// late and stay empty ("Sync off") until an account switch.
|
||||
lazy: false,
|
||||
create: (context) =>
|
||||
SyncStatusController(context.read(), context.read()),
|
||||
),
|
||||
ChangeNotifierProvider(
|
||||
create: (context) =>
|
||||
PhotosController(context.read(), context.read()),
|
||||
),
|
||||
ChangeNotifierProvider(
|
||||
create: (context) =>
|
||||
FavoritesController(context.read(), context.read()),
|
||||
),
|
||||
ChangeNotifierProvider(
|
||||
create: (context) => TrashController(context.read()),
|
||||
),
|
||||
ChangeNotifierProvider(
|
||||
create: (context) => SharesController(context.read()),
|
||||
),
|
||||
ChangeNotifierProvider(
|
||||
create: (context) => RecentController(context.read()),
|
||||
),
|
||||
ChangeNotifierProvider(
|
||||
create: (context) => PickController(context.read()),
|
||||
),
|
||||
ChangeNotifierProvider(
|
||||
// Eager for the same reason as SyncStatusController above.
|
||||
lazy: false,
|
||||
create: (context) =>
|
||||
OfflineController(context.read(), context.read()),
|
||||
),
|
||||
Provider(
|
||||
create: (context) => ItemOperations(
|
||||
session: context.read(),
|
||||
files: context.read(),
|
||||
photos: context.read(),
|
||||
favorites: context.read(),
|
||||
),
|
||||
),
|
||||
],
|
||||
child: const NextcloudApp(),
|
||||
),
|
||||
);
|
||||
@@ -28,7 +105,8 @@ class NextcloudApp extends StatelessWidget {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final provider = context.watch<ServerProvider>();
|
||||
final settings = context.watch<SettingsController>();
|
||||
final session = context.watch<SessionController>();
|
||||
|
||||
return DynamicColorBuilder(
|
||||
builder: (lightDynamic, darkDynamic) {
|
||||
@@ -36,22 +114,22 @@ class NextcloudApp extends StatelessWidget {
|
||||
title: 'Noo',
|
||||
debugShowCheckedModeBanner: false,
|
||||
theme: AppTheme.light(
|
||||
provider.seedColor,
|
||||
settings.seedColor,
|
||||
dynamicScheme: lightDynamic,
|
||||
useDynamicColor: provider.useDynamicColor,
|
||||
useDynamicColor: settings.useDynamicColor,
|
||||
),
|
||||
darkTheme: AppTheme.dark(
|
||||
provider.seedColor,
|
||||
settings.seedColor,
|
||||
dynamicScheme: darkDynamic,
|
||||
useDynamicColor: provider.useDynamicColor,
|
||||
amoled: provider.amoledDark,
|
||||
useDynamicColor: settings.useDynamicColor,
|
||||
amoled: settings.amoledDark,
|
||||
),
|
||||
themeMode: provider.themeMode,
|
||||
home: provider.isRestoringSession
|
||||
themeMode: settings.themeMode,
|
||||
home: session.isRestoringSession
|
||||
? const _SplashView()
|
||||
: (!provider.isLoggedIn
|
||||
: (!session.isLoggedIn
|
||||
? const LoginView()
|
||||
: (provider.needsUnlock
|
||||
: (session.needsUnlock
|
||||
? const LockScreenView()
|
||||
: const MainShellView())),
|
||||
);
|
||||
@@ -112,7 +190,8 @@ class MainShellView extends StatefulWidget {
|
||||
class _MainShellViewState extends State<MainShellView> {
|
||||
late AppTab _currentTab;
|
||||
late final Map<AppTab, ScrollController> _scrollControllers;
|
||||
StreamSubscription<List<SharedMediaFile>>? _shareSub;
|
||||
StreamSubscription<List<SharedFileRef>>? _shareSub;
|
||||
StreamSubscription<PickRequest>? _pickSub;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
@@ -123,32 +202,83 @@ class _MainShellViewState extends State<MainShellView> {
|
||||
// Preferences load asynchronously, but in practice finish well before
|
||||
// session restore (which also has to hit the network) does, so by the
|
||||
// time this shell mounts `defaultTab` already reflects the saved value.
|
||||
_currentTab = context.read<ServerProvider>().defaultTab;
|
||||
_currentTab = context.read<SettingsController>().defaultTab;
|
||||
|
||||
// Handles both a cold start via another app's "Share to..." sheet
|
||||
// (getInitialMedia) and a share arriving while the app is already
|
||||
// running (getMediaStream) - the plugin guarantees the stream doesn't
|
||||
// re-emit whatever getInitialMedia already returned.
|
||||
ReceiveSharingIntent.instance.getInitialMedia().then(_handleSharedFiles);
|
||||
_shareSub = ReceiveSharingIntent.instance.getMediaStream().listen(
|
||||
_handleSharedFiles,
|
||||
// (getInitialShare) and a share arriving while the app is already
|
||||
// running (onNewShare). See MainActivity.kt's doc comment for why this
|
||||
// is hand-rolled instead of the receive_sharing_intent plugin - in
|
||||
// short, this only ever fetches cheap Uri metadata here, never a
|
||||
// file's actual bytes, so a large shared file can't block startup.
|
||||
ShareIntentService.getInitialShare().then(_handleSharedFiles);
|
||||
_shareSub = ShareIntentService.onNewShare.listen(_handleSharedFiles);
|
||||
|
||||
// Same cold-start-vs-already-running split as the share intent above:
|
||||
// another app may have launched Noo as its GET_CONTENT picker.
|
||||
PickIntentService.getPickRequest().then((request) {
|
||||
if (request != null && mounted) {
|
||||
context.read<PickController>().setPickRequest(request);
|
||||
}
|
||||
});
|
||||
_pickSub = PickIntentService.onNewPickRequest.listen((request) {
|
||||
if (mounted) context.read<PickController>().setPickRequest(request);
|
||||
});
|
||||
|
||||
WidgetsBinding.instance.addPostFrameCallback(
|
||||
(_) => _maybeRequestNotificationPermission(),
|
||||
);
|
||||
}
|
||||
|
||||
void _handleSharedFiles(List<SharedMediaFile> files) {
|
||||
final uploadable = files
|
||||
.where(
|
||||
(f) =>
|
||||
f.type != SharedMediaType.text && f.type != SharedMediaType.url,
|
||||
)
|
||||
.toList();
|
||||
if (uploadable.isEmpty) return;
|
||||
ReceiveSharingIntent.instance.reset();
|
||||
static const _prefNotificationPermissionAsked =
|
||||
'notification_permission_asked';
|
||||
|
||||
// Asked once, on the app's first launch after login, rather than every
|
||||
// time this shell mounts - a plain-language reason shown before the OS
|
||||
// prompt (which just says "Noo would like to send you notifications"
|
||||
// with no context) so the system dialog doesn't feel unexplained, since
|
||||
// it's what shows upload/download progress for background transfers.
|
||||
Future<void> _maybeRequestNotificationPermission() async {
|
||||
final prefs = await SharedPreferences.getInstance();
|
||||
if (prefs.getBool(_prefNotificationPermissionAsked) ?? false) return;
|
||||
await prefs.setBool(_prefNotificationPermissionAsked, true);
|
||||
|
||||
final status = await Permission.notification.status;
|
||||
if (status.isGranted || status.isPermanentlyDenied) return;
|
||||
if (!mounted) return;
|
||||
|
||||
final shouldRequest = await showDialog<bool>(
|
||||
context: context,
|
||||
barrierDismissible: false,
|
||||
builder: (context) => AlertDialog(
|
||||
title: const Text('Allow notifications?'),
|
||||
content: const Text(
|
||||
'Noo shows upload and download progress as a notification, so '
|
||||
'you can track transfers that keep running in the background.',
|
||||
),
|
||||
actions: [
|
||||
TextButton(
|
||||
onPressed: () => Navigator.of(context).pop(false),
|
||||
child: const Text('Not now'),
|
||||
),
|
||||
FilledButton(
|
||||
onPressed: () => Navigator.of(context).pop(true),
|
||||
child: const Text('Allow'),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
if (shouldRequest == true) {
|
||||
await Permission.notification.request();
|
||||
}
|
||||
}
|
||||
|
||||
void _handleSharedFiles(List<SharedFileRef> files) {
|
||||
if (files.isEmpty) return;
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
if (!mounted) return;
|
||||
Navigator.of(context).push(
|
||||
MaterialPageRoute(builder: (_) => ShareUploadView(files: uploadable)),
|
||||
);
|
||||
Navigator.of(
|
||||
context,
|
||||
).push(MaterialPageRoute(builder: (_) => ShareUploadView(files: files)));
|
||||
});
|
||||
}
|
||||
|
||||
@@ -158,25 +288,43 @@ class _MainShellViewState extends State<MainShellView> {
|
||||
c.dispose();
|
||||
}
|
||||
_shareSub?.cancel();
|
||||
_pickSub?.cancel();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final provider = context.watch<ServerProvider>();
|
||||
final settings = context.watch<SettingsController>();
|
||||
final pick = context.watch<PickController>();
|
||||
final connectivity = context.watch<ConnectivityController>();
|
||||
|
||||
// A one-shot request (e.g. tapping a search result) to switch tabs -
|
||||
// consumed here so it only fires once, then cleared after this frame
|
||||
// (clearing it synchronously would call notifyListeners mid-build).
|
||||
final requestedTab = provider.requestedTab;
|
||||
final requestedTab = settings.requestedTab;
|
||||
if (requestedTab != null) {
|
||||
_currentTab = requestedTab;
|
||||
WidgetsBinding.instance.addPostFrameCallback(
|
||||
(_) => provider.consumeRequestedTab(),
|
||||
(_) => settings.consumeRequestedTab(),
|
||||
);
|
||||
}
|
||||
|
||||
final visible = provider.visibleTabs;
|
||||
final pickRequest = pick.pickRequest;
|
||||
// While acting as another app's picker, only Files and Photos make
|
||||
// sense as browsable sources - Trash/Shares/Activity/Recent aren't
|
||||
// real "pick a file from here" destinations, and only these two tabs'
|
||||
// views even know how to handle picking-mode taps. This overrides the
|
||||
// user's own hidden/reordered tab settings rather than respecting
|
||||
// them, since picking is a separate mode from normal browsing. With
|
||||
// no network at all, every other tab would just show its own loading
|
||||
// spinner forever/an error state, so the bottom nav collapses to just
|
||||
// Offline - the one tab that works without a connection (see
|
||||
// `FilesView(offline: true)`/`ConnectivityController`).
|
||||
final visible = pickRequest != null
|
||||
? [AppTab.files, AppTab.photos]
|
||||
: connectivity.isOffline
|
||||
? [AppTab.offline]
|
||||
: settings.visibleTabs;
|
||||
final selectedTab = visible.contains(_currentTab)
|
||||
? _currentTab
|
||||
: (visible.isNotEmpty ? visible.first : AppTab.files);
|
||||
@@ -188,50 +336,91 @@ class _MainShellViewState extends State<MainShellView> {
|
||||
.map((tab) => FloatingNavItem(label: tab.label, icon: tab.icon))
|
||||
.toList();
|
||||
|
||||
return Scaffold(
|
||||
body: Stack(
|
||||
children: [
|
||||
IndexedStack(
|
||||
index: selectedIndex,
|
||||
children: visible
|
||||
.map((tab) => buildAppTabView(tab, _scrollControllers[tab]!))
|
||||
.toList(),
|
||||
),
|
||||
// Each tab now renders its own sticky selection toolbar inline
|
||||
// (right under its sort/filter row) instead of this shell
|
||||
// swapping in a shared floating bar - the bottom nav stays put
|
||||
// and usable regardless of selection state.
|
||||
FloatingBottomNavBar(
|
||||
selectedIndex: selectedIndex,
|
||||
items: navItems,
|
||||
opacity: provider.bottomBarOpacity,
|
||||
blurSigma: provider.bottomBarBlur,
|
||||
onDestinationSelected: (index) {
|
||||
final tappedTab = visible[index];
|
||||
if (tappedTab == _currentTab) {
|
||||
if (provider.tapTabToScrollTop) {
|
||||
final controller = _scrollControllers[tappedTab];
|
||||
if (controller != null && controller.hasClients) {
|
||||
controller.animateTo(
|
||||
0,
|
||||
duration: const Duration(milliseconds: 300),
|
||||
curve: Curves.easeOutCubic,
|
||||
);
|
||||
return PopScope(
|
||||
// While picking, system back cancels the pick (and tells the caller
|
||||
// nothing was chosen) instead of exiting the app from under it -
|
||||
// there's no Navigator route to pop at this, the root screen.
|
||||
canPop: pickRequest == null,
|
||||
onPopInvokedWithResult: (didPop, result) {
|
||||
if (!didPop && pickRequest != null) pick.cancelPick();
|
||||
},
|
||||
child: Scaffold(
|
||||
body: Stack(
|
||||
children: [
|
||||
IndexedStack(
|
||||
index: selectedIndex,
|
||||
children: visible
|
||||
.map((tab) => buildAppTabView(tab, _scrollControllers[tab]!))
|
||||
.toList(),
|
||||
),
|
||||
if (pick.isDownloadingForPick) const _PickingProgressOverlay(),
|
||||
// Each tab now renders its own sticky selection toolbar inline
|
||||
// (right under its sort/filter row) instead of this shell
|
||||
// swapping in a shared floating bar - the bottom nav stays put
|
||||
// and usable regardless of selection state.
|
||||
FloatingBottomNavBar(
|
||||
selectedIndex: selectedIndex,
|
||||
items: navItems,
|
||||
opacity: settings.bottomBarOpacity,
|
||||
blurSigma: settings.bottomBarBlur,
|
||||
onDestinationSelected: (index) {
|
||||
final tappedTab = visible[index];
|
||||
if (tappedTab == _currentTab) {
|
||||
if (settings.tapTabToScrollTop) {
|
||||
final controller = _scrollControllers[tappedTab];
|
||||
if (controller != null && controller.hasClients) {
|
||||
controller.animateTo(
|
||||
0,
|
||||
duration: const Duration(milliseconds: 300),
|
||||
curve: Curves.easeOutCubic,
|
||||
);
|
||||
}
|
||||
}
|
||||
return;
|
||||
}
|
||||
return;
|
||||
}
|
||||
setState(() {
|
||||
_currentTab = tappedTab;
|
||||
});
|
||||
},
|
||||
onSearchTap: () {
|
||||
Navigator.of(
|
||||
context,
|
||||
).push(MaterialPageRoute(builder: (_) => const SearchView()));
|
||||
},
|
||||
setState(() {
|
||||
_currentTab = tappedTab;
|
||||
});
|
||||
},
|
||||
onSearchTap: () {
|
||||
Navigator.of(
|
||||
context,
|
||||
).push(MaterialPageRoute(builder: (_) => const SearchView()));
|
||||
},
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/// Blocks interaction while the selected file(s) download to a local cache
|
||||
/// folder before being handed back to the caller (see
|
||||
/// `PickController.confirmPick`) - can take a moment for a large file/video.
|
||||
class _PickingProgressOverlay extends StatelessWidget {
|
||||
const _PickingProgressOverlay();
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Positioned.fill(
|
||||
child: ColoredBox(
|
||||
color: Colors.black.withValues(alpha: 0.35),
|
||||
child: const Center(
|
||||
child: Card(
|
||||
child: Padding(
|
||||
padding: EdgeInsets.all(24),
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
CircularProgressIndicator(),
|
||||
SizedBox(height: 16),
|
||||
Text('Preparing file...'),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -3,8 +3,17 @@ import 'package:material_symbols_icons/symbols.dart';
|
||||
|
||||
/// Every destination the bottom nav bar can show. Order here is only the
|
||||
/// fallback default — actual order/visibility/default-tab are user
|
||||
/// configurable and persisted in [ServerProvider].
|
||||
enum AppTab { files, photos, activity, trash, shares, recent }
|
||||
/// configurable and persisted in `SettingsController`.
|
||||
enum AppTab {
|
||||
files,
|
||||
photos,
|
||||
favorites,
|
||||
activity,
|
||||
trash,
|
||||
shares,
|
||||
recent,
|
||||
offline,
|
||||
}
|
||||
|
||||
/// At most this many tabs may be visible in the bottom nav bar at once —
|
||||
/// the rest are reachable through the "more" dropdown instead.
|
||||
@@ -17,6 +26,8 @@ extension AppTabInfo on AppTab {
|
||||
return 'Files';
|
||||
case AppTab.photos:
|
||||
return 'Photos';
|
||||
case AppTab.favorites:
|
||||
return 'Favorites';
|
||||
case AppTab.activity:
|
||||
return 'Activity';
|
||||
case AppTab.trash:
|
||||
@@ -25,6 +36,8 @@ extension AppTabInfo on AppTab {
|
||||
return 'Shares';
|
||||
case AppTab.recent:
|
||||
return 'Recent';
|
||||
case AppTab.offline:
|
||||
return 'Offline';
|
||||
}
|
||||
}
|
||||
|
||||
@@ -34,6 +47,8 @@ extension AppTabInfo on AppTab {
|
||||
return Icons.folder_rounded;
|
||||
case AppTab.photos:
|
||||
return Icons.photo_library_rounded;
|
||||
case AppTab.favorites:
|
||||
return Icons.favorite_rounded;
|
||||
case AppTab.activity:
|
||||
return Icons.electric_bolt_rounded;
|
||||
case AppTab.trash:
|
||||
@@ -42,6 +57,8 @@ extension AppTabInfo on AppTab {
|
||||
return Icons.groups_rounded;
|
||||
case AppTab.recent:
|
||||
return Symbols.search_activity_rounded;
|
||||
case AppTab.offline:
|
||||
return Icons.offline_pin_rounded;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
import 'nextcloud_item.dart';
|
||||
|
||||
/// A resolution choice for one conflicting item in a Move/Copy batch -
|
||||
/// keyed by `item.id` in [ConflictChoice] maps passed to
|
||||
/// `ItemOperations.resolveConflicts`.
|
||||
enum ConflictChoice { overwrite, keepBoth, skip }
|
||||
|
||||
/// One item that couldn't be moved/copied because something with the same
|
||||
/// name already exists at the destination (a WebDAV 412 response).
|
||||
class MoveCopyConflict {
|
||||
final NextcloudItem item;
|
||||
|
||||
const MoveCopyConflict(this.item);
|
||||
}
|
||||
|
||||
/// Outcome of a Move/Copy batch (an initial attempt via
|
||||
/// `ItemOperations.moveItems`/`copyItems`, or a follow-up
|
||||
/// `resolveConflicts` call). [blockedReason] is set instead of attempting
|
||||
/// anything at all when the destination itself is invalid (e.g. moving a
|
||||
/// folder into its own subfolder).
|
||||
class MoveCopyResult {
|
||||
final int succeeded;
|
||||
final List<MoveCopyConflict> conflicts;
|
||||
final int failed;
|
||||
final String? blockedReason;
|
||||
|
||||
const MoveCopyResult({
|
||||
this.succeeded = 0,
|
||||
this.conflicts = const [],
|
||||
this.failed = 0,
|
||||
this.blockedReason,
|
||||
});
|
||||
}
|
||||
@@ -0,0 +1,34 @@
|
||||
/// Another app asking Noo (via Android's GET_CONTENT chooser) to pick a
|
||||
/// file/photo and hand it back - see `PickIntentService`/`MainActivity.kt`.
|
||||
class PickRequest {
|
||||
final String mimeType;
|
||||
final bool allowMultiple;
|
||||
final String? callerLabel;
|
||||
|
||||
const PickRequest({
|
||||
required this.mimeType,
|
||||
required this.allowMultiple,
|
||||
this.callerLabel,
|
||||
});
|
||||
|
||||
factory PickRequest.fromMap(Map<dynamic, dynamic> map) {
|
||||
return PickRequest(
|
||||
mimeType: map['mimeType'] as String? ?? '*/*',
|
||||
allowMultiple: map['allowMultiple'] as bool? ?? false,
|
||||
callerLabel: map['callerLabel'] as String?,
|
||||
);
|
||||
}
|
||||
|
||||
/// Whether an item's mime type satisfies this request's filter (which may
|
||||
/// be a wildcard like `image/*` or the catch-all `*/*`).
|
||||
bool matches(String? itemMimeType) {
|
||||
if (mimeType == '*/*') return true;
|
||||
if (itemMimeType == null) return false;
|
||||
if (mimeType.endsWith('/*')) {
|
||||
return itemMimeType.startsWith(
|
||||
mimeType.substring(0, mimeType.length - 1),
|
||||
);
|
||||
}
|
||||
return itemMimeType == mimeType;
|
||||
}
|
||||
}
|
||||
@@ -6,13 +6,11 @@ import 'package:flutter/material.dart';
|
||||
class SelectionAction {
|
||||
final IconData icon;
|
||||
final String label;
|
||||
final Color? color;
|
||||
final VoidCallback onTap;
|
||||
|
||||
const SelectionAction({
|
||||
required this.icon,
|
||||
required this.label,
|
||||
required this.onTap,
|
||||
this.color,
|
||||
});
|
||||
}
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
/// A pending device-sync conflict (a file changed both locally and on the
|
||||
/// server since the last sync) - mirrors `SyncStatusBus.Conflict` on the
|
||||
/// native side exactly, see `SyncEngine.kt`/`server.md`'s "Device sync"
|
||||
/// section.
|
||||
class SyncConflictInfo {
|
||||
final String accountId;
|
||||
final String fileId;
|
||||
final String remotePath;
|
||||
final String relPath;
|
||||
final String name;
|
||||
|
||||
const SyncConflictInfo({
|
||||
required this.accountId,
|
||||
required this.fileId,
|
||||
required this.remotePath,
|
||||
required this.relPath,
|
||||
required this.name,
|
||||
});
|
||||
|
||||
factory SyncConflictInfo.fromMap(Map<dynamic, dynamic> map) {
|
||||
return SyncConflictInfo(
|
||||
accountId: map['accountId'] as String? ?? '',
|
||||
fileId: map['fileId'] as String? ?? '',
|
||||
remotePath: map['remotePath'] as String? ?? '',
|
||||
relPath: map['relPath'] as String? ?? '',
|
||||
name: map['name'] as String? ?? '',
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/// A single item's device-sync status, used to badge its tile in the
|
||||
/// Files view.
|
||||
enum SyncItemStatus { none, syncing, synced, conflict }
|
||||
|
||||
/// The persistent header chip/panel's overall status (account-wide, not
|
||||
/// scoped to whatever folder is currently browsed) - see
|
||||
/// `SyncStatusController.syncHeaderStatus`.
|
||||
enum SyncHeaderStatus { off, syncing, done, alert }
|
||||
@@ -0,0 +1,53 @@
|
||||
import 'dart:async';
|
||||
import 'package:connectivity_plus/connectivity_plus.dart';
|
||||
import 'package:flutter/foundation.dart';
|
||||
|
||||
/// Whether the device currently has *any* network route (Wi-Fi, mobile
|
||||
/// data, ethernet - not a guarantee the Nextcloud server itself is
|
||||
/// reachable, just OS-level connectivity). The single source of truth
|
||||
/// other controllers/views consult before attempting a network request or
|
||||
/// deciding whether to fall back to offline-only behavior - see
|
||||
/// `SessionController` (skips its login-restore HTTP call entirely while
|
||||
/// offline) and `MainShellView` (restricts the bottom nav to just the
|
||||
/// Offline tab while offline).
|
||||
class ConnectivityController extends ChangeNotifier {
|
||||
bool _isOffline = false;
|
||||
StreamSubscription<List<ConnectivityResult>>? _sub;
|
||||
Timer? _recheckTimer;
|
||||
|
||||
bool get isOffline => _isOffline;
|
||||
|
||||
ConnectivityController() {
|
||||
Connectivity().checkConnectivity().then(_apply);
|
||||
_sub = Connectivity().onConnectivityChanged.listen(_apply);
|
||||
// The very first check can spuriously report "no network" while the
|
||||
// OS's connectivity stack is still attaching callbacks to this
|
||||
// just-started process - a real Android cold-start quirk, not a
|
||||
// genuine transition. That matters here specifically because
|
||||
// onConnectivityChanged only fires on actual transitions, so a false
|
||||
// initial "offline" read would otherwise stick for the rest of the
|
||||
// session (SessionController would keep treating every login as
|
||||
// provisional, and every network-fetching controller would never get
|
||||
// its real activation signal - see addAccountReadyListener's doc
|
||||
// comment) even though the device was online the whole time. Re-
|
||||
// verify once, shortly after, to correct it.
|
||||
_recheckTimer = Timer(const Duration(seconds: 2), () {
|
||||
Connectivity().checkConnectivity().then(_apply);
|
||||
});
|
||||
}
|
||||
|
||||
void _apply(List<ConnectivityResult> results) {
|
||||
final offline =
|
||||
results.isEmpty || results.every((r) => r == ConnectivityResult.none);
|
||||
if (offline == _isOffline) return;
|
||||
_isOffline = offline;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_sub?.cancel();
|
||||
_recheckTimer?.cancel();
|
||||
super.dispose();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,110 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import '../models/nextcloud_item.dart';
|
||||
import 'files_controller.dart';
|
||||
import 'session_controller.dart';
|
||||
|
||||
/// The Favorites tab: every favorited item across the whole account (not
|
||||
/// scoped to any one folder - a favorited item several folders deep still
|
||||
/// shows up regardless of whether its parent folders are themselves
|
||||
/// favorited, which is exactly why this is its own account-wide fetch
|
||||
/// rather than a filter toggle over whatever folder Files happens to be
|
||||
/// browsing - see `server.md`'s Favorites section for the full history of
|
||||
/// why a filter-toggle approach was tried and reverted). Depends on
|
||||
/// [FilesController] to reuse its exact
|
||||
/// display prefs (hidden/type-filter/sort/storage-scope) via
|
||||
/// [FilesController.applyFilesDisplayPrefs] - deliberately shared rather
|
||||
/// than a second parallel settings dimension.
|
||||
class FavoritesController extends ChangeNotifier {
|
||||
final SessionController session;
|
||||
final FilesController files;
|
||||
|
||||
List<NextcloudItem> _allFavorites = [];
|
||||
bool _isLoading = false;
|
||||
String? _errorMessage;
|
||||
// True once fetchAll has run at least once (i.e. the Favorites tab has
|
||||
// been visited) - delete/rename/move/copy re-sync afterward, but only
|
||||
// when it's actually been loaded, so those actions don't pay for an
|
||||
// extra network round-trip on every Files/Photos edit for an account
|
||||
// that's never opened the Favorites tab this session.
|
||||
bool _everFetched = false;
|
||||
|
||||
FavoritesController(this.session, this.files) {
|
||||
session.addAccountClearedListener(_onAccountCleared);
|
||||
}
|
||||
|
||||
bool get isLoading => _isLoading;
|
||||
String? get errorMessage => _errorMessage;
|
||||
|
||||
/// The Favorites tab's content, run through the exact same hidden/type-
|
||||
/// filter/sort/storage-scope display prefs as the Files tab. No
|
||||
/// favorites filter needed here - the source list is already
|
||||
/// all-favorites.
|
||||
List<NextcloudItem> get items => files.applyFilesDisplayPrefs(_allFavorites);
|
||||
|
||||
void _onAccountCleared() {
|
||||
_allFavorites = [];
|
||||
_isLoading = false;
|
||||
_errorMessage = null;
|
||||
_everFetched = false;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
/// Loads every favorited item across the whole account for the Favorites
|
||||
/// tab.
|
||||
Future<void> fetchAll() async {
|
||||
final service = session.service;
|
||||
if (!session.isLoggedIn || service == null) return;
|
||||
final gen = session.sessionGeneration;
|
||||
_everFetched = true;
|
||||
|
||||
_isLoading = true;
|
||||
_errorMessage = null;
|
||||
notifyListeners();
|
||||
|
||||
try {
|
||||
final favorites = await service.fetchFavorites();
|
||||
if (gen != session.sessionGeneration) return;
|
||||
_allFavorites = favorites;
|
||||
debugPrint('[FavoritesController] Loaded ${_allFavorites.length} favorites');
|
||||
} catch (e) {
|
||||
if (gen != session.sessionGeneration) return;
|
||||
debugPrint('[FavoritesController] Error fetching favorites: $e');
|
||||
_errorMessage = e.toString().replaceAll('Exception: ', '');
|
||||
} finally {
|
||||
if (gen == session.sessionGeneration) {
|
||||
_isLoading = false;
|
||||
notifyListeners();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Re-syncs [_allFavorites] after a delete/rename/move/copy elsewhere in
|
||||
/// the app - those operations don't know how to patch this list in place
|
||||
/// (a move changes an item's path; WebDAV COPY's handling of custom
|
||||
/// properties like `oc:favorite` isn't reliable enough to assume the
|
||||
/// copy is still favorited), so this just refetches - but only if
|
||||
/// Favorites has actually been loaded this session. Called by
|
||||
/// `ItemOperations` after delete/rename/move/copy.
|
||||
Future<void> syncIfLoaded() {
|
||||
return _everFetched ? fetchAll() : Future.value();
|
||||
}
|
||||
|
||||
/// Patches a favorite-toggle result into [_allFavorites] in place (added
|
||||
/// if newly favorited, removed if un-favorited, updated otherwise) -
|
||||
/// called by `ItemOperations.toggleItemFavorite` after a successful
|
||||
/// server call. Cheap enough not to need a full refetch, unlike
|
||||
/// [syncIfLoaded].
|
||||
void applyFavoriteToggle(NextcloudItem updated) {
|
||||
final index = _allFavorites.indexWhere((i) => i.id == updated.id);
|
||||
if (updated.isFavorite) {
|
||||
if (index != -1) {
|
||||
_allFavorites[index] = updated;
|
||||
} else {
|
||||
_allFavorites = [..._allFavorites, updated];
|
||||
}
|
||||
} else if (index != -1) {
|
||||
_allFavorites = [..._allFavorites]..removeAt(index);
|
||||
}
|
||||
notifyListeners();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,697 @@
|
||||
import 'dart:async';
|
||||
import 'dart:convert';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:shared_preferences/shared_preferences.dart';
|
||||
import '../models/nextcloud_item.dart';
|
||||
import 'folder_browser.dart';
|
||||
import 'session_controller.dart';
|
||||
|
||||
enum FileSortField { name, dateCreated, dateModified, size }
|
||||
|
||||
/// Which storage a listing shows — always exactly one, like the list/grid
|
||||
/// view toggle, not an optional filter. Shared across Files/Photos/
|
||||
/// Favorites (see [applyCommonFilters]'s doc comment).
|
||||
enum StorageScope { cloud, external }
|
||||
|
||||
/// The Files tab's files/folders/both filter — independent of and applied
|
||||
/// after [StorageScope]/favorites/hidden filtering.
|
||||
enum FilesTypeFilter { all, filesOnly, foldersOnly }
|
||||
|
||||
/// How aggressively the Files tab's folder listings (not thumbnails/file
|
||||
/// content - just the list of names/sizes/dates) are reused across
|
||||
/// navigation instead of refetched from the server every time.
|
||||
enum CachePolicy {
|
||||
/// Every navigation refetches. Synced files are checked each time the app
|
||||
/// opens (and on pull-to-refresh), but not on a background schedule.
|
||||
never,
|
||||
|
||||
/// A listing is reused until it's older than [FilesController.
|
||||
/// cacheIntervalMinutes]; a timer also proactively refreshes the current
|
||||
/// folder on that same interval while the app is in the foreground.
|
||||
interval,
|
||||
|
||||
/// A listing is reused indefinitely until the user pulls to refresh.
|
||||
/// Synced files likewise only update on pull-to-refresh / "Sync now".
|
||||
manual,
|
||||
}
|
||||
|
||||
/// New accounts (and anyone who's never touched the setting) refresh
|
||||
/// periodically - the Files Cache rule also drives how often synced
|
||||
/// folders/files are brought in line with the server, see
|
||||
/// `SyncStatusController`.
|
||||
const defaultCachePolicy = CachePolicy.interval;
|
||||
const defaultCacheIntervalMinutes = 15;
|
||||
|
||||
/// One cached folder listing and when it was fetched.
|
||||
class _CachedDirectory {
|
||||
final List<NextcloudItem> items;
|
||||
final DateTime fetchedAt;
|
||||
|
||||
const _CachedDirectory(this.items, this.fetchedAt);
|
||||
}
|
||||
|
||||
/// The Files tab: current folder/browsing state, display prefs (grid/list,
|
||||
/// hidden, type filter, storage scope, sort), the directory-listing cache,
|
||||
/// and - piggybacked onto the same fetch cycle as the original single
|
||||
/// provider did - account quota and the Activity tab's feed (neither is
|
||||
/// really "Files" data, but both were always fetched alongside the current
|
||||
/// folder's listing, not independently; preserved here as-is rather than
|
||||
/// invented a home for them, since untangling that wasn't asked for). Also
|
||||
/// the shared [storageScope]/[applyCommonFilters]/[applyFilesDisplayPrefs]
|
||||
/// logic Photos/Favorites both reuse - see their own controllers' doc
|
||||
/// comments for why they depend on this one.
|
||||
///
|
||||
/// Split out of the former single `ServerProvider` god object.
|
||||
class FilesController extends ChangeNotifier
|
||||
with WidgetsBindingObserver
|
||||
implements FolderBrowser {
|
||||
final SessionController session;
|
||||
|
||||
static const _prefGridView = 'ui_grid_view';
|
||||
static const _prefStorageScope = 'ui_storage_scope';
|
||||
static const _prefFilesTypeFilter = 'ui_files_type_filter';
|
||||
static const _prefShowHiddenFiles = 'ui_show_hidden';
|
||||
static const _prefFolderSort = 'ui_folder_sort';
|
||||
static const prefCachePolicy = 'ui_cache_policy';
|
||||
static const prefCacheIntervalMinutes = 'ui_cache_interval_minutes';
|
||||
|
||||
String _currentFolderPath = '/';
|
||||
List<String> _pathStack = ['/'];
|
||||
|
||||
bool _isGridView = false;
|
||||
StorageScope _storageScope = StorageScope.cloud;
|
||||
FilesTypeFilter _filesTypeFilter = FilesTypeFilter.all;
|
||||
bool _showHiddenFiles = false;
|
||||
|
||||
final Map<String, FileSortField> _folderSortField = {};
|
||||
final Map<String, bool> _folderSortAscending = {};
|
||||
|
||||
CachePolicy _cachePolicy = defaultCachePolicy;
|
||||
int _cacheIntervalMinutes = defaultCacheIntervalMinutes;
|
||||
final Map<String, _CachedDirectory> _directoryCache = {};
|
||||
Timer? _cacheRefreshTimer;
|
||||
|
||||
// Auto-retry of a failed (not in-place) load that looks like a network
|
||||
// hiccup - see [_scheduleNetworkRetry].
|
||||
Timer? _retryTimer;
|
||||
int _retryAttempt = 0;
|
||||
|
||||
List<NextcloudItem> _items = [];
|
||||
NextcloudUserQuota? _quota;
|
||||
List<NextcloudActivity> _activities = [];
|
||||
bool _isLoading = false;
|
||||
String? _errorMessage;
|
||||
|
||||
FilesController(this.session) {
|
||||
WidgetsBinding.instance.addObserver(this);
|
||||
session.addAccountClearedListener(_onAccountCleared);
|
||||
session.addAccountActivatedListener(_onAccountActivated);
|
||||
session.addAccountReadyListener(_restoreDisplayPrefs);
|
||||
}
|
||||
|
||||
// Getters
|
||||
@override
|
||||
String get currentFolderPath => _currentFolderPath;
|
||||
@override
|
||||
List<String> get pathStack => _pathStack;
|
||||
bool get isGridView => _isGridView;
|
||||
StorageScope get storageScope => _storageScope;
|
||||
FilesTypeFilter get filesTypeFilter => _filesTypeFilter;
|
||||
bool get showHiddenFiles => _showHiddenFiles;
|
||||
FileSortField get filesSortField => sortFieldFor(_currentFolderPath);
|
||||
bool get filesSortAscending => sortAscendingFor(_currentFolderPath);
|
||||
|
||||
/// Per-folder sort prefs keyed by remote path - also what the Offline tab
|
||||
/// reads for the same path in the local mirror, so a folder sorts the
|
||||
/// same in both places.
|
||||
FileSortField sortFieldFor(String path) =>
|
||||
_folderSortField[path] ?? FileSortField.name;
|
||||
bool sortAscendingFor(String path) => _folderSortAscending[path] ?? true;
|
||||
CachePolicy get cachePolicy => _cachePolicy;
|
||||
int get cacheIntervalMinutes => _cacheIntervalMinutes;
|
||||
@override
|
||||
bool get isLoading => _isLoading;
|
||||
@override
|
||||
String? get errorMessage => _errorMessage;
|
||||
NextcloudUserQuota? get quota => _quota;
|
||||
List<NextcloudActivity> get activities => _activities;
|
||||
|
||||
@override
|
||||
List<NextcloudItem> get items => applyFilesDisplayPrefs(_items);
|
||||
|
||||
int _compareItems(NextcloudItem a, NextcloudItem b, FileSortField field) {
|
||||
switch (field) {
|
||||
case FileSortField.name:
|
||||
return a.name.toLowerCase().compareTo(b.name.toLowerCase());
|
||||
case FileSortField.dateCreated:
|
||||
return a.dateCreated.compareTo(b.dateCreated);
|
||||
case FileSortField.dateModified:
|
||||
return a.lastModified.compareTo(b.lastModified);
|
||||
case FileSortField.size:
|
||||
return a.size.compareTo(b.size);
|
||||
}
|
||||
}
|
||||
|
||||
/// True if [item] or any ancestor folder in its path is a dotfile/dotfolder.
|
||||
bool _isHiddenItem(NextcloudItem item) {
|
||||
return item.path
|
||||
.split('/')
|
||||
.where((segment) => segment.isNotEmpty)
|
||||
.any((segment) => segment.startsWith('.'));
|
||||
}
|
||||
|
||||
/// Applies the shared favorites-only/hidden-files/storage-scope toggles -
|
||||
/// shared by Files' own [items], Photos' `photoItems` (its own favorites-
|
||||
/// only/hidden toggles, but [storageScope] here), and Favorites'
|
||||
/// `favoriteItems` (via [applyFilesDisplayPrefs]).
|
||||
List<NextcloudItem> applyCommonFilters(
|
||||
List<NextcloudItem> source, {
|
||||
required bool showFavoritesOnly,
|
||||
required bool showHidden,
|
||||
bool applyStorageScope = true,
|
||||
}) {
|
||||
var filtered = source;
|
||||
if (showFavoritesOnly) {
|
||||
filtered = filtered.where((item) => item.isFavorite).toList();
|
||||
}
|
||||
if (!showHidden) {
|
||||
filtered = filtered.where((item) => !_isHiddenItem(item)).toList();
|
||||
}
|
||||
if (applyStorageScope) {
|
||||
filtered = filtered
|
||||
.where(
|
||||
(item) => _storageScope == StorageScope.external
|
||||
? item.isExternalStorage
|
||||
: !item.isExternalStorage,
|
||||
)
|
||||
.toList();
|
||||
}
|
||||
return filtered;
|
||||
}
|
||||
|
||||
/// Applies the Files tab's current sort/filter display prefs (hidden,
|
||||
/// type filter, storage scope, sort field/direction) to an arbitrary raw
|
||||
/// item list - factored out of the [items] getter so both the Favorites
|
||||
/// tab and the Move/Copy destination picker (which fetches its own
|
||||
/// listings via [fetchFolderListing] rather than reading [items] itself)
|
||||
/// can render with the exact same controls/behavior as the Files tab
|
||||
/// without duplicating this logic.
|
||||
///
|
||||
/// [folderPath] picks which folder's sort prefs apply (default: the
|
||||
/// Files tab's current folder). [applyStorageScope] is off for the
|
||||
/// Offline tab, whose local mirror has no cloud/external distinction.
|
||||
List<NextcloudItem> applyFilesDisplayPrefs(
|
||||
List<NextcloudItem> rawItems, {
|
||||
String? folderPath,
|
||||
bool applyStorageScope = true,
|
||||
}) {
|
||||
var filtered = applyCommonFilters(
|
||||
rawItems,
|
||||
// Files itself doesn't filter by favorite - that's the dedicated
|
||||
// Favorites tab's job.
|
||||
showFavoritesOnly: false,
|
||||
showHidden: _showHiddenFiles,
|
||||
applyStorageScope: applyStorageScope,
|
||||
);
|
||||
switch (_filesTypeFilter) {
|
||||
case FilesTypeFilter.all:
|
||||
break;
|
||||
case FilesTypeFilter.filesOnly:
|
||||
filtered = filtered.where((i) => !i.isFolder).toList();
|
||||
case FilesTypeFilter.foldersOnly:
|
||||
filtered = filtered.where((i) => i.isFolder).toList();
|
||||
}
|
||||
|
||||
final path = folderPath ?? _currentFolderPath;
|
||||
final field = sortFieldFor(path);
|
||||
final folders = filtered.where((i) => i.isFolder).toList()
|
||||
..sort((a, b) => _compareItems(a, b, field));
|
||||
final files = filtered.where((i) => !i.isFolder).toList()
|
||||
..sort((a, b) => _compareItems(a, b, field));
|
||||
return sortAscendingFor(path)
|
||||
? [...folders, ...files]
|
||||
: [...folders.reversed, ...files.reversed];
|
||||
}
|
||||
|
||||
void _onAccountCleared() {
|
||||
_prefsRestore = null;
|
||||
_retryTimer?.cancel();
|
||||
_retryAttempt = 0;
|
||||
_cacheRefreshTimer?.cancel();
|
||||
_directoryCache.clear();
|
||||
_folderSortField.clear();
|
||||
_folderSortAscending.clear();
|
||||
_items = [];
|
||||
_quota = null;
|
||||
_activities = [];
|
||||
_currentFolderPath = '/';
|
||||
_pathStack = ['/'];
|
||||
_isGridView = false;
|
||||
_storageScope = StorageScope.cloud;
|
||||
_filesTypeFilter = FilesTypeFilter.all;
|
||||
_showHiddenFiles = false;
|
||||
_cachePolicy = defaultCachePolicy;
|
||||
_cacheIntervalMinutes = defaultCacheIntervalMinutes;
|
||||
_isLoading = false;
|
||||
_errorMessage = null;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
// Memoized per account (reset in _onAccountCleared) so the ready-event
|
||||
// and activated-event paths below share one restore instead of racing
|
||||
// two reads of the same prefs.
|
||||
Future<void>? _prefsRestore;
|
||||
|
||||
/// Loads this account's display prefs (grid/list, hidden, type filter,
|
||||
/// sort, cache policy) - hooked to `addAccountReadyListener` as well as
|
||||
/// activation so the Offline tab, which reads these same prefs, respects
|
||||
/// them even on a provisional/offline login where activation never fires.
|
||||
Future<void> _restoreDisplayPrefs() => _prefsRestore ??= _doRestoreDisplayPrefs();
|
||||
|
||||
/// Completes once this account's cache policy/display prefs have been
|
||||
/// loaded from storage - lets `SyncStatusController` schedule background
|
||||
/// sync from the user's real policy instead of the defaults.
|
||||
Future<void> get displayPrefsLoaded => _restoreDisplayPrefs();
|
||||
|
||||
Future<void> _doRestoreDisplayPrefs() async {
|
||||
final id = session.activeAccountId;
|
||||
if (id != null) {
|
||||
// The whole prefs-restore block is wrapped, not just the JSON
|
||||
// decode below - a single bad/mistyped stored value here (an
|
||||
// unguarded `prefs.getBool`/`getString`/`getInt` throws if the
|
||||
// key holds a different runtime type than requested) would
|
||||
// otherwise propagate uncaught out of this method entirely,
|
||||
// silently skipping `refreshData()` below and leaving the Files
|
||||
// tab permanently empty on this activation with no error surfaced
|
||||
// anywhere - exactly what happened before this was guarded.
|
||||
try {
|
||||
final prefs = await session.prefsFuture;
|
||||
String k(String base) => session.accountStore.accountPrefKey(id, base);
|
||||
|
||||
_isGridView = prefs.getBool(k(_prefGridView)) ?? false;
|
||||
final storageScopeName = prefs.getString(k(_prefStorageScope));
|
||||
_storageScope = StorageScope.values.firstWhere(
|
||||
(s) => s.name == storageScopeName,
|
||||
orElse: () => StorageScope.cloud,
|
||||
);
|
||||
final filesTypeFilterName = prefs.getString(k(_prefFilesTypeFilter));
|
||||
_filesTypeFilter = FilesTypeFilter.values.firstWhere(
|
||||
(f) => f.name == filesTypeFilterName,
|
||||
orElse: () => FilesTypeFilter.all,
|
||||
);
|
||||
_showHiddenFiles = prefs.getBool(k(_prefShowHiddenFiles)) ?? false;
|
||||
|
||||
final folderSortJson = prefs.getString(k(_prefFolderSort));
|
||||
if (folderSortJson != null) {
|
||||
try {
|
||||
final decoded = jsonDecode(folderSortJson) as Map<String, dynamic>;
|
||||
for (final entry in decoded.entries) {
|
||||
final value = entry.value as Map<String, dynamic>;
|
||||
final fieldName = value['field'] as String?;
|
||||
if (fieldName != null) {
|
||||
_folderSortField[entry.key] = FileSortField.values.firstWhere(
|
||||
(f) => f.name == fieldName,
|
||||
orElse: () => FileSortField.name,
|
||||
);
|
||||
}
|
||||
final ascending = value['ascending'] as bool?;
|
||||
if (ascending != null) {
|
||||
_folderSortAscending[entry.key] = ascending;
|
||||
}
|
||||
}
|
||||
} catch (e) {
|
||||
debugPrint('[FilesController] Folder sort restore failed: $e');
|
||||
}
|
||||
}
|
||||
|
||||
final cachePolicyName = prefs.getString(k(prefCachePolicy));
|
||||
_cachePolicy = CachePolicy.values.firstWhere(
|
||||
(c) => c.name == cachePolicyName,
|
||||
orElse: () => defaultCachePolicy,
|
||||
);
|
||||
_cacheIntervalMinutes =
|
||||
prefs.getInt(k(prefCacheIntervalMinutes)) ??
|
||||
defaultCacheIntervalMinutes;
|
||||
notifyListeners();
|
||||
} catch (e) {
|
||||
debugPrint('[FilesController] Account-activation prefs restore failed: $e');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _onAccountActivated() async {
|
||||
await _restoreDisplayPrefs();
|
||||
_startCacheRefreshTimerIfNeeded();
|
||||
await refreshData();
|
||||
}
|
||||
|
||||
@override
|
||||
void didChangeAppLifecycleState(AppLifecycleState state) {
|
||||
// Only relevant under CachePolicy.interval.
|
||||
if (state == AppLifecycleState.resumed) {
|
||||
_startCacheRefreshTimerIfNeeded();
|
||||
} else if (state == AppLifecycleState.paused) {
|
||||
_cacheRefreshTimer?.cancel();
|
||||
}
|
||||
}
|
||||
|
||||
void _startCacheRefreshTimerIfNeeded() {
|
||||
_cacheRefreshTimer?.cancel();
|
||||
if (_cachePolicy != CachePolicy.interval || !session.isLoggedIn) return;
|
||||
_cacheRefreshTimer = Timer.periodic(
|
||||
Duration(minutes: _cacheIntervalMinutes),
|
||||
(_) => refreshData(),
|
||||
);
|
||||
}
|
||||
|
||||
bool _isCacheFresh(String path) {
|
||||
if (_cachePolicy == CachePolicy.never) return false;
|
||||
final cached = _directoryCache[path];
|
||||
if (cached == null) return false;
|
||||
if (_cachePolicy == CachePolicy.manual) return true;
|
||||
return DateTime.now().difference(cached.fetchedAt) <
|
||||
Duration(minutes: _cacheIntervalMinutes);
|
||||
}
|
||||
|
||||
Future<void> refreshData() async {
|
||||
final service = session.service;
|
||||
if (!session.isLoggedIn || service == null) {
|
||||
debugPrint(
|
||||
'[FilesController] refreshData skipped: isLoggedIn=${session.isLoggedIn}, service=${service != null}',
|
||||
);
|
||||
return;
|
||||
}
|
||||
// Captured so a response landing after an account switch mid-flight
|
||||
// can recognize it's for an account the user has already left and
|
||||
// discard itself instead of overwriting the new account's content.
|
||||
final gen = session.sessionGeneration;
|
||||
_retryTimer?.cancel();
|
||||
|
||||
// Refreshing a folder that's already on screen (pull-to-refresh, the
|
||||
// periodic cache refresh) swaps the listing in place once the server
|
||||
// answers - blanking the list to a spinner first made every refresh
|
||||
// look like the files vanished and reappeared. The spinner is only for
|
||||
// when there's nothing to show yet (first load, just navigated into a
|
||||
// new folder - see [_navigateTo], which clears the outgoing folder's
|
||||
// items - or retrying after an error).
|
||||
final inPlace = _items.isNotEmpty && _errorMessage == null;
|
||||
if (!inPlace) {
|
||||
_isLoading = true;
|
||||
_errorMessage = null;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
debugPrint('[FilesController] Refreshing data for path: $_currentFolderPath');
|
||||
|
||||
try {
|
||||
final items = await service.fetchDirectory(_currentFolderPath);
|
||||
if (gen != session.sessionGeneration) return;
|
||||
_items = items;
|
||||
_directoryCache[_currentFolderPath] = _CachedDirectory(
|
||||
_items,
|
||||
DateTime.now(),
|
||||
);
|
||||
// Show the new listing now rather than after the quota/activity
|
||||
// fetches below - they're unrelated to what the list displays.
|
||||
_isLoading = false;
|
||||
_retryAttempt = 0;
|
||||
notifyListeners();
|
||||
debugPrint(
|
||||
'[FilesController] Loaded ${_items.length} items for $_currentFolderPath',
|
||||
);
|
||||
try {
|
||||
_quota = await service.fetchUserQuota();
|
||||
} catch (e) {
|
||||
debugPrint('[FilesController] Quota fetch warning: $e');
|
||||
}
|
||||
try {
|
||||
_activities = await service.fetchActivities();
|
||||
} catch (e) {
|
||||
debugPrint('[FilesController] Activity fetch warning: $e');
|
||||
}
|
||||
} catch (e) {
|
||||
if (gen != session.sessionGeneration) return;
|
||||
debugPrint('[FilesController] Error fetching directory: $e');
|
||||
// A failed in-place refresh keeps the (slightly stale) listing on
|
||||
// screen instead of replacing it with an error page.
|
||||
if (!inPlace) {
|
||||
_errorMessage = e.toString().replaceAll('Exception: ', '');
|
||||
_scheduleNetworkRetry(e);
|
||||
}
|
||||
} finally {
|
||||
if (gen == session.sessionGeneration) {
|
||||
_isLoading = false;
|
||||
notifyListeners();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// The OS reports "connected" a moment before the route actually works,
|
||||
/// so the first request after regaining Wi-Fi/data can fail with "Network
|
||||
/// is unreachable" - leaving the Files tab on an error page until the
|
||||
/// user taps Retry. Quietly retry a few times (2s, 4s, 8s, 15s) when the
|
||||
/// failure is network-level and the device is online; a real server error
|
||||
/// (auth, 5xx) isn't retried.
|
||||
void _scheduleNetworkRetry(Object error) {
|
||||
final text = error.toString();
|
||||
final isNetworkError =
|
||||
text.contains('SocketException') ||
|
||||
text.contains('ClientException') ||
|
||||
text.contains('TimeoutException') ||
|
||||
text.contains('Network is unreachable');
|
||||
if (!isNetworkError ||
|
||||
_retryAttempt >= 4 ||
|
||||
session.connectivity.isOffline) {
|
||||
return;
|
||||
}
|
||||
final delays = [2, 4, 8, 15];
|
||||
final delay = Duration(seconds: delays[_retryAttempt]);
|
||||
_retryAttempt++;
|
||||
_retryTimer = Timer(delay, () => unawaited(refreshData()));
|
||||
}
|
||||
|
||||
Future<List<NextcloudItem>> searchFiles(String query) async {
|
||||
final service = session.service;
|
||||
if (service == null) return [];
|
||||
return service.searchFiles(query);
|
||||
}
|
||||
|
||||
@override
|
||||
Future<void> reload() => refreshData();
|
||||
|
||||
@override
|
||||
Future<void> navigateToFolder(String path) async {
|
||||
_pathStack.add(path);
|
||||
await _navigateTo(path);
|
||||
}
|
||||
|
||||
@override
|
||||
Future<void> navigateUp() async {
|
||||
if (_pathStack.length > 1) {
|
||||
_pathStack.removeLast();
|
||||
await _navigateTo(_pathStack.last);
|
||||
}
|
||||
}
|
||||
|
||||
/// Jumps directly to an ancestor folder by its position in [pathStack]
|
||||
/// (as tapped from a breadcrumb), trimming everything below it.
|
||||
@override
|
||||
Future<void> navigateToPathIndex(int index) async {
|
||||
if (index < 0 || index >= _pathStack.length - 1) return;
|
||||
_pathStack = _pathStack.sublist(0, index + 1);
|
||||
await _navigateTo(_pathStack.last);
|
||||
}
|
||||
|
||||
/// Navigates directly to an arbitrary absolute folder path (e.g. from a
|
||||
/// search result) - unlike [navigateToFolder], which assumes [path] is a
|
||||
/// child of wherever the user is currently browsing and just appends it,
|
||||
/// this rebuilds the whole breadcrumb trail from root so it's correct
|
||||
/// regardless of where the user was before.
|
||||
Future<void> navigateToAbsoluteFolder(String path) async {
|
||||
final normalized = path.trim().replaceAll(RegExp(r'/+$'), '');
|
||||
final segments = normalized.split('/').where((s) => s.isNotEmpty).toList();
|
||||
final stack = <String>['/'];
|
||||
var current = '';
|
||||
for (final segment in segments) {
|
||||
current = '$current/$segment';
|
||||
stack.add(current);
|
||||
}
|
||||
_pathStack = stack;
|
||||
await _navigateTo(stack.last);
|
||||
}
|
||||
|
||||
/// Switches the current folder to [path], serving its listing straight
|
||||
/// from the cache when that's still fresh (instant, no network call at
|
||||
/// all) and only falling back to [refreshData] otherwise.
|
||||
Future<void> _navigateTo(String path) async {
|
||||
_currentFolderPath = path;
|
||||
final cached = _directoryCache[path];
|
||||
if (cached != null && _isCacheFresh(path)) {
|
||||
debugPrint('[FilesController] Serving cached listing for $path');
|
||||
_items = cached.items;
|
||||
_errorMessage = null;
|
||||
notifyListeners();
|
||||
return;
|
||||
}
|
||||
// Don't leave the folder just left on screen under the new breadcrumb
|
||||
// while this one loads - clearing it is what makes [refreshData] show
|
||||
// its spinner (rather than refreshing in place) for a navigation.
|
||||
_items = [];
|
||||
await refreshData();
|
||||
}
|
||||
|
||||
/// A destination-picker-only fetch: the current folder listing state
|
||||
/// (`items`/`currentFolderPath`/`pathStack`/the directory cache) belongs
|
||||
/// to whichever tab is actively browsing (Files), so the Move/Copy
|
||||
/// destination picker deliberately doesn't touch any of it - it fetches
|
||||
/// listings for its own local navigation state through this instead.
|
||||
Future<List<NextcloudItem>> fetchFolderListing(String path) {
|
||||
return session.service?.fetchDirectory(path) ?? Future.value([]);
|
||||
}
|
||||
|
||||
void invalidateCache() => _directoryCache.clear();
|
||||
|
||||
/// Persists a per-account browsing pref under its `acct_<id>_`-namespaced
|
||||
/// key. No-op if there's no active account (shouldn't normally happen -
|
||||
/// these setters are only reachable from screens that require one).
|
||||
void _persistAccountPref(
|
||||
String baseKey,
|
||||
void Function(SharedPreferences prefs, String key) write,
|
||||
) {
|
||||
final id = session.activeAccountId;
|
||||
if (id == null) return;
|
||||
session.prefsFuture.then(
|
||||
(p) => write(p, session.accountStore.accountPrefKey(id, baseKey)),
|
||||
);
|
||||
}
|
||||
|
||||
void setGridView(bool value) {
|
||||
if (_isGridView == value) return;
|
||||
_isGridView = value;
|
||||
notifyListeners();
|
||||
_persistAccountPref(_prefGridView, (p, key) => p.setBool(key, value));
|
||||
}
|
||||
|
||||
void setStorageScope(StorageScope scope) {
|
||||
if (_storageScope == scope) return;
|
||||
_storageScope = scope;
|
||||
notifyListeners();
|
||||
_persistAccountPref(
|
||||
_prefStorageScope,
|
||||
(p, key) => p.setString(key, scope.name),
|
||||
);
|
||||
}
|
||||
|
||||
void setFilesTypeFilter(FilesTypeFilter filter) {
|
||||
if (_filesTypeFilter == filter) return;
|
||||
_filesTypeFilter = filter;
|
||||
notifyListeners();
|
||||
_persistAccountPref(
|
||||
_prefFilesTypeFilter,
|
||||
(p, key) => p.setString(key, filter.name),
|
||||
);
|
||||
}
|
||||
|
||||
/// Only *enabling* hidden-files visibility is gated - hiding them again
|
||||
/// never exposes anything, so that direction is always allowed instantly.
|
||||
Future<void> toggleShowHiddenFiles() async {
|
||||
if (!_showHiddenFiles) {
|
||||
if (!await session.passGate(
|
||||
session.lockHiddenFiles,
|
||||
'Unlock to show hidden files',
|
||||
)) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
_showHiddenFiles = !_showHiddenFiles;
|
||||
notifyListeners();
|
||||
_persistAccountPref(
|
||||
_prefShowHiddenFiles,
|
||||
(p, key) => p.setBool(key, _showHiddenFiles),
|
||||
);
|
||||
}
|
||||
|
||||
void _persistFolderSort() {
|
||||
final combined = <String, dynamic>{};
|
||||
for (final path in {
|
||||
..._folderSortField.keys,
|
||||
..._folderSortAscending.keys,
|
||||
}) {
|
||||
combined[path] = {
|
||||
'field': _folderSortField[path]?.name,
|
||||
'ascending': _folderSortAscending[path],
|
||||
};
|
||||
}
|
||||
_persistAccountPref(
|
||||
_prefFolderSort,
|
||||
(p, key) => p.setString(key, jsonEncode(combined)),
|
||||
);
|
||||
}
|
||||
|
||||
void setFilesSortField(FileSortField field) =>
|
||||
setSortFieldFor(_currentFolderPath, field);
|
||||
|
||||
void toggleFilesSortOrder() => toggleSortOrderFor(_currentFolderPath);
|
||||
|
||||
void setSortFieldFor(String path, FileSortField field) {
|
||||
if (sortFieldFor(path) == field) return;
|
||||
_folderSortField[path] = field;
|
||||
notifyListeners();
|
||||
_persistFolderSort();
|
||||
}
|
||||
|
||||
void toggleSortOrderFor(String path) {
|
||||
_folderSortAscending[path] = !sortAscendingFor(path);
|
||||
notifyListeners();
|
||||
_persistFolderSort();
|
||||
}
|
||||
|
||||
void setCachePolicy(CachePolicy policy) {
|
||||
if (_cachePolicy == policy) return;
|
||||
_cachePolicy = policy;
|
||||
notifyListeners();
|
||||
_persistAccountPref(
|
||||
prefCachePolicy,
|
||||
(p, key) => p.setString(key, policy.name),
|
||||
);
|
||||
_startCacheRefreshTimerIfNeeded();
|
||||
}
|
||||
|
||||
void setCacheIntervalMinutes(int minutes) {
|
||||
final clamped = minutes.clamp(1, 60);
|
||||
if (_cacheIntervalMinutes == clamped) return;
|
||||
_cacheIntervalMinutes = clamped;
|
||||
notifyListeners();
|
||||
_persistAccountPref(
|
||||
prefCacheIntervalMinutes,
|
||||
(p, key) => p.setInt(key, clamped),
|
||||
);
|
||||
_startCacheRefreshTimerIfNeeded();
|
||||
}
|
||||
|
||||
Future<bool> createFolder(String folderName) async {
|
||||
final service = session.service;
|
||||
if (service == null) return false;
|
||||
final success = await service.createFolder(_currentFolderPath, folderName);
|
||||
if (success) {
|
||||
await refreshData();
|
||||
}
|
||||
return success;
|
||||
}
|
||||
|
||||
/// Patches a favorite-toggle result into [items] in place (no refetch) -
|
||||
/// called by `ItemOperations.toggleItemFavorite` after a successful
|
||||
/// server call.
|
||||
void applyFavoriteToggle(NextcloudItem updated) {
|
||||
final index = _items.indexWhere((i) => i.id == updated.id);
|
||||
if (index != -1) _items[index] = updated;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
WidgetsBinding.instance.removeObserver(this);
|
||||
_cacheRefreshTimer?.cancel();
|
||||
super.dispose();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
import '../models/nextcloud_item.dart';
|
||||
|
||||
/// What `FilesView` needs from whatever is supplying the folder it's
|
||||
/// showing: the breadcrumb trail, the (already display-pref-filtered and
|
||||
/// sorted) items, loading/error state, and navigation. Implemented by
|
||||
/// [FilesController] (the server's folders) and [OfflineController] (the
|
||||
/// device-sync mirror of those same folders) so the Files tab and the
|
||||
/// Offline tab are literally the same view over two data sources.
|
||||
///
|
||||
/// Deliberately not a `Listenable` - `context.watch` subscribes to the
|
||||
/// concrete provider registered in `main()`, not to this interface, so the
|
||||
/// view picks the concrete controller and then treats it as a
|
||||
/// [FolderBrowser].
|
||||
abstract interface class FolderBrowser {
|
||||
List<String> get pathStack;
|
||||
String get currentFolderPath;
|
||||
|
||||
/// Items in [currentFolderPath] with the shared Files display prefs
|
||||
/// (hidden files, type filter, sort) already applied.
|
||||
List<NextcloudItem> get items;
|
||||
|
||||
bool get isLoading;
|
||||
String? get errorMessage;
|
||||
|
||||
Future<void> navigateToFolder(String path);
|
||||
Future<void> navigateToPathIndex(int index);
|
||||
Future<void> navigateUp();
|
||||
|
||||
/// Re-reads the current folder (pull-to-refresh / retry).
|
||||
Future<void> reload();
|
||||
}
|
||||
@@ -0,0 +1,358 @@
|
||||
import 'package:flutter/foundation.dart';
|
||||
import '../models/move_copy_result.dart';
|
||||
import '../models/nextcloud_file_version.dart';
|
||||
import '../models/nextcloud_item.dart';
|
||||
import '../models/nextcloud_share.dart';
|
||||
import '../models/nextcloud_sharee.dart';
|
||||
import 'favorites_controller.dart';
|
||||
import 'files_controller.dart';
|
||||
import 'photos_controller.dart';
|
||||
import 'session_controller.dart';
|
||||
|
||||
/// The one place that knows how an item mutation (delete/rename/move/copy/
|
||||
/// favorite-toggle/create-folder) ripples across Files/Photos/Favorites -
|
||||
/// those three each own their own item list, but a mutation triggered from
|
||||
/// *any* of them (see each call site in the views) needs to reconcile all
|
||||
/// three, since e.g. a delete removes an item Photos might also be
|
||||
/// showing. Deliberately holds direct references to the sibling
|
||||
/// controllers (constructed once in `main.dart`, after they already exist)
|
||||
/// rather than a generic event bus, so callers can still `await` a
|
||||
/// mutation and know every affected list has already been reconciled by
|
||||
/// the time it returns - exactly the same guarantee the single
|
||||
/// `ServerProvider` god object gave for free before this was split out.
|
||||
///
|
||||
/// Also home to the file-details sheet's per-item pass-throughs (shares/
|
||||
/// activity/versions) - stateless, no stored data, so they don't need a
|
||||
/// controller of their own.
|
||||
class ItemOperations {
|
||||
final SessionController session;
|
||||
final FilesController files;
|
||||
final PhotosController photos;
|
||||
final FavoritesController favorites;
|
||||
|
||||
const ItemOperations({
|
||||
required this.session,
|
||||
required this.files,
|
||||
required this.photos,
|
||||
required this.favorites,
|
||||
});
|
||||
|
||||
Future<bool> deleteItem(String itemPath) async {
|
||||
final service = session.service;
|
||||
if (service == null) return false;
|
||||
final success = await service.deleteItem(itemPath);
|
||||
if (success) {
|
||||
photos.applyDelete(itemPath);
|
||||
await files.refreshData();
|
||||
await favorites.syncIfLoaded();
|
||||
}
|
||||
return success;
|
||||
}
|
||||
|
||||
Future<bool> renameItem(NextcloudItem item, String newName) async {
|
||||
final service = session.service;
|
||||
if (service == null) return false;
|
||||
final success = await service.renameItem(item.path, newName);
|
||||
if (success) {
|
||||
await files.refreshData();
|
||||
await favorites.syncIfLoaded();
|
||||
}
|
||||
return success;
|
||||
}
|
||||
|
||||
/// True if [destFolderPath] is [folderPath] itself or one of its own
|
||||
/// descendants - moving/copying a folder into itself (or a subfolder of
|
||||
/// itself) is nonsensical and rejected client-side rather than left to
|
||||
/// the server to (maybe) reject.
|
||||
bool _isSelfOrDescendant(String destFolderPath, String folderPath) {
|
||||
final dest = destFolderPath.endsWith('/')
|
||||
? destFolderPath
|
||||
: '$destFolderPath/';
|
||||
final folder = folderPath.endsWith('/') ? folderPath : '$folderPath/';
|
||||
return dest == folder || dest.startsWith(folder);
|
||||
}
|
||||
|
||||
Future<MoveCopyResult> _moveOrCopyItems(
|
||||
List<NextcloudItem> items,
|
||||
String destFolderPath, {
|
||||
required bool copy,
|
||||
}) async {
|
||||
final service = session.service;
|
||||
if (service == null || items.isEmpty) return const MoveCopyResult();
|
||||
for (final item in items) {
|
||||
if (item.isFolder && _isSelfOrDescendant(destFolderPath, item.path)) {
|
||||
return const MoveCopyResult(
|
||||
blockedReason:
|
||||
"Can't move a folder into itself or one of its own subfolders",
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
var succeeded = 0;
|
||||
var failed = 0;
|
||||
final conflicts = <MoveCopyConflict>[];
|
||||
for (final item in items) {
|
||||
final status = copy
|
||||
? await service.copyItem(item.path, destFolderPath)
|
||||
: await service.moveItem(item.path, destFolderPath);
|
||||
if (status == 201 || status == 204) {
|
||||
succeeded++;
|
||||
} else if (status == 412) {
|
||||
conflicts.add(MoveCopyConflict(item));
|
||||
} else {
|
||||
failed++;
|
||||
}
|
||||
}
|
||||
if (succeeded > 0) {
|
||||
files.invalidateCache();
|
||||
await files.refreshData();
|
||||
await favorites.syncIfLoaded();
|
||||
}
|
||||
return MoveCopyResult(
|
||||
succeeded: succeeded,
|
||||
conflicts: conflicts,
|
||||
failed: failed,
|
||||
);
|
||||
}
|
||||
|
||||
/// Moves every item in [items] into [destFolderPath], keeping each
|
||||
/// item's own filename. Items that would collide with something already
|
||||
/// there come back in [MoveCopyResult.conflicts] rather than failing
|
||||
/// outright - resolve those with [resolveConflicts].
|
||||
Future<MoveCopyResult> moveItems(
|
||||
List<NextcloudItem> items,
|
||||
String destFolderPath,
|
||||
) {
|
||||
return _moveOrCopyItems(items, destFolderPath, copy: false);
|
||||
}
|
||||
|
||||
/// Same as [moveItems] but duplicates rather than relocates.
|
||||
Future<MoveCopyResult> copyItems(
|
||||
List<NextcloudItem> items,
|
||||
String destFolderPath,
|
||||
) {
|
||||
return _moveOrCopyItems(items, destFolderPath, copy: true);
|
||||
}
|
||||
|
||||
/// Finds the first `name (n).ext` not already in [existing] - `existing`
|
||||
/// is mutated as names are claimed, so a batch of "keep both" resolutions
|
||||
/// never picks the same generated name twice.
|
||||
String _nextAvailableName(String name, Set<String> existing) {
|
||||
if (!existing.contains(name)) return name;
|
||||
final dotIndex = name.lastIndexOf('.');
|
||||
final hasExtension = dotIndex > 0 && dotIndex < name.length - 1;
|
||||
final base = hasExtension ? name.substring(0, dotIndex) : name;
|
||||
final ext = hasExtension ? name.substring(dotIndex) : '';
|
||||
var n = 2;
|
||||
while (existing.contains('$base ($n)$ext')) {
|
||||
n++;
|
||||
}
|
||||
return '$base ($n)$ext';
|
||||
}
|
||||
|
||||
/// Resolves a previous [moveItems]/[copyItems] call's conflicts per
|
||||
/// [choices] (keyed by `item.id`): overwrite the existing item, keep
|
||||
/// both (renamed against a fresh listing of [destFolderPath] so two
|
||||
/// "keep both" picks in the same batch can't collide with each other),
|
||||
/// or skip (left untouched at the source).
|
||||
Future<MoveCopyResult> resolveConflicts(
|
||||
List<MoveCopyConflict> conflicts,
|
||||
String destFolderPath, {
|
||||
required bool copy,
|
||||
required Map<String, ConflictChoice> choices,
|
||||
}) async {
|
||||
final service = session.service;
|
||||
if (service == null || conflicts.isEmpty) return const MoveCopyResult();
|
||||
|
||||
final needsKeepBoth = conflicts.any(
|
||||
(c) => choices[c.item.id] == ConflictChoice.keepBoth,
|
||||
);
|
||||
final existingNames = needsKeepBoth
|
||||
? (await files.fetchFolderListing(destFolderPath))
|
||||
.map((i) => i.name)
|
||||
.toSet()
|
||||
: <String>{};
|
||||
|
||||
var succeeded = 0;
|
||||
var failed = 0;
|
||||
for (final conflict in conflicts) {
|
||||
final choice = choices[conflict.item.id] ?? ConflictChoice.skip;
|
||||
if (choice == ConflictChoice.skip) continue;
|
||||
|
||||
final int status;
|
||||
if (choice == ConflictChoice.overwrite) {
|
||||
status = copy
|
||||
? await service.copyItem(
|
||||
conflict.item.path,
|
||||
destFolderPath,
|
||||
overwrite: true,
|
||||
)
|
||||
: await service.moveItem(
|
||||
conflict.item.path,
|
||||
destFolderPath,
|
||||
overwrite: true,
|
||||
);
|
||||
} else {
|
||||
final newName = _nextAvailableName(conflict.item.name, existingNames);
|
||||
existingNames.add(newName);
|
||||
status = copy
|
||||
? await service.copyItem(
|
||||
conflict.item.path,
|
||||
destFolderPath,
|
||||
newName: newName,
|
||||
)
|
||||
: await service.moveItem(
|
||||
conflict.item.path,
|
||||
destFolderPath,
|
||||
newName: newName,
|
||||
);
|
||||
}
|
||||
if (status == 201 || status == 204) {
|
||||
succeeded++;
|
||||
} else {
|
||||
failed++;
|
||||
}
|
||||
}
|
||||
if (succeeded > 0) {
|
||||
files.invalidateCache();
|
||||
await files.refreshData();
|
||||
await favorites.syncIfLoaded();
|
||||
}
|
||||
return MoveCopyResult(succeeded: succeeded, failed: failed);
|
||||
}
|
||||
|
||||
Future<void> toggleItemFavorite(NextcloudItem item) async {
|
||||
final service = session.service;
|
||||
if (service == null) return;
|
||||
final success = await service.toggleFavorite(item.path, item.isFavorite);
|
||||
if (success) {
|
||||
final updated = item.copyWith(isFavorite: !item.isFavorite);
|
||||
files.applyFavoriteToggle(updated);
|
||||
photos.applyFavoriteToggle(updated);
|
||||
favorites.applyFavoriteToggle(updated);
|
||||
}
|
||||
}
|
||||
|
||||
/// Creates a public link share for [item] and returns its URL, or null on
|
||||
/// failure (server error, unsupported item, etc).
|
||||
Future<String?> createShareLink(NextcloudItem item) async {
|
||||
final service = session.service;
|
||||
if (service == null) return null;
|
||||
try {
|
||||
return await service.createPublicShareLink(item.path);
|
||||
} catch (e) {
|
||||
debugPrint('[ItemOperations] createShareLink failed: $e');
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
// --- Details sheet: per-item sharing/activity/versions ---
|
||||
//
|
||||
// Thin pass-throughs (no stored state) - the data here is transient and
|
||||
// scoped to whichever item's Details sheet happens to be open, so it
|
||||
// lives in that sheet's own local widget state rather than a controller.
|
||||
|
||||
Future<List<NextcloudShare>> fetchItemShares(NextcloudItem item) async {
|
||||
final service = session.service;
|
||||
if (service == null) return [];
|
||||
try {
|
||||
return await service.fetchSharesForPath(item.path);
|
||||
} catch (e) {
|
||||
debugPrint('[ItemOperations] fetchItemShares failed: $e');
|
||||
return [];
|
||||
}
|
||||
}
|
||||
|
||||
Future<List<NextcloudShare>> fetchInheritedShares(NextcloudItem item) async {
|
||||
final service = session.service;
|
||||
if (service == null) return [];
|
||||
return service.fetchInheritedShares(item.path);
|
||||
}
|
||||
|
||||
Future<List<NextcloudSharee>> searchSharees(String query) async {
|
||||
final service = session.service;
|
||||
if (service == null) return [];
|
||||
try {
|
||||
return await service.searchSharees(query);
|
||||
} catch (e) {
|
||||
debugPrint('[ItemOperations] searchSharees failed: $e');
|
||||
return [];
|
||||
}
|
||||
}
|
||||
|
||||
Future<NextcloudShare?> createShare({
|
||||
required String path,
|
||||
required int shareType,
|
||||
String? shareWith,
|
||||
String? password,
|
||||
DateTime? expireDate,
|
||||
}) async {
|
||||
final service = session.service;
|
||||
if (service == null) return null;
|
||||
try {
|
||||
return await service.createShare(
|
||||
path: path,
|
||||
shareType: shareType,
|
||||
shareWith: shareWith,
|
||||
password: password,
|
||||
expireDate: expireDate,
|
||||
);
|
||||
} catch (e) {
|
||||
debugPrint('[ItemOperations] createShare failed: $e');
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/// Deletes a share (from the file-details/Share sheet, not the Shares
|
||||
/// tab itself - see `SharesController.deleteShare` for that one, which
|
||||
/// additionally patches the tab's own list).
|
||||
Future<bool> deleteShare(NextcloudShare share) async {
|
||||
final service = session.service;
|
||||
if (service == null) return false;
|
||||
return service.deleteShare(share.id);
|
||||
}
|
||||
|
||||
Future<List<NextcloudActivity>> fetchFileActivity(NextcloudItem item) async {
|
||||
final service = session.service;
|
||||
if (service == null) return [];
|
||||
return service.fetchFileActivity(item.id);
|
||||
}
|
||||
|
||||
Future<List<NextcloudFileVersion>> fetchFileVersions(
|
||||
NextcloudItem item,
|
||||
) async {
|
||||
final service = session.service;
|
||||
if (service == null) return [];
|
||||
return service.fetchFileVersions(item.id);
|
||||
}
|
||||
|
||||
Future<bool> restoreFileVersion(
|
||||
NextcloudItem item,
|
||||
String versionLabel,
|
||||
) async {
|
||||
final service = session.service;
|
||||
if (service == null) return false;
|
||||
try {
|
||||
return await service.restoreFileVersion(item.id, versionLabel);
|
||||
} catch (e) {
|
||||
debugPrint('[ItemOperations] restoreFileVersion failed: $e');
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
Future<bool> downloadVersion(
|
||||
NextcloudItem item,
|
||||
String versionLabel,
|
||||
String savePath,
|
||||
) async {
|
||||
final service = session.service;
|
||||
if (service == null) return false;
|
||||
try {
|
||||
await service.downloadVersionToFile(item.id, versionLabel, savePath);
|
||||
return true;
|
||||
} catch (e) {
|
||||
debugPrint('[ItemOperations] downloadVersion failed: $e');
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,246 @@
|
||||
import 'dart:async';
|
||||
import 'dart:io';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:path/path.dart' as p;
|
||||
import 'package:path_provider/path_provider.dart';
|
||||
import '../models/nextcloud_item.dart';
|
||||
import '../services/sync_service.dart';
|
||||
import 'files_controller.dart';
|
||||
import 'folder_browser.dart';
|
||||
import 'session_controller.dart';
|
||||
|
||||
/// The Offline tab's data source: `FilesView` (the same view as the Files
|
||||
/// tab) over whatever device-sync has actually mirrored to local storage,
|
||||
/// i.e. the Files tab's folders filtered down to what's available offline -
|
||||
/// read straight off
|
||||
/// disk, no server round-trip, since the whole point is browsing what's
|
||||
/// available without a connection. Walks
|
||||
/// `<externalFilesDir>/sync/<accountId>/...` directly (mirrors
|
||||
/// `SyncEngine.kt#syncRoot`'s layout exactly, same technique
|
||||
/// `SyncStatusController.localSyncedFilePath` already relies on) rather
|
||||
/// than round-tripping through a MethodChannel. Listens for
|
||||
/// [SessionController.addAccountReadyListener] rather than
|
||||
/// `addAccountActivatedListener` - this controller's own work is entirely
|
||||
/// local, so it's safe to run even on a provisional/offline login (see
|
||||
/// that method's doc comment).
|
||||
///
|
||||
/// Display controls (grid/list, sort, hidden files, files/folders filter)
|
||||
/// aren't kept here - [items] runs the listing through the Files tab's own
|
||||
/// [FilesController] prefs so the two tabs always agree.
|
||||
class OfflineController extends ChangeNotifier
|
||||
with WidgetsBindingObserver
|
||||
implements FolderBrowser {
|
||||
final SessionController session;
|
||||
final FilesController files;
|
||||
|
||||
List<String> _pathStack = const ['/'];
|
||||
List<NextcloudItem> _items = [];
|
||||
bool _isLoading = false;
|
||||
String? _errorMessage;
|
||||
bool _wasSyncing = false;
|
||||
// Resolved once in _load - lets [localFileFor] stay synchronous so it can
|
||||
// be called straight from a widget's build.
|
||||
String? _syncBasePath;
|
||||
StreamSubscription<SyncStatusSnapshot>? _statusSub;
|
||||
|
||||
OfflineController(this.session, this.files) {
|
||||
WidgetsBinding.instance.addObserver(this);
|
||||
session.addAccountClearedListener(_onAccountCleared);
|
||||
session.addAccountReadyListener(_onAccountActivated);
|
||||
// Refreshes automatically once a sync pass finishes, so newly
|
||||
// downloaded files show up here without a manual pull-to-refresh.
|
||||
_statusSub = SyncService.statusStream.listen(_onStatusSnapshot);
|
||||
}
|
||||
|
||||
@override
|
||||
List<String> get pathStack => _pathStack;
|
||||
@override
|
||||
String get currentFolderPath => _pathStack.last;
|
||||
@override
|
||||
List<NextcloudItem> get items => files.applyFilesDisplayPrefs(
|
||||
_items,
|
||||
folderPath: currentFolderPath,
|
||||
// The local mirror has no cloud/external distinction to filter on.
|
||||
applyStorageScope: false,
|
||||
);
|
||||
// Only "loading" while there's nothing to show yet - a reload over an
|
||||
// already-listed folder (e.g. the automatic one after a sync pass
|
||||
// finishes) swaps the list in place instead of flashing a spinner.
|
||||
@override
|
||||
bool get isLoading => _isLoading && _items.isEmpty;
|
||||
@override
|
||||
String? get errorMessage => _errorMessage;
|
||||
|
||||
void _onAccountCleared() {
|
||||
_pathStack = const ['/'];
|
||||
_items = [];
|
||||
_isLoading = false;
|
||||
_errorMessage = null;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
void _onAccountActivated() {
|
||||
unawaited(_load());
|
||||
}
|
||||
|
||||
/// A background sync (which can run while the app is closed or paused)
|
||||
/// may have added or removed files since this list was last read - re-read
|
||||
/// the folder whenever the app comes back to the foreground.
|
||||
@override
|
||||
void didChangeAppLifecycleState(AppLifecycleState state) {
|
||||
if (state == AppLifecycleState.resumed) unawaited(_load());
|
||||
}
|
||||
|
||||
void _onStatusSnapshot(SyncStatusSnapshot snapshot) {
|
||||
if (_wasSyncing && !snapshot.syncing) {
|
||||
unawaited(_load());
|
||||
}
|
||||
_wasSyncing = snapshot.syncing;
|
||||
}
|
||||
|
||||
/// Reloads the currently browsed folder - used by pull-to-refresh and as
|
||||
/// the account-activation entry point.
|
||||
@override
|
||||
Future<void> reload() => _load();
|
||||
|
||||
@override
|
||||
Future<void> navigateToFolder(String path) async {
|
||||
_pathStack = [..._pathStack, path];
|
||||
await _load();
|
||||
}
|
||||
|
||||
@override
|
||||
Future<void> navigateToPathIndex(int index) async {
|
||||
if (index < 0 || index >= _pathStack.length - 1) return;
|
||||
_pathStack = _pathStack.sublist(0, index + 1);
|
||||
await _load();
|
||||
}
|
||||
|
||||
@override
|
||||
Future<void> navigateUp() async {
|
||||
if (_pathStack.length <= 1) return;
|
||||
_pathStack = _pathStack.sublist(0, _pathStack.length - 1);
|
||||
await _load();
|
||||
}
|
||||
|
||||
Future<void> _load() async {
|
||||
final accountId = session.activeAccountId;
|
||||
if (accountId == null) return;
|
||||
|
||||
_isLoading = true;
|
||||
_errorMessage = null;
|
||||
notifyListeners();
|
||||
|
||||
try {
|
||||
_syncBasePath ??= (await getExternalStorageDirectory())?.path;
|
||||
// A sync can delete the very folder being browsed (deleted on the
|
||||
// server) - step out to the nearest ancestor that still exists rather
|
||||
// than showing a phantom empty folder.
|
||||
final base = _syncBasePath;
|
||||
if (base != null) {
|
||||
while (_pathStack.length > 1 &&
|
||||
!Directory(
|
||||
p.join(
|
||||
base,
|
||||
'sync',
|
||||
accountId,
|
||||
currentFolderPath.replaceFirst('/', ''),
|
||||
),
|
||||
).existsSync()) {
|
||||
_pathStack = _pathStack.sublist(0, _pathStack.length - 1);
|
||||
}
|
||||
}
|
||||
_items = await _listFolder(accountId, currentFolderPath);
|
||||
} catch (e) {
|
||||
debugPrint('[OfflineController] Error listing local files: $e');
|
||||
_errorMessage = e.toString().replaceAll('Exception: ', '');
|
||||
} finally {
|
||||
_isLoading = false;
|
||||
notifyListeners();
|
||||
}
|
||||
}
|
||||
|
||||
/// The absolute local path for [item] - a pure function of its remote-
|
||||
/// style `path` (same `<accountId>/<relPath>` layout `SyncEngine.kt#
|
||||
/// syncRoot` uses). Deliberately doesn't re-verify [item] is "in sync
|
||||
/// scope" the way `SyncStatusController.localSyncedFilePath` does for
|
||||
/// arbitrary items from elsewhere in the app - every item this
|
||||
/// controller ever hands out already came from listing this exact
|
||||
/// directory tree, so it's definitionally already local; re-checking
|
||||
/// scope here was the actual bug behind a file the Offline tab had just
|
||||
/// listed reporting itself as "no longer available".
|
||||
/// Synchronous counterpart to [localPathFor] for building thumbnails -
|
||||
/// null until the first [_load] has resolved the storage directory. Doesn't
|
||||
/// check the file exists; the image widget's own error fallback covers a
|
||||
/// missing one.
|
||||
File? localFileFor(NextcloudItem item) {
|
||||
final accountId = session.activeAccountId;
|
||||
final base = _syncBasePath;
|
||||
if (accountId == null || base == null) return null;
|
||||
final relPath = item.path.startsWith('/')
|
||||
? item.path.substring(1)
|
||||
: item.path;
|
||||
return File(p.join(base, 'sync', accountId, relPath));
|
||||
}
|
||||
|
||||
Future<String?> localPathFor(NextcloudItem item) async {
|
||||
final accountId = session.activeAccountId;
|
||||
if (accountId == null) return null;
|
||||
final base = await getExternalStorageDirectory();
|
||||
if (base == null) return null;
|
||||
final relPath = item.path.startsWith('/')
|
||||
? item.path.substring(1)
|
||||
: item.path;
|
||||
final file = File(p.join(base.path, 'sync', accountId, relPath));
|
||||
return file.existsSync() ? file.path : null;
|
||||
}
|
||||
|
||||
static Future<List<NextcloudItem>> _listFolder(
|
||||
String accountId,
|
||||
String folderPath,
|
||||
) async {
|
||||
final base = await getExternalStorageDirectory();
|
||||
if (base == null) return [];
|
||||
final relFolder = folderPath == '/' ? '' : folderPath.replaceFirst('/', '');
|
||||
final dir = Directory(p.join(base.path, 'sync', accountId, relFolder));
|
||||
if (!dir.existsSync()) return [];
|
||||
|
||||
final items = <NextcloudItem>[];
|
||||
await for (final entity in dir.list(followLinks: false)) {
|
||||
final name = p.basename(entity.path);
|
||||
final remotePath = folderPath == '/' ? '/$name' : '$folderPath/$name';
|
||||
if (entity is Directory) {
|
||||
items.add(
|
||||
NextcloudItem(
|
||||
id: remotePath,
|
||||
name: name,
|
||||
path: remotePath,
|
||||
type: NextcloudItemType.folder,
|
||||
size: 0,
|
||||
lastModified: (await entity.stat()).modified,
|
||||
),
|
||||
);
|
||||
} else if (entity is File) {
|
||||
final stat = await entity.stat();
|
||||
items.add(
|
||||
NextcloudItem(
|
||||
id: remotePath,
|
||||
name: name,
|
||||
path: remotePath,
|
||||
type: NextcloudItem.deduceType(remotePath, false, null),
|
||||
size: stat.size,
|
||||
lastModified: stat.modified,
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
return items;
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
WidgetsBinding.instance.removeObserver(this);
|
||||
_statusSub?.cancel();
|
||||
super.dispose();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,199 @@
|
||||
import 'dart:async';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:shared_preferences/shared_preferences.dart';
|
||||
import '../models/nextcloud_item.dart';
|
||||
import 'files_controller.dart';
|
||||
import 'session_controller.dart';
|
||||
|
||||
/// The Photos tab: every image/video across the whole account (not just
|
||||
/// the currently browsed folder - see [fetchAllMedia]). Depends on
|
||||
/// [FilesController] only for the shared [StorageScope] toggle and
|
||||
/// [FilesController.applyCommonFilters] - Photos' own favorites-only/
|
||||
/// hidden toggles are independent of Files', but the storage-scope split
|
||||
/// (cloud vs external) is one shared setting across every tab.
|
||||
class PhotosController extends ChangeNotifier {
|
||||
final SessionController session;
|
||||
final FilesController files;
|
||||
|
||||
static const _prefShowFavoritesOnlyPhotos = 'ui_show_favorites_only_photos';
|
||||
static const _prefShowHiddenPhotos = 'ui_show_hidden_photos';
|
||||
static const _prefSortField = 'ui_sort_field';
|
||||
static const _prefSortAscending = 'ui_sort_ascending';
|
||||
|
||||
List<NextcloudItem> _allMedia = [];
|
||||
bool _isLoading = false;
|
||||
String? _errorMessage;
|
||||
|
||||
bool _showFavoritesOnly = false;
|
||||
bool _showHidden = false;
|
||||
FileSortField _sortField = FileSortField.name;
|
||||
bool _sortAscending = true;
|
||||
|
||||
PhotosController(this.session, this.files) {
|
||||
session.addAccountClearedListener(_onAccountCleared);
|
||||
session.addAccountActivatedListener(_onAccountActivated);
|
||||
}
|
||||
|
||||
bool get isLoading => _isLoading;
|
||||
String? get errorMessage => _errorMessage;
|
||||
bool get showFavoritesOnly => _showFavoritesOnly;
|
||||
bool get showHidden => _showHidden;
|
||||
FileSortField get sortField => _sortField;
|
||||
bool get sortAscending => _sortAscending;
|
||||
|
||||
/// All images/videos across the whole account (not just the currently
|
||||
/// browsed folder) — see [fetchAllMedia].
|
||||
List<NextcloudItem> get items {
|
||||
final media = _allMedia.where((i) => i.isMedia).toList();
|
||||
final filtered = files.applyCommonFilters(
|
||||
media,
|
||||
showFavoritesOnly: _showFavoritesOnly,
|
||||
showHidden: _showHidden,
|
||||
)..sort((a, b) => _compare(a, b));
|
||||
return _sortAscending ? filtered : filtered.reversed.toList();
|
||||
}
|
||||
|
||||
int _compare(NextcloudItem a, NextcloudItem b) {
|
||||
switch (_sortField) {
|
||||
case FileSortField.name:
|
||||
return a.name.toLowerCase().compareTo(b.name.toLowerCase());
|
||||
case FileSortField.dateCreated:
|
||||
return a.dateCreated.compareTo(b.dateCreated);
|
||||
case FileSortField.dateModified:
|
||||
return a.lastModified.compareTo(b.lastModified);
|
||||
case FileSortField.size:
|
||||
return a.size.compareTo(b.size);
|
||||
}
|
||||
}
|
||||
|
||||
void _onAccountCleared() {
|
||||
_allMedia = [];
|
||||
_isLoading = false;
|
||||
_errorMessage = null;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
Future<void> _onAccountActivated() async {
|
||||
final id = session.activeAccountId;
|
||||
if (id != null) {
|
||||
// Wrapped so a single bad/mistyped stored pref value can't
|
||||
// silently skip fetchAllMedia() below and leave Photos permanently
|
||||
// empty on this activation with no error surfaced anywhere - see
|
||||
// FilesController._onAccountActivated's identical guard for the
|
||||
// real incident this mirrors.
|
||||
try {
|
||||
final prefs = await session.prefsFuture;
|
||||
String k(String base) => session.accountStore.accountPrefKey(id, base);
|
||||
_showFavoritesOnly =
|
||||
prefs.getBool(k(_prefShowFavoritesOnlyPhotos)) ?? false;
|
||||
_showHidden = prefs.getBool(k(_prefShowHiddenPhotos)) ?? false;
|
||||
final sortFieldName = prefs.getString(k(_prefSortField));
|
||||
_sortField = FileSortField.values.firstWhere(
|
||||
(f) => f.name == sortFieldName,
|
||||
orElse: () => FileSortField.name,
|
||||
);
|
||||
_sortAscending = prefs.getBool(k(_prefSortAscending)) ?? true;
|
||||
notifyListeners();
|
||||
} catch (e) {
|
||||
debugPrint('[PhotosController] Account-activation prefs restore failed: $e');
|
||||
}
|
||||
}
|
||||
unawaited(fetchAllMedia());
|
||||
}
|
||||
|
||||
/// Loads every image/video across the whole account for the Photos tab.
|
||||
Future<void> fetchAllMedia() async {
|
||||
final service = session.service;
|
||||
if (!session.isLoggedIn || service == null) return;
|
||||
final gen = session.sessionGeneration;
|
||||
|
||||
_isLoading = true;
|
||||
_errorMessage = null;
|
||||
notifyListeners();
|
||||
|
||||
try {
|
||||
final media = await service.fetchAllMedia();
|
||||
if (gen != session.sessionGeneration) return;
|
||||
_allMedia = media;
|
||||
debugPrint('[PhotosController] Loaded ${_allMedia.length} media items');
|
||||
} catch (e) {
|
||||
if (gen != session.sessionGeneration) return;
|
||||
debugPrint('[PhotosController] Error fetching all media: $e');
|
||||
_errorMessage = e.toString().replaceAll('Exception: ', '');
|
||||
} finally {
|
||||
if (gen == session.sessionGeneration) {
|
||||
_isLoading = false;
|
||||
notifyListeners();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void _persistAccountPref(
|
||||
String baseKey,
|
||||
void Function(SharedPreferences prefs, String key) write,
|
||||
) {
|
||||
final id = session.activeAccountId;
|
||||
if (id == null) return;
|
||||
session.prefsFuture.then(
|
||||
(p) => write(p, session.accountStore.accountPrefKey(id, baseKey)),
|
||||
);
|
||||
}
|
||||
|
||||
void toggleFavoritesFilter() {
|
||||
_showFavoritesOnly = !_showFavoritesOnly;
|
||||
notifyListeners();
|
||||
_persistAccountPref(
|
||||
_prefShowFavoritesOnlyPhotos,
|
||||
(p, key) => p.setBool(key, _showFavoritesOnly),
|
||||
);
|
||||
}
|
||||
|
||||
Future<void> toggleShowHidden() async {
|
||||
if (!_showHidden) {
|
||||
if (!await session.passGate(
|
||||
session.lockHiddenFiles,
|
||||
'Unlock to show hidden files',
|
||||
)) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
_showHidden = !_showHidden;
|
||||
notifyListeners();
|
||||
_persistAccountPref(
|
||||
_prefShowHiddenPhotos,
|
||||
(p, key) => p.setBool(key, _showHidden),
|
||||
);
|
||||
}
|
||||
|
||||
void setSortField(FileSortField field) {
|
||||
if (_sortField == field) return;
|
||||
_sortField = field;
|
||||
notifyListeners();
|
||||
_persistAccountPref(_prefSortField, (p, key) => p.setString(key, field.name));
|
||||
}
|
||||
|
||||
void toggleSortOrder() {
|
||||
_sortAscending = !_sortAscending;
|
||||
notifyListeners();
|
||||
_persistAccountPref(
|
||||
_prefSortAscending,
|
||||
(p, key) => p.setBool(key, _sortAscending),
|
||||
);
|
||||
}
|
||||
|
||||
/// Removes an item by path (a delete elsewhere in the app) - called by
|
||||
/// `ItemOperations.deleteItem` after a successful server call.
|
||||
void applyDelete(String path) {
|
||||
_allMedia = _allMedia.where((i) => i.path != path).toList();
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
/// Patches a favorite-toggle result into [items]' source list in place -
|
||||
/// called by `ItemOperations.toggleItemFavorite` after a successful
|
||||
/// server call.
|
||||
void applyFavoriteToggle(NextcloudItem updated) {
|
||||
final index = _allMedia.indexWhere((i) => i.id == updated.id);
|
||||
if (index != -1) _allMedia[index] = updated;
|
||||
notifyListeners();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,95 @@
|
||||
import 'dart:io';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:path/path.dart' as p;
|
||||
import 'package:path_provider/path_provider.dart';
|
||||
import '../models/nextcloud_item.dart';
|
||||
import '../models/pick_request.dart';
|
||||
import '../services/pick_intent_service.dart';
|
||||
import 'session_controller.dart';
|
||||
|
||||
/// State for Noo acting as *another* app's GET_CONTENT picker (see
|
||||
/// `PickIntentService`/`MainActivity.kt`) - non-null [pickRequest] while
|
||||
/// active, set at startup/onNewPickRequest in `MainShellView`, cleared
|
||||
/// once the pick is confirmed or cancelled. Cross-cutting (both Files and
|
||||
/// Photos need to know when picking mode is active and route taps through
|
||||
/// [confirmPick] instead of their normal open/select behavior), so this is
|
||||
/// its own small controller rather than living on any one tab's.
|
||||
class PickController extends ChangeNotifier {
|
||||
final SessionController session;
|
||||
|
||||
PickController(this.session);
|
||||
|
||||
PickRequest? _pickRequest;
|
||||
bool _isDownloadingForPick = false;
|
||||
|
||||
PickRequest? get pickRequest => _pickRequest;
|
||||
bool get isPicking => _pickRequest != null;
|
||||
bool get isDownloadingForPick => _isDownloadingForPick;
|
||||
|
||||
/// Whether [item] can be handed back to the app that's currently picking
|
||||
/// - always true for folders (still browsable), mime-filtered for files.
|
||||
bool itemMatchesPickFilter(NextcloudItem item) {
|
||||
if (item.isFolder) return true;
|
||||
final request = _pickRequest;
|
||||
return request == null || request.matches(item.mimeType);
|
||||
}
|
||||
|
||||
/// Called once (from MainShellView) as soon as a pick request is known -
|
||||
/// either the cold-start request or one that arrived via onNewPickRequest
|
||||
/// while already running.
|
||||
void setPickRequest(PickRequest request) {
|
||||
_pickRequest = request;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
/// Downloads each selected item to a scratch cache folder, then hands the
|
||||
/// local paths back to the caller through PickIntentService, which closes
|
||||
/// the picker Activity on success. Left in [pickRequest] (i.e. picking
|
||||
/// mode stays visually active) if the download fails partway, so the user
|
||||
/// can see the error and retry rather than the screen finishing under
|
||||
/// them with nothing returned to the caller.
|
||||
Future<bool> confirmPick(List<NextcloudItem> items) async {
|
||||
final service = session.service;
|
||||
if (_pickRequest == null || service == null || items.isEmpty) {
|
||||
return false;
|
||||
}
|
||||
_isDownloadingForPick = true;
|
||||
notifyListeners();
|
||||
try {
|
||||
final tempDir = await getTemporaryDirectory();
|
||||
final pickDir = Directory(p.join(tempDir.path, 'picker'));
|
||||
final localPaths = <String>[];
|
||||
final mimeTypes = <String>[];
|
||||
for (final item in items) {
|
||||
// Each item gets its own subfolder (keyed by id, not smashed into
|
||||
// the filename) so two different items can share a plain file
|
||||
// name without colliding, while the file on disk - and therefore
|
||||
// the display name the caller sees via the content:// Uri
|
||||
// MainActivity.kt hands back - stays exactly `item.name`.
|
||||
final itemDir = Directory(p.join(pickDir.path, item.id));
|
||||
await itemDir.create(recursive: true);
|
||||
final localPath = p.join(itemDir.path, item.name);
|
||||
await service.downloadToFile(item.path, localPath);
|
||||
localPaths.add(localPath);
|
||||
mimeTypes.add(item.mimeType ?? 'application/octet-stream');
|
||||
}
|
||||
await PickIntentService.finishPick(localPaths, mimeTypes);
|
||||
_pickRequest = null;
|
||||
return true;
|
||||
} catch (_) {
|
||||
return false;
|
||||
} finally {
|
||||
_isDownloadingForPick = false;
|
||||
notifyListeners();
|
||||
}
|
||||
}
|
||||
|
||||
/// Backs out of picking mode entirely, telling the caller nothing was
|
||||
/// picked and closing the picker Activity.
|
||||
Future<void> cancelPick() async {
|
||||
if (_pickRequest == null) return;
|
||||
_pickRequest = null;
|
||||
notifyListeners();
|
||||
await PickIntentService.cancelPick();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,59 @@
|
||||
import 'dart:async';
|
||||
import 'package:flutter/material.dart';
|
||||
import '../models/nextcloud_item.dart';
|
||||
import 'session_controller.dart';
|
||||
|
||||
/// The Recent Files tab. Kept separate from Files' own loading/error
|
||||
/// state, likewise.
|
||||
class RecentController extends ChangeNotifier {
|
||||
final SessionController session;
|
||||
|
||||
List<NextcloudItem> _items = [];
|
||||
bool _isLoading = false;
|
||||
String? _errorMessage;
|
||||
|
||||
RecentController(this.session) {
|
||||
session.addAccountClearedListener(_onAccountCleared);
|
||||
session.addAccountActivatedListener(_onAccountActivated);
|
||||
}
|
||||
|
||||
List<NextcloudItem> get items => _items;
|
||||
bool get isLoading => _isLoading;
|
||||
String? get errorMessage => _errorMessage;
|
||||
|
||||
void _onAccountCleared() {
|
||||
_items = [];
|
||||
_isLoading = false;
|
||||
_errorMessage = null;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
void _onAccountActivated() {
|
||||
unawaited(fetchAll());
|
||||
}
|
||||
|
||||
Future<void> fetchAll() async {
|
||||
final service = session.service;
|
||||
if (!session.isLoggedIn || service == null) return;
|
||||
final gen = session.sessionGeneration;
|
||||
|
||||
_isLoading = true;
|
||||
_errorMessage = null;
|
||||
notifyListeners();
|
||||
|
||||
try {
|
||||
final recent = await service.fetchRecentFiles();
|
||||
if (gen != session.sessionGeneration) return;
|
||||
_items = recent;
|
||||
} catch (e) {
|
||||
if (gen != session.sessionGeneration) return;
|
||||
debugPrint('[RecentController] Error fetching recent files: $e');
|
||||
_errorMessage = e.toString().replaceAll('Exception: ', '');
|
||||
} finally {
|
||||
if (gen == session.sessionGeneration) {
|
||||
_isLoading = false;
|
||||
notifyListeners();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,689 @@
|
||||
import 'dart:async';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:http/http.dart' as http;
|
||||
import 'package:shared_preferences/shared_preferences.dart';
|
||||
import '../models/saved_account.dart';
|
||||
import '../services/account_store.dart';
|
||||
import '../services/app_lock_service.dart';
|
||||
import '../services/login_flow_service.dart';
|
||||
import '../services/nextcloud_service.dart';
|
||||
import '../services/sync_service.dart';
|
||||
import 'connectivity_controller.dart';
|
||||
|
||||
enum LoginFlowStatus { idle, initiating, awaitingBrowser, error }
|
||||
|
||||
/// Owns everything about *which* account is live and whether it's actually
|
||||
/// authenticated: the saved-accounts list, the active account, Login Flow
|
||||
/// v2, the live [NextcloudService] instance, the session-generation guard
|
||||
/// every other controller's fetches check against, and app lock. Doesn't
|
||||
/// hold a single byte of any tab's *content* - that's what
|
||||
/// [FilesController]/`PhotosController`/etc. own, each reacting to this
|
||||
/// controller's account-activated/cleared signals (below) rather than this
|
||||
/// controller reaching into them directly, since this is constructed
|
||||
/// before them (they depend on it, not the other way around).
|
||||
///
|
||||
/// Split out of the former single `ServerProvider` god object - see
|
||||
/// `.claude/context/architecture.md`'s "State management" section for the
|
||||
/// full rationale.
|
||||
class SessionController extends ChangeNotifier with WidgetsBindingObserver {
|
||||
final ConnectivityController connectivity;
|
||||
final Future<SharedPreferences> prefsFuture =
|
||||
SharedPreferences.getInstance();
|
||||
final AccountStore accountStore = AccountStore();
|
||||
|
||||
// True from the moment a saved session is restored (or a network
|
||||
// failure keeps it alive - see `_applyCredentialsForAccount`) without
|
||||
// ever having actually reached the server, until a real
|
||||
// `testConnection()` succeeds. Network-fetching controllers have no
|
||||
// reason to check this themselves - they only ever hear about account
|
||||
// activation via [addAccountActivatedListener], which simply doesn't
|
||||
// fire while this is true (see [addAccountReadyListener] for the
|
||||
// signal that *does* fire either way).
|
||||
bool _isProvisionalLogin = false;
|
||||
|
||||
String _serverUrl = '';
|
||||
String _username = '';
|
||||
String _password = '';
|
||||
bool _isLoggedIn = false;
|
||||
bool _isLoading = false;
|
||||
bool _isRestoringSession = true;
|
||||
String? _errorMessage;
|
||||
|
||||
LoginFlowStatus _loginFlowStatus = LoginFlowStatus.idle;
|
||||
Uri? _pendingLoginUrl;
|
||||
Timer? _pollTimer;
|
||||
Timer? _pollTimeoutTimer;
|
||||
bool _addAccountFlowActive = false;
|
||||
|
||||
NextcloudService? _service;
|
||||
|
||||
List<SavedAccount> _accounts = [];
|
||||
String? _activeAccountId;
|
||||
// Bumped at the start of every account switch/removal/activation so an
|
||||
// in-flight fetch from the account being left can recognize it's stale
|
||||
// (by comparing against the generation it captured at its own start) and
|
||||
// discard its result instead of writing it into the now-active account's
|
||||
// state. Every other controller's fetch methods check this too.
|
||||
int _sessionGeneration = 0;
|
||||
|
||||
bool _loginLockEnabled = false;
|
||||
bool _lockAccountSwitching = false;
|
||||
bool _lockHiddenFiles = false;
|
||||
// Transient (never persisted) - starts locked whenever the app process
|
||||
// starts, and re-locks on every backgrounding if a lock is configured;
|
||||
// see didChangeAppLifecycleState.
|
||||
bool _isUnlocked = false;
|
||||
|
||||
static const _prefLoginLockEnabled = 'ui_login_lock_enabled';
|
||||
static const _prefLockAccountSwitching = 'ui_lock_account_switching';
|
||||
static const _prefLockHiddenFiles = 'ui_lock_hidden_files';
|
||||
|
||||
// Sibling controllers (Files/Photos/Favorites/Trash/Shares/Recent/Sync)
|
||||
// register here instead of this controller holding forward references to
|
||||
// them - it's constructed first, they depend on it. `cleared` fires
|
||||
// wherever `_clearActiveContent()` used to run (about to switch/log out -
|
||||
// reset your own state); `activated` fires only once credentials are
|
||||
// actually verified against the server, so it's safe to make network
|
||||
// requests (fetch your own data now) - it deliberately does *not* fire
|
||||
// for a provisional/offline login (see `_isProvisionalLogin`), so a
|
||||
// network-fetching controller never has to check connectivity itself.
|
||||
// `ready` fires in *both* cases - verified or provisional - for the
|
||||
// handful of controllers (SyncStatusController/OfflineController) whose
|
||||
// own activation work is local-only (prefs, on-disk files) and safe to
|
||||
// run with no connection at all.
|
||||
final List<VoidCallback> _accountClearedListeners = [];
|
||||
final List<VoidCallback> _accountActivatedListeners = [];
|
||||
final List<VoidCallback> _accountReadyListeners = [];
|
||||
void addAccountClearedListener(VoidCallback cb) =>
|
||||
_accountClearedListeners.add(cb);
|
||||
void addAccountActivatedListener(VoidCallback cb) =>
|
||||
_accountActivatedListeners.add(cb);
|
||||
void addAccountReadyListener(VoidCallback cb) =>
|
||||
_accountReadyListeners.add(cb);
|
||||
void _notifyAccountCleared() {
|
||||
for (final cb in _accountClearedListeners) {
|
||||
cb();
|
||||
}
|
||||
}
|
||||
|
||||
void _notifyAccountActivated() {
|
||||
for (final cb in _accountActivatedListeners) {
|
||||
cb();
|
||||
}
|
||||
for (final cb in _accountReadyListeners) {
|
||||
cb();
|
||||
}
|
||||
}
|
||||
|
||||
void _notifyAccountProvisionallyReady() {
|
||||
for (final cb in _accountReadyListeners) {
|
||||
cb();
|
||||
}
|
||||
}
|
||||
|
||||
SessionController(this.connectivity) {
|
||||
WidgetsBinding.instance.addObserver(this);
|
||||
connectivity.addListener(_onConnectivityChanged);
|
||||
_init();
|
||||
}
|
||||
|
||||
Future<void> _init() async {
|
||||
final prefs = await prefsFuture;
|
||||
await accountStore.migrateLegacyIfNeeded(prefs);
|
||||
_accounts = accountStore.loadAccounts(prefs);
|
||||
_activeAccountId = accountStore.loadActiveAccountId(prefs);
|
||||
await Future.wait([_loadPreferences(), _restoreSession()]);
|
||||
}
|
||||
|
||||
@override
|
||||
void didChangeAppLifecycleState(AppLifecycleState state) {
|
||||
// Re-locks the app on backgrounding when login lock is set up - a
|
||||
// one-time unlock at cold start would give the feature no real
|
||||
// security value, since the realistic threat is someone else picking
|
||||
// up an already-running, unlocked phone.
|
||||
if (state == AppLifecycleState.paused &&
|
||||
_loginLockEnabled &&
|
||||
_isUnlocked) {
|
||||
_isUnlocked = false;
|
||||
notifyListeners();
|
||||
}
|
||||
}
|
||||
|
||||
// Getters
|
||||
String get serverUrl => _serverUrl;
|
||||
String get username => _username;
|
||||
bool get isLoggedIn => _isLoggedIn;
|
||||
bool get isLoading => _isLoading;
|
||||
bool get isRestoringSession => _isRestoringSession;
|
||||
String? get errorMessage => _errorMessage;
|
||||
int get sessionGeneration => _sessionGeneration;
|
||||
NextcloudService? get service => _service;
|
||||
|
||||
LoginFlowStatus get loginFlowStatus => _loginFlowStatus;
|
||||
Uri? get pendingLoginUrl => _pendingLoginUrl;
|
||||
|
||||
List<SavedAccount> get accounts => List.unmodifiable(_accounts);
|
||||
String? get activeAccountId => _activeAccountId;
|
||||
SavedAccount? get activeAccount =>
|
||||
_accounts.where((a) => a.id == _activeAccountId).firstOrNull;
|
||||
bool get isAddAccountFlow => _addAccountFlowActive;
|
||||
|
||||
bool get loginLockEnabled => _loginLockEnabled;
|
||||
bool get lockAccountSwitching => _lockAccountSwitching;
|
||||
bool get lockHiddenFiles => _lockHiddenFiles;
|
||||
bool get needsUnlock => _loginLockEnabled && !_isUnlocked;
|
||||
|
||||
Future<void> _restoreSession() async {
|
||||
try {
|
||||
final id = _activeAccountId;
|
||||
if (id == null) return;
|
||||
final account = _accounts.where((a) => a.id == id).firstOrNull;
|
||||
if (account == null) return;
|
||||
final password = await accountStore.readPassword(id);
|
||||
if (password == null) return;
|
||||
await _applyCredentialsForAccount(account, password);
|
||||
} catch (e) {
|
||||
debugPrint('[SessionController] Session restore failed: $e');
|
||||
} finally {
|
||||
_isRestoringSession = false;
|
||||
notifyListeners();
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _loadPreferences() async {
|
||||
try {
|
||||
final prefs = await prefsFuture;
|
||||
_loginLockEnabled =
|
||||
prefs.getBool(_prefLoginLockEnabled) ?? _loginLockEnabled;
|
||||
_lockAccountSwitching =
|
||||
prefs.getBool(_prefLockAccountSwitching) ?? _lockAccountSwitching;
|
||||
_lockHiddenFiles =
|
||||
prefs.getBool(_prefLockHiddenFiles) ?? _lockHiddenFiles;
|
||||
notifyListeners();
|
||||
} catch (e) {
|
||||
debugPrint('[SessionController] Preference restore failed: $e');
|
||||
}
|
||||
}
|
||||
|
||||
/// Verifies [appPassword] for [account] and, on success, makes it the
|
||||
/// live session, firing [_notifyAccountActivated] so every other
|
||||
/// controller fetches its own data. With no network route at all, or on
|
||||
/// a network-level (not auth) failure, skips/gives up on verification
|
||||
/// but still logs in *provisionally* - see [_isProvisionalLogin] - so
|
||||
/// the app still opens into `MainShellView` (restricted to the Offline
|
||||
/// tab while offline) instead of bouncing to `LoginView`. The password
|
||||
/// is expected to already be durably saved by the caller (either
|
||||
/// freshly, via [_completeLoginFlow], or previously, since this is also
|
||||
/// how a saved session is restored/switched to) - this method only
|
||||
/// writes to [AccountStore] to drop a password that turns out to no
|
||||
/// longer work (an actual 401, never a network failure).
|
||||
Future<bool> _applyCredentialsForAccount(
|
||||
SavedAccount account,
|
||||
String appPassword,
|
||||
) async {
|
||||
final gen = _sessionGeneration;
|
||||
_isLoading = true;
|
||||
_errorMessage = null;
|
||||
notifyListeners();
|
||||
|
||||
_serverUrl = account.serverUrl;
|
||||
_username = account.username;
|
||||
_password = appPassword;
|
||||
|
||||
_service = NextcloudService(
|
||||
serverUrl: _serverUrl,
|
||||
username: _username,
|
||||
password: _password,
|
||||
);
|
||||
|
||||
// No point even attempting the request with no network route at all -
|
||||
// treat this exactly like the network-failure branch below (stay
|
||||
// logged in provisionally, `service` already assigned) without paying
|
||||
// for a doomed HTTP call first.
|
||||
if (connectivity.isOffline) {
|
||||
if (gen != _sessionGeneration) return false;
|
||||
_isProvisionalLogin = true;
|
||||
_isLoggedIn = true;
|
||||
_isLoading = false;
|
||||
notifyListeners();
|
||||
_notifyAccountProvisionallyReady();
|
||||
return true;
|
||||
}
|
||||
|
||||
try {
|
||||
final success = await _service!.testConnection();
|
||||
if (gen != _sessionGeneration) return false;
|
||||
if (success) {
|
||||
_isProvisionalLogin = false;
|
||||
_isLoggedIn = true;
|
||||
_isLoading = false;
|
||||
notifyListeners();
|
||||
_notifyAccountActivated();
|
||||
return true;
|
||||
}
|
||||
} catch (e) {
|
||||
if (gen != _sessionGeneration) return false;
|
||||
_errorMessage = e.toString().replaceAll('Exception: ', '');
|
||||
// Only drop the stored password - and only actually log out - on an
|
||||
// actual auth rejection (401). Every other failure (DNS, timeout,
|
||||
// unreachable host, a transient 5xx) is provisional: staying
|
||||
// "logged in" with the cached account/service lets the app still
|
||||
// land on MainShellView instead of bouncing to LoginView, which
|
||||
// would strand a genuinely offline user with no way back in short
|
||||
// of Login Flow v2 again (activeAccountId is never cleared and
|
||||
// switchAccount() no-ops when asked to "switch" to the account
|
||||
// that's already nominally active). `_service` is already assigned
|
||||
// above and needs no re-creation once connectivity returns.
|
||||
if (_errorMessage?.contains('401') == true) {
|
||||
await accountStore.deletePassword(account.id);
|
||||
_isProvisionalLogin = false;
|
||||
_isLoggedIn = false;
|
||||
_service = null;
|
||||
_isLoading = false;
|
||||
notifyListeners();
|
||||
return false;
|
||||
}
|
||||
_isProvisionalLogin = true;
|
||||
_isLoggedIn = true;
|
||||
_isLoading = false;
|
||||
notifyListeners();
|
||||
_notifyAccountProvisionallyReady();
|
||||
return true;
|
||||
}
|
||||
|
||||
if (gen != _sessionGeneration) return false;
|
||||
_isProvisionalLogin = false;
|
||||
_isLoggedIn = false;
|
||||
_service = null;
|
||||
_isLoading = false;
|
||||
notifyListeners();
|
||||
return false;
|
||||
}
|
||||
|
||||
/// Once connectivity actually returns, re-verifies a provisional/offline
|
||||
/// login for real - this is what finally fires [_notifyAccountActivated]
|
||||
/// (not just [_notifyAccountProvisionallyReady]) so network-fetching
|
||||
/// controllers get their first real fetch without requiring an app
|
||||
/// restart.
|
||||
void _onConnectivityChanged() {
|
||||
_reverifyTimer?.cancel();
|
||||
if (!_isProvisionalLogin || connectivity.isOffline) return;
|
||||
unawaited(_reverify(0));
|
||||
}
|
||||
|
||||
Timer? _reverifyTimer;
|
||||
|
||||
/// One re-verification attempt, retried with a growing delay if the
|
||||
/// server still can't be reached. The OS reports "connected" a moment
|
||||
/// before the route actually works (the first request right after
|
||||
/// regaining Wi-Fi/data fails with "Network is unreachable"), and
|
||||
/// `onConnectivityChanged` won't fire again to give a second chance - so
|
||||
/// without retrying, the login stayed provisional and the Files tab showed
|
||||
/// a connection error until the user tapped Retry.
|
||||
Future<void> _reverify(int attempt) async {
|
||||
if (!_isProvisionalLogin || connectivity.isOffline) return;
|
||||
final id = _activeAccountId;
|
||||
if (id == null) return;
|
||||
final account = _accounts.where((a) => a.id == id).firstOrNull;
|
||||
if (account == null) return;
|
||||
await _applyCredentialsForAccount(account, _password);
|
||||
if (_isProvisionalLogin && !connectivity.isOffline && attempt < 5) {
|
||||
_reverifyTimer = Timer(
|
||||
Duration(seconds: 2 * (attempt + 1)),
|
||||
() => unawaited(_reverify(attempt + 1)),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/// Starts Nextcloud Login Flow v2: asks the server for a one-time login
|
||||
/// URL, then polls until the user authorizes (in LoginWebViewView, pushed
|
||||
/// by LoginView once loginFlowStatus flips to awaitingBrowser below) and
|
||||
/// the server hands back a scoped app password. The app never sees the
|
||||
/// user's real password. [addAccount] only marks the flow as "add
|
||||
/// another account" for [isAddAccountFlow] - the pushed Add Account
|
||||
/// screen reads that to decide when to pop itself; this method's own
|
||||
/// persistence behavior on success ([_completeLoginFlow]) is the same
|
||||
/// either way (create-or-refresh the resulting account, then activate
|
||||
/// it).
|
||||
Future<void> startLoginFlow(
|
||||
String serverUrl, {
|
||||
bool addAccount = false,
|
||||
}) async {
|
||||
_addAccountFlowActive = addAccount;
|
||||
_loginFlowStatus = LoginFlowStatus.initiating;
|
||||
_errorMessage = null;
|
||||
notifyListeners();
|
||||
|
||||
try {
|
||||
final init = await LoginFlowService.initiate(serverUrl);
|
||||
_pendingLoginUrl = init.loginUrl;
|
||||
_loginFlowStatus = LoginFlowStatus.awaitingBrowser;
|
||||
notifyListeners();
|
||||
|
||||
_pollTimer?.cancel();
|
||||
_pollTimeoutTimer?.cancel();
|
||||
|
||||
_pollTimeoutTimer = Timer(const Duration(minutes: 10), () {
|
||||
if (_loginFlowStatus == LoginFlowStatus.awaitingBrowser) {
|
||||
cancelLoginFlow(errorMessage: 'Login timed out. Please try again.');
|
||||
}
|
||||
});
|
||||
|
||||
_pollTimer = Timer.periodic(const Duration(seconds: 2), (timer) async {
|
||||
try {
|
||||
final result = await LoginFlowService.poll(
|
||||
init.pollEndpoint,
|
||||
init.pollToken,
|
||||
);
|
||||
if (result != null) {
|
||||
timer.cancel();
|
||||
_pollTimeoutTimer?.cancel();
|
||||
_loginFlowStatus = LoginFlowStatus.idle;
|
||||
_pendingLoginUrl = null;
|
||||
await _completeLoginFlow(result);
|
||||
_addAccountFlowActive = false;
|
||||
}
|
||||
} on http.ClientException catch (e) {
|
||||
// A single dropped connection (e.g. the network briefly
|
||||
// reconfiguring right as the login browser opens) used to abort
|
||||
// the whole flow, forcing the user to start over even though
|
||||
// they'd already granted access - just skip this tick and let
|
||||
// the next scheduled poll (2s later) try again. The 10-minute
|
||||
// timeout above is still the real ceiling.
|
||||
debugPrint('[SessionController] Poll network hiccup, retrying: $e');
|
||||
} catch (e) {
|
||||
timer.cancel();
|
||||
_pollTimeoutTimer?.cancel();
|
||||
cancelLoginFlow(
|
||||
errorMessage: e.toString().replaceAll('Exception: ', ''),
|
||||
);
|
||||
}
|
||||
});
|
||||
} catch (e) {
|
||||
_loginFlowStatus = LoginFlowStatus.error;
|
||||
_errorMessage = e.toString().replaceAll('Exception: ', '');
|
||||
notifyListeners();
|
||||
}
|
||||
}
|
||||
|
||||
void cancelLoginFlow({String? errorMessage}) {
|
||||
_pollTimer?.cancel();
|
||||
_pollTimeoutTimer?.cancel();
|
||||
_pendingLoginUrl = null;
|
||||
_addAccountFlowActive = false;
|
||||
_loginFlowStatus = errorMessage != null
|
||||
? LoginFlowStatus.error
|
||||
: LoginFlowStatus.idle;
|
||||
_errorMessage = errorMessage;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
/// Turns a completed Login Flow v2 result into a saved account (creating
|
||||
/// it, or refreshing its password if it already existed - e.g. an
|
||||
/// expired app password re-authenticated) and makes it the active
|
||||
/// session. Used for both the first/only login and "add account".
|
||||
Future<void> _completeLoginFlow(LoginFlowResult result) async {
|
||||
final serverUrl = LoginFlowService.normalizeServerUrl(result.serverUrl);
|
||||
final id = SavedAccount.makeId(serverUrl, result.loginName);
|
||||
final account = SavedAccount(
|
||||
id: id,
|
||||
serverUrl: serverUrl,
|
||||
username: result.loginName,
|
||||
);
|
||||
_accounts = [
|
||||
for (final a in _accounts)
|
||||
if (a.id != id) a,
|
||||
account,
|
||||
];
|
||||
|
||||
final prefs = await prefsFuture;
|
||||
await accountStore.saveAccounts(prefs, _accounts);
|
||||
await accountStore.writePassword(id, result.appPassword);
|
||||
await _activateAccount(id);
|
||||
}
|
||||
|
||||
/// The shared engine behind switching accounts, falling back to another
|
||||
/// account after removing the active one, and landing on the newly
|
||||
/// created/refreshed account after a login flow completes: tears down
|
||||
/// the outgoing account's live content (without ever setting
|
||||
/// [isLoggedIn] false - see below), then loads the target account's
|
||||
/// credentials.
|
||||
///
|
||||
/// Non-goal, by design: no simultaneous multi-account state. This is a
|
||||
/// full teardown-and-reload of the active session every time, exactly
|
||||
/// like [logout] already did - just without touching any *other* saved
|
||||
/// account's stored credentials/prefs.
|
||||
Future<void> _activateAccount(String accountId) async {
|
||||
// Invalidates any fetch still in flight for the account being left, so
|
||||
// a slow response can't land in the new account's state.
|
||||
_sessionGeneration++;
|
||||
// A pending "add account" flow can't stay pending through a manual
|
||||
// switch/cycle - simplicity over blocking the gesture.
|
||||
if (_loginFlowStatus != LoginFlowStatus.idle) cancelLoginFlow();
|
||||
|
||||
_notifyAccountCleared();
|
||||
// Not `_isLoggedIn = false` - that would bounce main.dart's root
|
||||
// routing through LoginView mid-switch. Each tab already shows its own
|
||||
// spinner from its own loading state, so this alone is enough to
|
||||
// avoid flashing the outgoing account's stale content.
|
||||
_isLoading = true;
|
||||
notifyListeners();
|
||||
|
||||
_activeAccountId = accountId;
|
||||
final prefs = await prefsFuture;
|
||||
await accountStore.saveActiveAccountId(prefs, accountId);
|
||||
// Signed back in (or switched to) - it syncs in the background again.
|
||||
await accountStore.setSignedOut(prefs, accountId, false);
|
||||
notifyListeners();
|
||||
|
||||
final account = _accounts.where((a) => a.id == accountId).firstOrNull;
|
||||
final password = account == null
|
||||
? null
|
||||
: await accountStore.readPassword(accountId);
|
||||
if (account == null || password == null) {
|
||||
_isProvisionalLogin = false;
|
||||
_isLoading = false;
|
||||
_isLoggedIn = false;
|
||||
notifyListeners();
|
||||
return;
|
||||
}
|
||||
|
||||
await _applyCredentialsForAccount(account, password);
|
||||
}
|
||||
|
||||
/// Switches to an already-saved account. No-op (returns true) if it's
|
||||
/// already active and logged in; no-op (returns false) if unknown - but
|
||||
/// if [accountId] is nominally "active" while [isLoggedIn] is false (a
|
||||
/// session-restore that failed, e.g. transient network trouble at cold
|
||||
/// start), this still retries rather than no-op, since that's exactly the
|
||||
/// case LoginView's "Continue as" tile exists to recover from. Gated
|
||||
/// behind login lock when [lockAccountSwitching] is on. Returns whether
|
||||
/// the account ended up logged in, so callers (LoginView's saved-account
|
||||
/// tile) can surface a failure - e.g. a stored app password that no
|
||||
/// longer works and needs the account removed/re-added.
|
||||
Future<bool> switchAccount(String accountId) async {
|
||||
if (accountId == _activeAccountId && _isLoggedIn) return true;
|
||||
if (!_accounts.any((a) => a.id == accountId)) return false;
|
||||
if (!await passGate(_lockAccountSwitching, 'Unlock to switch accounts')) {
|
||||
return false;
|
||||
}
|
||||
await _activateAccount(accountId);
|
||||
return _isLoggedIn;
|
||||
}
|
||||
|
||||
Future<SavedAccount?> _cycleAccount(int direction) async {
|
||||
if (_accounts.length < 2) return null;
|
||||
if (!await passGate(_lockAccountSwitching, 'Unlock to switch accounts')) {
|
||||
return null;
|
||||
}
|
||||
final currentIndex = _accounts.indexWhere((a) => a.id == _activeAccountId);
|
||||
final targetIndex = currentIndex == -1
|
||||
? 0
|
||||
: (currentIndex + direction) % _accounts.length;
|
||||
final target =
|
||||
_accounts[(targetIndex + _accounts.length) % _accounts.length];
|
||||
unawaited(_activateAccount(target.id));
|
||||
return target;
|
||||
}
|
||||
|
||||
/// Cycles to the next/previous saved account (by the order they were
|
||||
/// added) - used by the avatar's swipe-up/down quick-switch gesture.
|
||||
Future<SavedAccount?> cycleToNextAccount() => _cycleAccount(1);
|
||||
Future<SavedAccount?> cycleToPreviousAccount() => _cycleAccount(-1);
|
||||
|
||||
/// Removes a saved account entirely: its stored password, its
|
||||
/// namespaced prefs, and its entry in the saved-accounts list. If it was
|
||||
/// the active account, falls back to another saved account, or - if none
|
||||
/// remain - deactivates the session (the only path here that sets
|
||||
/// [isLoggedIn] false; unlike [logout], there's nothing left to keep).
|
||||
Future<void> removeAccount(String accountId) async {
|
||||
final index = _accounts.indexWhere((a) => a.id == accountId);
|
||||
if (index == -1) return;
|
||||
final wasActive = accountId == _activeAccountId;
|
||||
|
||||
_accounts = [..._accounts]..removeAt(index);
|
||||
final prefs = await prefsFuture;
|
||||
await accountStore.saveAccounts(prefs, _accounts);
|
||||
await accountStore.deletePassword(accountId);
|
||||
for (final key in AccountStore.perAccountPrefKeys) {
|
||||
await prefs.remove(accountStore.accountPrefKey(accountId, key));
|
||||
}
|
||||
await accountStore.setSignedOut(prefs, accountId, false);
|
||||
// Its background sync job holds that account's credentials - stop it.
|
||||
unawaited(SyncService.cancelAccount(accountId));
|
||||
|
||||
if (!wasActive) {
|
||||
notifyListeners();
|
||||
return;
|
||||
}
|
||||
|
||||
if (_accounts.isEmpty) {
|
||||
await _deactivateSession();
|
||||
return;
|
||||
}
|
||||
|
||||
await _activateAccount(_accounts.first.id);
|
||||
}
|
||||
|
||||
/// Clears the active session pointer and tears down its content, without
|
||||
/// touching any saved account's own data - shared by [logout] (which
|
||||
/// deliberately keeps the account around to resume later, no
|
||||
/// re-authentication needed) and [removeAccount]'s "nothing left to fall
|
||||
/// back to" branch (where the account's data has already been deleted by
|
||||
/// the time this runs).
|
||||
Future<void> _deactivateSession() async {
|
||||
_sessionGeneration++;
|
||||
_notifyAccountCleared();
|
||||
_isProvisionalLogin = false;
|
||||
_isLoggedIn = false;
|
||||
_serverUrl = '';
|
||||
_username = '';
|
||||
_password = '';
|
||||
_activeAccountId = null;
|
||||
final prefs = await prefsFuture;
|
||||
await accountStore.saveActiveAccountId(prefs, null);
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
/// Ends the active session but keeps this account saved - unlike
|
||||
/// [removeAccount], nothing is deleted (password, prefs, its entry in
|
||||
/// [accounts] all remain), so it's available to resume with a single tap
|
||||
/// from the login screen's saved-accounts list, no Login Flow v2 needed.
|
||||
/// Always lands on the login screen even if other accounts are saved -
|
||||
/// deliberately not the same as switching to one of them.
|
||||
Future<void> logout() async {
|
||||
final id = _activeAccountId;
|
||||
if (id == null) return;
|
||||
// Logging out stops that account's background sync (the other saved
|
||||
// accounts keep syncing - each has its own job). It's remembered as
|
||||
// signed out so a later reschedule for some other account doesn't
|
||||
// bring its job back; signing in again re-enables it.
|
||||
final prefs = await prefsFuture;
|
||||
await accountStore.setSignedOut(prefs, id, true);
|
||||
await _deactivateSession();
|
||||
unawaited(SyncService.cancelAccount(id));
|
||||
}
|
||||
|
||||
/// Confirms the device can do local auth and prompts once to enable login
|
||||
/// lock. Returns false (leaving lock disabled) if the device has no
|
||||
/// biometric/PIN capability or the user cancels/fails the confirmation.
|
||||
Future<bool> setupLoginLock() async {
|
||||
if (!await AppLockService.isDeviceSupported()) return false;
|
||||
final confirmed = await AppLockService.authenticate(
|
||||
'Confirm to turn on login lock',
|
||||
);
|
||||
if (!confirmed) return false;
|
||||
_loginLockEnabled = true;
|
||||
// Already just authenticated - don't immediately re-prompt behind it.
|
||||
_isUnlocked = true;
|
||||
notifyListeners();
|
||||
prefsFuture.then((p) => p.setBool(_prefLoginLockEnabled, true));
|
||||
return true;
|
||||
}
|
||||
|
||||
/// Turns login lock off, along with both of its sub-toggles (meaningless
|
||||
/// once the base lock is gone). Requires a successful auth first, same as
|
||||
/// turning it on - otherwise anyone with momentary access to an unlocked
|
||||
/// phone could just switch it off.
|
||||
Future<bool> disableLoginLock() async {
|
||||
if (!_loginLockEnabled) return true;
|
||||
final confirmed = await AppLockService.authenticate(
|
||||
'Confirm to turn off login lock',
|
||||
);
|
||||
if (!confirmed) return false;
|
||||
_loginLockEnabled = false;
|
||||
_lockAccountSwitching = false;
|
||||
_lockHiddenFiles = false;
|
||||
_isUnlocked = false;
|
||||
notifyListeners();
|
||||
prefsFuture.then((p) {
|
||||
p.setBool(_prefLoginLockEnabled, false);
|
||||
p.setBool(_prefLockAccountSwitching, false);
|
||||
p.setBool(_prefLockHiddenFiles, false);
|
||||
});
|
||||
return true;
|
||||
}
|
||||
|
||||
void setLockAccountSwitching(bool value) {
|
||||
if (!_loginLockEnabled) return;
|
||||
_lockAccountSwitching = value;
|
||||
notifyListeners();
|
||||
prefsFuture.then((p) => p.setBool(_prefLockAccountSwitching, value));
|
||||
}
|
||||
|
||||
void setLockHiddenFiles(bool value) {
|
||||
if (!_loginLockEnabled) return;
|
||||
_lockHiddenFiles = value;
|
||||
notifyListeners();
|
||||
prefsFuture.then((p) => p.setBool(_prefLockHiddenFiles, value));
|
||||
}
|
||||
|
||||
/// Called by the lock screen. Returns whether it actually unlocked.
|
||||
Future<bool> attemptUnlock() async {
|
||||
final success = await AppLockService.authenticate('Unlock Noo');
|
||||
if (success) {
|
||||
_isUnlocked = true;
|
||||
notifyListeners();
|
||||
}
|
||||
return success;
|
||||
}
|
||||
|
||||
/// Prompts for auth if [gate] is on and login lock is configured;
|
||||
/// returns true immediately (no prompt) otherwise. Shared by the
|
||||
/// account-switching gate above and [FilesController]'s/`PhotosController`'s
|
||||
/// hidden-files gates.
|
||||
Future<bool> passGate(bool gate, String reason) async {
|
||||
if (!_loginLockEnabled || !gate) return true;
|
||||
return AppLockService.authenticate(reason);
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
WidgetsBinding.instance.removeObserver(this);
|
||||
connectivity.removeListener(_onConnectivityChanged);
|
||||
_reverifyTimer?.cancel();
|
||||
_pollTimer?.cancel();
|
||||
_pollTimeoutTimer?.cancel();
|
||||
super.dispose();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,327 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:shared_preferences/shared_preferences.dart';
|
||||
import '../models/app_tab.dart';
|
||||
import '../theme/app_theme.dart';
|
||||
|
||||
/// What swiping a Files list-view item left/right does, user-configurable
|
||||
/// in Settings.
|
||||
enum SwipeAction { none, favorite, delete, share }
|
||||
|
||||
/// Thumb/track presets for the video player's seek bar, matching the four
|
||||
/// combinations offered by other Material You media players: a Material 3
|
||||
/// slider-style thumb ([classic]), an animated travelling wave with a round
|
||||
/// thumb ([wavy]), a thin flat bar with no distinct thumb ([slim]), and an
|
||||
/// animated wave with a tick-mark thumb ([squiggly]).
|
||||
enum MediaProgressBarStyle { classic, wavy, slim, squiggly }
|
||||
|
||||
/// Global (not per-account) UI settings: theme, bottom-nav appearance, tab
|
||||
/// configuration, swipe actions. Independent of login state - these mean
|
||||
/// the same thing whether any account is signed in or not, unlike
|
||||
/// [FilesController]'s/etc. per-account display prefs. Split out of the
|
||||
/// former single `ServerProvider` god object.
|
||||
class SettingsController extends ChangeNotifier {
|
||||
static const _prefThemeMode = 'ui_theme_mode';
|
||||
static const _prefUseDynamicColor = 'ui_use_dynamic_color';
|
||||
static const _prefSeedColor = 'ui_seed_color';
|
||||
static const _prefBottomBarOpacity = 'ui_bottom_bar_opacity';
|
||||
static const _prefBottomBarBlur = 'ui_bottom_bar_blur';
|
||||
static const _prefTabOrder = 'ui_tab_order';
|
||||
static const _prefHiddenTabs = 'ui_hidden_tabs';
|
||||
static const _prefDefaultTab = 'ui_default_tab';
|
||||
static const _prefSwipeLeftAction = 'ui_swipe_left_action';
|
||||
static const _prefSwipeRightAction = 'ui_swipe_right_action';
|
||||
static const _prefAmoledDark = 'ui_amoled_dark';
|
||||
static const _prefMediaProgressBarStyle = 'ui_media_progress_bar_style';
|
||||
static const _prefTapTabToScrollTop = 'ui_tap_tab_to_scroll_top';
|
||||
|
||||
final Future<SharedPreferences> _prefsFuture =
|
||||
SharedPreferences.getInstance();
|
||||
|
||||
Color _seedColor = AppTheme.defaultNextcloudBlue;
|
||||
ThemeMode _themeMode = ThemeMode.system;
|
||||
bool _useDynamicColor = true;
|
||||
bool _amoledDark = false;
|
||||
MediaProgressBarStyle _mediaProgressBarStyle = MediaProgressBarStyle.wavy;
|
||||
|
||||
double _bottomBarOpacity = 0.55;
|
||||
double _bottomBarBlur = 28;
|
||||
bool _tapTabToScrollTop = true;
|
||||
|
||||
List<AppTab> _tabOrder = AppTab.values.toList();
|
||||
Set<AppTab> _hiddenTabs = {};
|
||||
AppTab _defaultTab = AppTab.files;
|
||||
|
||||
SwipeAction _swipeLeftAction = SwipeAction.delete;
|
||||
SwipeAction _swipeRightAction = SwipeAction.favorite;
|
||||
|
||||
// A one-shot request for the shell to switch its active bottom-nav tab
|
||||
// (e.g. a search result landing on Files) - consumed and cleared by
|
||||
// MainShellView the next time it builds, not a persisted preference.
|
||||
AppTab? _requestedTab;
|
||||
AppTab? get requestedTab => _requestedTab;
|
||||
|
||||
/// Asks the shell to switch its active bottom-nav tab to [tab] - e.g. so
|
||||
/// tapping a search result lands the user on the Files tab even if they
|
||||
/// opened search from somewhere else.
|
||||
void requestTab(AppTab tab) {
|
||||
_requestedTab = tab;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
/// Called by the shell once it's consumed [requestedTab].
|
||||
void consumeRequestedTab() {
|
||||
_requestedTab = null;
|
||||
}
|
||||
|
||||
SettingsController() {
|
||||
_load();
|
||||
}
|
||||
|
||||
Color get seedColor => _seedColor;
|
||||
ThemeMode get themeMode => _themeMode;
|
||||
bool get useDynamicColor => _useDynamicColor;
|
||||
bool get amoledDark => _amoledDark;
|
||||
MediaProgressBarStyle get mediaProgressBarStyle => _mediaProgressBarStyle;
|
||||
double get bottomBarOpacity => _bottomBarOpacity;
|
||||
double get bottomBarBlur => _bottomBarBlur;
|
||||
bool get tapTabToScrollTop => _tapTabToScrollTop;
|
||||
|
||||
/// Every tab in the user's configured order, including hidden ones — used
|
||||
/// by the reorder/visibility settings UI.
|
||||
List<AppTab> get tabOrder => _tabOrder;
|
||||
Set<AppTab> get hiddenTabs => _hiddenTabs;
|
||||
AppTab get defaultTab => _defaultTab;
|
||||
|
||||
/// The tabs the bottom nav bar should actually show, in order.
|
||||
List<AppTab> get visibleTabs =>
|
||||
_tabOrder.where((t) => !_hiddenTabs.contains(t)).toList();
|
||||
|
||||
SwipeAction get swipeLeftAction => _swipeLeftAction;
|
||||
SwipeAction get swipeRightAction => _swipeRightAction;
|
||||
|
||||
Future<void> _load() async {
|
||||
try {
|
||||
final prefs = await _prefsFuture;
|
||||
|
||||
final themeModeName = prefs.getString(_prefThemeMode);
|
||||
if (themeModeName != null) {
|
||||
_themeMode = ThemeMode.values.firstWhere(
|
||||
(m) => m.name == themeModeName,
|
||||
orElse: () => ThemeMode.system,
|
||||
);
|
||||
}
|
||||
_useDynamicColor =
|
||||
prefs.getBool(_prefUseDynamicColor) ?? _useDynamicColor;
|
||||
_amoledDark = prefs.getBool(_prefAmoledDark) ?? _amoledDark;
|
||||
final progressBarStyleName = prefs.getString(_prefMediaProgressBarStyle);
|
||||
if (progressBarStyleName != null) {
|
||||
_mediaProgressBarStyle = MediaProgressBarStyle.values.firstWhere(
|
||||
(s) => s.name == progressBarStyleName,
|
||||
orElse: () => _mediaProgressBarStyle,
|
||||
);
|
||||
}
|
||||
final seedColorValue = prefs.getInt(_prefSeedColor);
|
||||
if (seedColorValue != null) _seedColor = Color(seedColorValue);
|
||||
_bottomBarOpacity =
|
||||
prefs.getDouble(_prefBottomBarOpacity) ?? _bottomBarOpacity;
|
||||
_bottomBarBlur = prefs.getDouble(_prefBottomBarBlur) ?? _bottomBarBlur;
|
||||
_tapTabToScrollTop =
|
||||
prefs.getBool(_prefTapTabToScrollTop) ?? _tapTabToScrollTop;
|
||||
|
||||
final savedOrderNames = prefs.getStringList(_prefTabOrder);
|
||||
if (savedOrderNames != null) {
|
||||
final order = <AppTab>[];
|
||||
for (final name in savedOrderNames) {
|
||||
final match = AppTab.values.where((t) => t.name == name).firstOrNull;
|
||||
if (match != null) order.add(match);
|
||||
}
|
||||
// Forward-compat: a tab added in a later app update won't be in an
|
||||
// older saved order yet, so append anything missing.
|
||||
for (final tab in AppTab.values) {
|
||||
if (!order.contains(tab)) order.add(tab);
|
||||
}
|
||||
_tabOrder = order;
|
||||
}
|
||||
|
||||
final savedHiddenNames = prefs.getStringList(_prefHiddenTabs);
|
||||
if (savedHiddenNames != null) {
|
||||
_hiddenTabs = savedHiddenNames
|
||||
.map(
|
||||
(name) => AppTab.values.where((t) => t.name == name).firstOrNull,
|
||||
)
|
||||
.whereType<AppTab>()
|
||||
.toSet();
|
||||
// Never let every tab end up hidden.
|
||||
if (_hiddenTabs.length >= AppTab.values.length) {
|
||||
_hiddenTabs = {};
|
||||
}
|
||||
}
|
||||
|
||||
final savedDefaultName = prefs.getString(_prefDefaultTab);
|
||||
if (savedDefaultName != null) {
|
||||
final match = AppTab.values
|
||||
.where((t) => t.name == savedDefaultName)
|
||||
.firstOrNull;
|
||||
if (match != null) _defaultTab = match;
|
||||
}
|
||||
if (_hiddenTabs.contains(_defaultTab)) {
|
||||
_defaultTab = _tabOrder.firstWhere(
|
||||
(t) => !_hiddenTabs.contains(t),
|
||||
orElse: () => _tabOrder.first,
|
||||
);
|
||||
}
|
||||
_enforceMaxVisibleTabs();
|
||||
|
||||
final swipeLeftName = prefs.getString(_prefSwipeLeftAction);
|
||||
if (swipeLeftName != null) {
|
||||
_swipeLeftAction = SwipeAction.values.firstWhere(
|
||||
(a) => a.name == swipeLeftName,
|
||||
orElse: () => _swipeLeftAction,
|
||||
);
|
||||
}
|
||||
final swipeRightName = prefs.getString(_prefSwipeRightAction);
|
||||
if (swipeRightName != null) {
|
||||
_swipeRightAction = SwipeAction.values.firstWhere(
|
||||
(a) => a.name == swipeRightName,
|
||||
orElse: () => _swipeRightAction,
|
||||
);
|
||||
}
|
||||
|
||||
notifyListeners();
|
||||
} catch (e) {
|
||||
debugPrint('[SettingsController] Preference restore failed: $e');
|
||||
}
|
||||
}
|
||||
|
||||
void setSeedColor(Color color) {
|
||||
_seedColor = color;
|
||||
_useDynamicColor = false;
|
||||
notifyListeners();
|
||||
_prefsFuture.then((p) {
|
||||
p.setInt(_prefSeedColor, color.toARGB32());
|
||||
p.setBool(_prefUseDynamicColor, false);
|
||||
});
|
||||
}
|
||||
|
||||
void setUseDynamicColor(bool value) {
|
||||
_useDynamicColor = value;
|
||||
notifyListeners();
|
||||
_prefsFuture.then((p) => p.setBool(_prefUseDynamicColor, value));
|
||||
}
|
||||
|
||||
void setAmoledDark(bool value) {
|
||||
_amoledDark = value;
|
||||
notifyListeners();
|
||||
_prefsFuture.then((p) => p.setBool(_prefAmoledDark, value));
|
||||
}
|
||||
|
||||
void setMediaProgressBarStyle(MediaProgressBarStyle style) {
|
||||
_mediaProgressBarStyle = style;
|
||||
notifyListeners();
|
||||
_prefsFuture.then(
|
||||
(p) => p.setString(_prefMediaProgressBarStyle, style.name),
|
||||
);
|
||||
}
|
||||
|
||||
void setBottomBarOpacity(double value) {
|
||||
_bottomBarOpacity = value;
|
||||
notifyListeners();
|
||||
_prefsFuture.then((p) => p.setDouble(_prefBottomBarOpacity, value));
|
||||
}
|
||||
|
||||
void setBottomBarBlur(double value) {
|
||||
_bottomBarBlur = value;
|
||||
notifyListeners();
|
||||
_prefsFuture.then((p) => p.setDouble(_prefBottomBarBlur, value));
|
||||
}
|
||||
|
||||
void setTapTabToScrollTop(bool value) {
|
||||
_tapTabToScrollTop = value;
|
||||
notifyListeners();
|
||||
_prefsFuture.then((p) => p.setBool(_prefTapTabToScrollTop, value));
|
||||
}
|
||||
|
||||
void setThemeMode(ThemeMode mode) {
|
||||
_themeMode = mode;
|
||||
notifyListeners();
|
||||
_prefsFuture.then((p) => p.setString(_prefThemeMode, mode.name));
|
||||
}
|
||||
|
||||
void setTabOrder(List<AppTab> order) {
|
||||
_tabOrder = order;
|
||||
notifyListeners();
|
||||
_prefsFuture.then(
|
||||
(p) => p.setStringList(_prefTabOrder, order.map((t) => t.name).toList()),
|
||||
);
|
||||
}
|
||||
|
||||
/// Shows or hides a tab in the bottom nav bar. Refuses to hide the last
|
||||
/// remaining visible tab. If the tab being hidden is the current default,
|
||||
/// the default falls back to the next visible tab.
|
||||
/// Returns null on success, or a user-facing reason the change was
|
||||
/// refused (hiding the last visible tab, or showing a 6th).
|
||||
String? setTabHidden(AppTab tab, bool hidden) {
|
||||
if (hidden) {
|
||||
final remaining = _tabOrder
|
||||
.where((t) => t != tab && !_hiddenTabs.contains(t))
|
||||
.length;
|
||||
if (remaining == 0) return 'At least one tab must stay visible';
|
||||
_hiddenTabs = {..._hiddenTabs, tab};
|
||||
if (_defaultTab == tab) {
|
||||
_defaultTab = _tabOrder.firstWhere((t) => !_hiddenTabs.contains(t));
|
||||
_prefsFuture.then(
|
||||
(p) => p.setString(_prefDefaultTab, _defaultTab.name),
|
||||
);
|
||||
}
|
||||
} else {
|
||||
final currentlyVisible = _tabOrder
|
||||
.where((t) => !_hiddenTabs.contains(t))
|
||||
.length;
|
||||
if (currentlyVisible >= maxVisibleTabs) {
|
||||
return 'You can only show up to $maxVisibleTabs tabs at once';
|
||||
}
|
||||
_hiddenTabs = {..._hiddenTabs}..remove(tab);
|
||||
}
|
||||
notifyListeners();
|
||||
_prefsFuture.then(
|
||||
(p) => p.setStringList(
|
||||
_prefHiddenTabs,
|
||||
_hiddenTabs.map((t) => t.name).toList(),
|
||||
),
|
||||
);
|
||||
return null;
|
||||
}
|
||||
|
||||
/// If more than [maxVisibleTabs] end up visible (e.g. a fresh install, or
|
||||
/// an existing saved config from before a new tab was added to the app),
|
||||
/// hide the overflow automatically rather than exceeding the cap.
|
||||
void _enforceMaxVisibleTabs() {
|
||||
final visible = _tabOrder.where((t) => !_hiddenTabs.contains(t)).toList();
|
||||
if (visible.length <= maxVisibleTabs) return;
|
||||
_hiddenTabs = {..._hiddenTabs, ...visible.sublist(maxVisibleTabs)};
|
||||
if (_hiddenTabs.contains(_defaultTab)) {
|
||||
_defaultTab = _tabOrder.firstWhere((t) => !_hiddenTabs.contains(t));
|
||||
}
|
||||
}
|
||||
|
||||
void setDefaultTab(AppTab tab) {
|
||||
if (_hiddenTabs.contains(tab) || _defaultTab == tab) return;
|
||||
_defaultTab = tab;
|
||||
notifyListeners();
|
||||
_prefsFuture.then((p) => p.setString(_prefDefaultTab, tab.name));
|
||||
}
|
||||
|
||||
void setSwipeLeftAction(SwipeAction action) {
|
||||
if (_swipeLeftAction == action) return;
|
||||
_swipeLeftAction = action;
|
||||
notifyListeners();
|
||||
_prefsFuture.then((p) => p.setString(_prefSwipeLeftAction, action.name));
|
||||
}
|
||||
|
||||
void setSwipeRightAction(SwipeAction action) {
|
||||
if (_swipeRightAction == action) return;
|
||||
_swipeRightAction = action;
|
||||
notifyListeners();
|
||||
_prefsFuture.then((p) => p.setString(_prefSwipeRightAction, action.name));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,81 @@
|
||||
import 'dart:async';
|
||||
import 'package:flutter/material.dart';
|
||||
import '../models/nextcloud_share.dart';
|
||||
import 'session_controller.dart';
|
||||
|
||||
/// The Shares tab. Kept separate from Files' own loading/error state,
|
||||
/// likewise.
|
||||
class SharesController extends ChangeNotifier {
|
||||
final SessionController session;
|
||||
|
||||
List<NextcloudShare> _shares = [];
|
||||
bool _isLoading = false;
|
||||
String? _errorMessage;
|
||||
bool _sharedWithMe = false;
|
||||
|
||||
SharesController(this.session) {
|
||||
session.addAccountClearedListener(_onAccountCleared);
|
||||
session.addAccountActivatedListener(_onAccountActivated);
|
||||
}
|
||||
|
||||
List<NextcloudShare> get shares => _shares;
|
||||
bool get isLoading => _isLoading;
|
||||
String? get errorMessage => _errorMessage;
|
||||
bool get sharedWithMe => _sharedWithMe;
|
||||
|
||||
void _onAccountCleared() {
|
||||
_shares = [];
|
||||
_isLoading = false;
|
||||
_errorMessage = null;
|
||||
_sharedWithMe = false;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
void _onAccountActivated() {
|
||||
unawaited(fetchAll());
|
||||
}
|
||||
|
||||
Future<void> fetchAll() async {
|
||||
final service = session.service;
|
||||
if (!session.isLoggedIn || service == null) return;
|
||||
final gen = session.sessionGeneration;
|
||||
|
||||
_isLoading = true;
|
||||
_errorMessage = null;
|
||||
notifyListeners();
|
||||
|
||||
try {
|
||||
final shares = await service.fetchShares(sharedWithMe: _sharedWithMe);
|
||||
if (gen != session.sessionGeneration) return;
|
||||
_shares = shares;
|
||||
} catch (e) {
|
||||
if (gen != session.sessionGeneration) return;
|
||||
debugPrint('[SharesController] Error fetching shares: $e');
|
||||
_errorMessage = e.toString().replaceAll('Exception: ', '');
|
||||
} finally {
|
||||
if (gen == session.sessionGeneration) {
|
||||
_isLoading = false;
|
||||
notifyListeners();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Switches between "shared by me" and "shared with me" and refetches.
|
||||
void setSharedWithMe(bool value) {
|
||||
if (_sharedWithMe == value) return;
|
||||
_sharedWithMe = value;
|
||||
notifyListeners();
|
||||
fetchAll();
|
||||
}
|
||||
|
||||
Future<bool> deleteShare(NextcloudShare share) async {
|
||||
final service = session.service;
|
||||
if (service == null) return false;
|
||||
final success = await service.deleteShare(share.id);
|
||||
if (success) {
|
||||
_shares = _shares.where((s) => s.id != share.id).toList();
|
||||
notifyListeners();
|
||||
}
|
||||
return success;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,573 @@
|
||||
import 'dart:async';
|
||||
import 'dart:convert';
|
||||
import 'package:flutter/material.dart';
|
||||
import '../models/nextcloud_item.dart';
|
||||
import '../models/sync_status.dart';
|
||||
import '../services/sync_service.dart';
|
||||
import 'files_controller.dart';
|
||||
import 'session_controller.dart';
|
||||
|
||||
/// Device-sync state and settings: which remote paths (files or folders,
|
||||
/// per account) get mirrored locally by the native `SyncWorker`, whether
|
||||
/// its periodic background runs are allowed on cellular, and live status
|
||||
/// pushed from `SyncStatusBus.kt` (syncing-now/per-file-syncing/synced/
|
||||
/// conflicts) - see `server.md`'s "Device sync" section. Split out of the
|
||||
/// former single `ServerProvider` god object specifically because this
|
||||
/// state used to reach directly into Files/Photos/Favorites item lists
|
||||
/// (`syncStatusFor`) despite living in an unrelated domain; now it's a
|
||||
/// second, focused provider those views read alongside their own tab
|
||||
/// controller.
|
||||
///
|
||||
/// **Keeping synced files current.** Synced folders/files follow the same
|
||||
/// Files Cache rule (Settings) as folder listings, so nothing needs the
|
||||
/// "Sync now" button:
|
||||
///
|
||||
/// - *Refresh periodically (N min)*: a WorkManager periodic job runs in the
|
||||
/// background at that interval (Android's floor is 15 min, so shorter
|
||||
/// values only apply in the foreground), and while the app's open an
|
||||
/// in-app timer runs a pass every N minutes plus one on resume if it's
|
||||
/// been longer than that.
|
||||
/// - *Never cache*: no background schedule; a pass runs each time the app
|
||||
/// is opened/resumed.
|
||||
/// - *Refresh manually only*: only pull-to-refresh (any tab's sync header)
|
||||
/// and "Sync now".
|
||||
///
|
||||
/// Every automatic pass is cheap when nothing changed - the native worker
|
||||
/// checks each synced root's etag (Nextcloud propagates any descendant
|
||||
/// change up to every ancestor's etag) and skips the full walk if it's
|
||||
/// unchanged and the local copy is intact. There's no server push: Nextcloud's
|
||||
/// only push channels (the `notify_push` server app, or FCM via Nextcloud's
|
||||
/// push proxy) need server-side setup and a persistent connection/registered
|
||||
/// app identity, so this polls instead.
|
||||
class SyncStatusController extends ChangeNotifier with WidgetsBindingObserver {
|
||||
final SessionController session;
|
||||
final FilesController files;
|
||||
|
||||
static const prefSyncedPaths = 'ui_synced_folders';
|
||||
static const _prefSyncedPathTypes = 'ui_synced_folder_types';
|
||||
static const prefSyncEverything = 'ui_sync_everything';
|
||||
static const _prefSyncOnCellular = 'ui_sync_on_cellular';
|
||||
static const _prefSyncNotifications = 'ui_sync_notifications';
|
||||
|
||||
List<String> _syncedPaths = [];
|
||||
// path -> isFolder, keyed the same as [_syncedPaths] - missing entries
|
||||
// (from before this map existed) default to folder, the overwhelmingly
|
||||
// common case.
|
||||
Map<String, bool> _syncedPathTypes = {};
|
||||
bool _syncEverything = false;
|
||||
bool _syncOnCellular = false;
|
||||
bool _syncNotifications = true;
|
||||
|
||||
bool _isSyncingNow = false;
|
||||
Set<String> _syncingFileIds = {};
|
||||
Set<String> _syncedFileIds = {};
|
||||
List<SyncConflictInfo> _syncConflicts = [];
|
||||
StreamSubscription<SyncStatusSnapshot>? _statusSub;
|
||||
|
||||
// Gates addSyncedPaths/removeSyncedPaths (anything that persists
|
||||
// _syncedPaths) against running before _onAccountActivated's async
|
||||
// prefs load has actually finished - without this, syncing a folder
|
||||
// right after opening the app could race the load, overwrite the
|
||||
// persisted list with just the one path being added/removed, and
|
||||
// silently destroy every previously-synced folder. Deliberately starts
|
||||
// *incomplete*, not pre-completed - a mutation is only ever reachable
|
||||
// from Files/Offline UI, which requires a completed activation already
|
||||
// (Files' own item list depends on the same login event), so there's no
|
||||
// real deadlock risk, and starting complete would leave the very first
|
||||
// cold-start load completely unprotected (only account *switches*
|
||||
// re-arm it, via _onAccountCleared - the bug that actually caused
|
||||
// repeated data loss here).
|
||||
Completer<void> _accountLoadedGate = Completer<void>();
|
||||
|
||||
// True once _syncedPaths/_syncedPathTypes/_syncEverything have been
|
||||
// loaded from prefs for the *current* account - _onAccountActivated can
|
||||
// fire more than once per account (e.g. SessionController re-verifying
|
||||
// a provisional/offline login once connectivity returns), and a second
|
||||
// pass re-reading from storage could clobber an in-memory mutation made
|
||||
// between the first load and the second one if its own persist hadn't
|
||||
// landed yet. Reset in _onAccountCleared.
|
||||
bool _hasLoadedSyncedPathsForAccount = false;
|
||||
|
||||
Timer? _autoSyncTimer;
|
||||
bool _foreground = true;
|
||||
DateTime? _lastAutoSyncAt;
|
||||
CachePolicy? _lastPolicy;
|
||||
int? _lastInterval;
|
||||
|
||||
SyncStatusController(this.session, this.files) {
|
||||
WidgetsBinding.instance.addObserver(this);
|
||||
files.addListener(_onFilesChanged);
|
||||
session.addAccountClearedListener(_onAccountCleared);
|
||||
// `ready`, not `activated` - this controller's own activation work
|
||||
// (loading prefs, calling the native sync channel) is local/native
|
||||
// only, so it's safe to run even on a provisional/offline login (see
|
||||
// `SessionController.addAccountReadyListener`'s doc comment).
|
||||
session.addAccountReadyListener(_onAccountActivated);
|
||||
_statusSub = SyncService.statusStream.listen(_applySnapshot);
|
||||
_loadGlobalPrefs();
|
||||
}
|
||||
|
||||
List<String> get syncedPaths => List.unmodifiable(_syncedPaths);
|
||||
bool get syncEverything => _syncEverything;
|
||||
bool get syncOnCellular => _syncOnCellular;
|
||||
|
||||
/// Whether background (automatic) sync runs may post progress/summary
|
||||
/// notifications. Conflicts and user-initiated "Sync now" always notify.
|
||||
bool get syncNotifications => _syncNotifications;
|
||||
|
||||
bool get isSyncingNow => _isSyncingNow;
|
||||
|
||||
bool get _hasSyncScope => _syncEverything || _syncedPaths.isNotEmpty;
|
||||
|
||||
/// How often the background WorkManager job should run, or null for no
|
||||
/// background sync at all - only the "refresh periodically" Files Cache
|
||||
/// policy schedules one (see the class doc comment).
|
||||
int? get backgroundSyncIntervalMinutes =>
|
||||
files.cachePolicy == CachePolicy.interval
|
||||
? files.cacheIntervalMinutes
|
||||
: null;
|
||||
List<SyncConflictInfo> get syncConflicts => List.unmodifiable(_syncConflicts);
|
||||
|
||||
/// How many of [syncedPaths] are folders (as opposed to individual
|
||||
/// files) - used by the sync header's expanded summary.
|
||||
int get syncedFolderCount =>
|
||||
_syncedPaths.where((p) => _syncedPathTypes[p] ?? true).length;
|
||||
|
||||
SyncHeaderStatus get syncHeaderStatus {
|
||||
if (_syncConflicts.isNotEmpty) return SyncHeaderStatus.alert;
|
||||
if (_isSyncingNow) return SyncHeaderStatus.syncing;
|
||||
if (!_syncEverything && _syncedPaths.isEmpty) return SyncHeaderStatus.off;
|
||||
return SyncHeaderStatus.done;
|
||||
}
|
||||
|
||||
/// True if [path] itself, or an ancestor of it, is covered by device
|
||||
/// sync - either explicitly (one of [_syncedPaths]) or via
|
||||
/// [_syncEverything]. Shared by [syncStatusFor] (folders) and
|
||||
/// [localSyncedFilePath] (files).
|
||||
bool _isPathInSyncScope(String path) {
|
||||
if (_syncEverything) return true;
|
||||
final normalized = path.endsWith('/')
|
||||
? path.substring(0, path.length - 1)
|
||||
: path;
|
||||
return _syncedPaths.any((folder) {
|
||||
final f = folder.endsWith('/')
|
||||
? folder.substring(0, folder.length - 1)
|
||||
: folder;
|
||||
return normalized == f || normalized.startsWith('$f/');
|
||||
});
|
||||
}
|
||||
|
||||
/// True if any pending conflict falls under [folderPath].
|
||||
bool _folderHasConflict(String folderPath) {
|
||||
final normalized = folderPath.endsWith('/')
|
||||
? folderPath.substring(0, folderPath.length - 1)
|
||||
: folderPath;
|
||||
return _syncConflicts.any((c) {
|
||||
final p = c.remotePath.endsWith('/')
|
||||
? c.remotePath.substring(0, c.remotePath.length - 1)
|
||||
: c.remotePath;
|
||||
return p == normalized || p.startsWith('$normalized/');
|
||||
});
|
||||
}
|
||||
|
||||
/// Folders don't get their own entry in [_syncedFileIds] (only individual
|
||||
/// files do - see `SyncEngine.diffFolder`'s `if (entry.isFolder) continue`),
|
||||
/// so a folder's status is derived from whether it's in sync scope at all
|
||||
/// rather than tracked per-item like a file's is.
|
||||
SyncItemStatus syncStatusFor(NextcloudItem item) {
|
||||
if (item.isFolder) {
|
||||
if (!_isPathInSyncScope(item.path)) return SyncItemStatus.none;
|
||||
if (_folderHasConflict(item.path)) return SyncItemStatus.conflict;
|
||||
if (_isSyncingNow) return SyncItemStatus.syncing;
|
||||
return SyncItemStatus.synced;
|
||||
}
|
||||
if (_syncingFileIds.contains(item.id)) return SyncItemStatus.syncing;
|
||||
if (_syncConflicts.any((c) => c.fileId == item.id)) {
|
||||
return SyncItemStatus.conflict;
|
||||
}
|
||||
if (_syncedFileIds.contains(item.id)) return SyncItemStatus.synced;
|
||||
return SyncItemStatus.none;
|
||||
}
|
||||
|
||||
Future<void> _loadGlobalPrefs() async {
|
||||
final prefs = await session.prefsFuture;
|
||||
_syncOnCellular = prefs.getBool(_prefSyncOnCellular) ?? _syncOnCellular;
|
||||
_syncNotifications =
|
||||
prefs.getBool(_prefSyncNotifications) ?? _syncNotifications;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
void _onAccountCleared() {
|
||||
// Re-armed (not completed) here, not just at construction - an
|
||||
// account switch means the *next* activation's load has to finish
|
||||
// before any mutation touching _syncedPaths is safe again. Only
|
||||
// replace the Completer if nothing's still awaiting the old one -
|
||||
// swapping it out from under a pending awaiter would orphan that
|
||||
// await forever, since nothing would ever complete the discarded
|
||||
// instance.
|
||||
if (_accountLoadedGate.isCompleted) _accountLoadedGate = Completer<void>();
|
||||
_hasLoadedSyncedPathsForAccount = false;
|
||||
_syncedPaths = [];
|
||||
_syncedPathTypes = {};
|
||||
_syncEverything = false;
|
||||
_isSyncingNow = false;
|
||||
_syncingFileIds = {};
|
||||
_syncedFileIds = {};
|
||||
_syncConflicts = [];
|
||||
_autoSyncTimer?.cancel();
|
||||
_lastAutoSyncAt = null;
|
||||
_lastPolicy = null;
|
||||
_lastInterval = null;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
Future<void> _onAccountActivated() async {
|
||||
final id = session.activeAccountId;
|
||||
// Only load _syncedPaths/_syncedPathTypes/_syncEverything once per
|
||||
// account, not on every activation - this can fire more than once
|
||||
// for the same account (e.g. SessionController re-verifying a
|
||||
// provisional/offline login once connectivity returns), and a second
|
||||
// read from storage could clobber an in-memory mutation made between
|
||||
// the first load and this one if its own persist hadn't landed yet.
|
||||
// See _hasLoadedSyncedPathsForAccount's doc comment.
|
||||
if (id != null && !_hasLoadedSyncedPathsForAccount) {
|
||||
_hasLoadedSyncedPathsForAccount = true;
|
||||
// Wrapped so a single bad/mistyped stored pref value can't
|
||||
// propagate uncaught out of this method and skip the gate
|
||||
// completion below - that would leave every future
|
||||
// addSyncedPaths/removeSyncedPaths call awaiting a gate that never
|
||||
// completes, hanging forever. See FilesController.
|
||||
// _onAccountActivated's identical guard for the real incident this
|
||||
// mirrors.
|
||||
try {
|
||||
final prefs = await session.prefsFuture;
|
||||
String k(String base) => session.accountStore.accountPrefKey(id, base);
|
||||
final pathsJson = prefs.getString(k(prefSyncedPaths));
|
||||
if (pathsJson != null) {
|
||||
try {
|
||||
_syncedPaths = (jsonDecode(pathsJson) as List).cast<String>();
|
||||
} catch (e) {
|
||||
debugPrint('[SyncStatusController] Synced paths restore failed: $e');
|
||||
_syncedPaths = [];
|
||||
}
|
||||
} else {
|
||||
_syncedPaths = [];
|
||||
}
|
||||
final typesJson = prefs.getString(k(_prefSyncedPathTypes));
|
||||
if (typesJson != null) {
|
||||
try {
|
||||
_syncedPathTypes = (jsonDecode(typesJson) as Map).map(
|
||||
(k, v) => MapEntry(k as String, v as bool),
|
||||
);
|
||||
} catch (e) {
|
||||
debugPrint('[SyncStatusController] Synced path types restore failed: $e');
|
||||
_syncedPathTypes = {};
|
||||
}
|
||||
} else {
|
||||
_syncedPathTypes = {};
|
||||
}
|
||||
_syncEverything = prefs.getBool(k(prefSyncEverything)) ?? false;
|
||||
notifyListeners();
|
||||
} catch (e) {
|
||||
debugPrint('[SyncStatusController] Account-activation prefs restore failed: $e');
|
||||
}
|
||||
}
|
||||
// Only now is it safe for addSyncedPaths/removeSyncedPaths to mutate
|
||||
// and persist _syncedPaths - see _accountLoadedGate's doc comment.
|
||||
if (!_accountLoadedGate.isCompleted) _accountLoadedGate.complete();
|
||||
unawaited(SyncService.getStatus(id).then(_applySnapshot));
|
||||
|
||||
// Scheduling depends on the Files Cache policy, so wait for it to load
|
||||
// rather than scheduling from the defaults and correcting a moment later.
|
||||
await files.displayPrefsLoaded;
|
||||
_lastPolicy = files.cachePolicy;
|
||||
_lastInterval = files.cacheIntervalMinutes;
|
||||
unawaited(SyncService.reschedule(session, this));
|
||||
_restartAutoSyncTimer();
|
||||
if (_dueForAutoSync) unawaited(_autoSync());
|
||||
}
|
||||
|
||||
// ---- Automatic sync (see the class doc comment) ----
|
||||
|
||||
void _onFilesChanged() {
|
||||
// FilesController notifies on every navigation - only the cache rule
|
||||
// itself matters here.
|
||||
if (_lastPolicy == null) return; // account not activated yet
|
||||
final policy = files.cachePolicy;
|
||||
final interval = files.cacheIntervalMinutes;
|
||||
if (policy == _lastPolicy && interval == _lastInterval) return;
|
||||
_lastPolicy = policy;
|
||||
_lastInterval = interval;
|
||||
unawaited(SyncService.reschedule(session, this));
|
||||
_restartAutoSyncTimer();
|
||||
}
|
||||
|
||||
/// Whether an app-open/resume should kick off a pass under the current
|
||||
/// cache rule.
|
||||
bool get _dueForAutoSync {
|
||||
switch (files.cachePolicy) {
|
||||
case CachePolicy.never:
|
||||
return true;
|
||||
case CachePolicy.manual:
|
||||
return false;
|
||||
case CachePolicy.interval:
|
||||
final last = _lastAutoSyncAt;
|
||||
return last == null ||
|
||||
DateTime.now().difference(last) >=
|
||||
Duration(minutes: files.cacheIntervalMinutes);
|
||||
}
|
||||
}
|
||||
|
||||
void _restartAutoSyncTimer() {
|
||||
_autoSyncTimer?.cancel();
|
||||
if (!_foreground ||
|
||||
!_hasSyncScope ||
|
||||
files.cachePolicy != CachePolicy.interval) {
|
||||
return;
|
||||
}
|
||||
_autoSyncTimer = Timer.periodic(
|
||||
Duration(minutes: files.cacheIntervalMinutes),
|
||||
(_) => unawaited(_autoSync()),
|
||||
);
|
||||
}
|
||||
|
||||
/// A quiet, network-setting-respecting pass - see [SyncService.syncNow].
|
||||
Future<void> _autoSync() async {
|
||||
if (!_canSyncQuietly) return;
|
||||
_lastAutoSyncAt = DateTime.now();
|
||||
try {
|
||||
await SyncService.syncNow(
|
||||
session,
|
||||
this,
|
||||
force: false,
|
||||
respectNetworkSetting: true,
|
||||
);
|
||||
} catch (e) {
|
||||
debugPrint('[SyncStatusController] Automatic sync failed: $e');
|
||||
}
|
||||
}
|
||||
|
||||
/// A deliberate pull-to-refresh (any tab's sync header): check for server
|
||||
/// changes now, regardless of the cache rule or the Wi-Fi-only setting.
|
||||
Future<void> syncOnPull() async {
|
||||
if (!_canSyncQuietly) return;
|
||||
try {
|
||||
await SyncService.syncNow(session, this, force: false);
|
||||
} catch (e) {
|
||||
debugPrint('[SyncStatusController] Pull-triggered sync failed: $e');
|
||||
}
|
||||
}
|
||||
|
||||
bool get _canSyncQuietly =>
|
||||
_hasSyncScope &&
|
||||
!_isSyncingNow &&
|
||||
session.isLoggedIn &&
|
||||
!session.connectivity.isOffline;
|
||||
|
||||
@override
|
||||
void didChangeAppLifecycleState(AppLifecycleState state) {
|
||||
if (state == AppLifecycleState.resumed) {
|
||||
_foreground = true;
|
||||
_restartAutoSyncTimer();
|
||||
if (_dueForAutoSync) unawaited(_autoSync());
|
||||
} else if (state == AppLifecycleState.paused) {
|
||||
// The in-app timer only runs while foregrounded; WorkManager owns the
|
||||
// background schedule.
|
||||
_foreground = false;
|
||||
_autoSyncTimer?.cancel();
|
||||
}
|
||||
}
|
||||
|
||||
void _applySnapshot(SyncStatusSnapshot snapshot) {
|
||||
// A null accountId is the bus's initial "nothing has synced in this
|
||||
// process yet" emission on subscribe - applying it would wipe the
|
||||
// synced-file ids seeded by getStatus(accountId).
|
||||
if (snapshot.accountId == null ||
|
||||
snapshot.accountId != session.activeAccountId) {
|
||||
return;
|
||||
}
|
||||
_isSyncingNow = snapshot.syncing;
|
||||
_syncingFileIds = snapshot.syncingFileIds;
|
||||
_syncedFileIds = snapshot.syncedFileIds;
|
||||
_syncConflicts = snapshot.conflicts;
|
||||
notifyListeners();
|
||||
|
||||
// A synced file/folder deleted on the server has nothing left to sync -
|
||||
// drop it from the synced list rather than leaving a dead entry.
|
||||
final gone = snapshot.missingRoots.where(_syncedPaths.contains).toList();
|
||||
if (gone.isNotEmpty) unawaited(removeSyncedPaths(gone));
|
||||
}
|
||||
|
||||
void _persistSyncedPaths() {
|
||||
final id = session.activeAccountId;
|
||||
if (id == null) return;
|
||||
session.prefsFuture.then((p) {
|
||||
p.setString(
|
||||
session.accountStore.accountPrefKey(id, prefSyncedPaths),
|
||||
jsonEncode(_syncedPaths),
|
||||
);
|
||||
p.setString(
|
||||
session.accountStore.accountPrefKey(id, _prefSyncedPathTypes),
|
||||
jsonEncode(_syncedPathTypes),
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
bool isPathSynced(String path) => _syncedPaths.contains(path);
|
||||
|
||||
Future<void> addSyncedPath(String path, {required bool isFolder}) {
|
||||
return addSyncedPaths({path: isFolder});
|
||||
}
|
||||
|
||||
/// Adds every path in [entries] (path -> isFolder) to sync in one go -
|
||||
/// unlike calling [addSyncedPath] once per item in a loop, this touches
|
||||
/// `_syncedPaths`/persists/reschedules/triggers an immediate sync
|
||||
/// exactly once no matter how many paths are being added. Looping
|
||||
/// `addSyncedPath` from a multi-select "Sync to device" was the actual
|
||||
/// bug behind only the first selected item ever actually syncing: each
|
||||
/// call fired its own `SyncService.syncNow`, and WorkManager's
|
||||
/// `enqueueUniqueWork(..., ExistingWorkPolicy.REPLACE, ...)` policy
|
||||
/// meant each later call cancelled the previous item's still-in-flight
|
||||
/// sync pass (and could stomp on its `SyncEngine.saveState`, which
|
||||
/// overwrites the whole state map rather than merging) instead of
|
||||
/// letting it finish.
|
||||
Future<void> addSyncedPaths(Map<String, bool> entries) async {
|
||||
// Must not mutate/persist _syncedPaths before the per-account load
|
||||
// has actually populated it - see _accountLoadedGate's doc comment.
|
||||
await _accountLoadedGate.future;
|
||||
var changed = false;
|
||||
entries.forEach((path, isFolder) {
|
||||
if (_syncedPaths.contains(path)) return;
|
||||
_syncedPaths = [..._syncedPaths, path];
|
||||
_syncedPathTypes = {..._syncedPathTypes, path: isFolder};
|
||||
changed = true;
|
||||
});
|
||||
if (!changed) return;
|
||||
notifyListeners();
|
||||
_persistSyncedPaths();
|
||||
unawaited(SyncService.reschedule(session, this));
|
||||
_restartAutoSyncTimer();
|
||||
// `reschedule` alone only lines up the *periodic* job, which can be up
|
||||
// to an hour away from its first run - without an immediate one-off
|
||||
// sync here too, newly-added items would just sit unsynced until the
|
||||
// user thought to trigger one manually (e.g. pulling to refresh on
|
||||
// the Offline tab).
|
||||
unawaited(_syncNowSilently());
|
||||
}
|
||||
|
||||
/// Unsyncs [path] and deletes its already-downloaded local mirror (see
|
||||
/// `SyncService.removeLocalSync`) - stopping sync alone would leave
|
||||
/// whatever had already been downloaded sitting on disk indefinitely.
|
||||
Future<void> removeSyncedPath(String path) {
|
||||
return removeSyncedPaths([path]);
|
||||
}
|
||||
|
||||
/// Batched counterpart to [removeSyncedPath] - see [addSyncedPaths]'s
|
||||
/// doc comment for why a multi-item loop of individual calls is unsafe
|
||||
/// for `reschedule`/native side effects, even though removal itself
|
||||
/// (unlike adding) doesn't trigger a one-off sync to race.
|
||||
Future<void> removeSyncedPaths(List<String> paths) async {
|
||||
await _accountLoadedGate.future;
|
||||
var changed = false;
|
||||
for (final path in paths) {
|
||||
if (!_syncedPaths.contains(path)) continue;
|
||||
_syncedPaths = _syncedPaths.where((f) => f != path).toList();
|
||||
_syncedPathTypes = {..._syncedPathTypes}..remove(path);
|
||||
changed = true;
|
||||
}
|
||||
if (!changed) return;
|
||||
notifyListeners();
|
||||
_persistSyncedPaths();
|
||||
unawaited(SyncService.reschedule(session, this));
|
||||
_restartAutoSyncTimer();
|
||||
for (final path in paths) {
|
||||
unawaited(SyncService.removeLocalSync(session, path));
|
||||
}
|
||||
}
|
||||
|
||||
void setSyncEverything(bool value) {
|
||||
if (_syncEverything == value) return;
|
||||
_syncEverything = value;
|
||||
notifyListeners();
|
||||
final id = session.activeAccountId;
|
||||
if (id != null) {
|
||||
session.prefsFuture.then(
|
||||
(p) => p.setBool(
|
||||
session.accountStore.accountPrefKey(id, prefSyncEverything),
|
||||
value,
|
||||
),
|
||||
);
|
||||
}
|
||||
unawaited(SyncService.reschedule(session, this));
|
||||
_restartAutoSyncTimer();
|
||||
if (value) unawaited(_syncNowSilently());
|
||||
}
|
||||
|
||||
void setSyncNotifications(bool value) {
|
||||
if (_syncNotifications == value) return;
|
||||
_syncNotifications = value;
|
||||
notifyListeners();
|
||||
session.prefsFuture.then((p) => p.setBool(_prefSyncNotifications, value));
|
||||
// Baked into each periodic job's input, so the jobs have to be
|
||||
// re-enqueued for the change to reach background runs.
|
||||
unawaited(SyncService.reschedule(session, this));
|
||||
}
|
||||
|
||||
void setSyncOnCellular(bool value) {
|
||||
if (_syncOnCellular == value) return;
|
||||
_syncOnCellular = value;
|
||||
notifyListeners();
|
||||
session.prefsFuture.then((p) => p.setBool(_prefSyncOnCellular, value));
|
||||
unawaited(SyncService.reschedule(session, this));
|
||||
}
|
||||
|
||||
/// Fire-and-forget immediate sync, swallowing errors - called right
|
||||
/// after turning sync on for something (see [addSyncedPath]/
|
||||
/// [setSyncEverything]) so it actually starts syncing now instead of
|
||||
/// only ever running on the next periodic pass or a manual "Sync now".
|
||||
Future<void> _syncNowSilently() async {
|
||||
try {
|
||||
await SyncService.syncNow(session, this);
|
||||
} catch (e) {
|
||||
debugPrint('[SyncStatusController] Immediate sync failed: $e');
|
||||
}
|
||||
}
|
||||
|
||||
/// In-app conflict resolution (the sync header's "Keep local"/"Use
|
||||
/// server" buttons) - see `SyncService.resolveConflict`'s doc comment
|
||||
/// for why this shares the exact same native path the notification
|
||||
/// actions use.
|
||||
Future<void> resolveSyncConflict(
|
||||
SyncConflictInfo conflict, {
|
||||
required bool useLocal,
|
||||
}) {
|
||||
return SyncService.resolveConflict(
|
||||
session,
|
||||
conflict,
|
||||
useLocal ? 'local' : 'server',
|
||||
);
|
||||
}
|
||||
|
||||
/// The local mirror path for [item] if it falls under a synced folder
|
||||
/// *and* has actually been synced down already - a pure function of the
|
||||
/// remote path once a folder's marked synced (mirrors
|
||||
/// `SyncEngine.kt#syncRoot`'s `<externalFilesDir>/sync/<accountId>/...`
|
||||
/// layout exactly), so this never needs to read the native sync-state
|
||||
/// SharedPreferences from Dart. Callers (Share/Download) use this to
|
||||
/// skip a fresh WebDAV fetch when a local copy already exists.
|
||||
Future<String?> localSyncedFilePath(NextcloudItem item) async {
|
||||
final id = session.activeAccountId;
|
||||
if (id == null) return null;
|
||||
if (!_isPathInSyncScope(item.path)) return null;
|
||||
return SyncService.localSyncedFilePath(id, item.path);
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
WidgetsBinding.instance.removeObserver(this);
|
||||
files.removeListener(_onFilesChanged);
|
||||
_autoSyncTimer?.cancel();
|
||||
_statusSub?.cancel();
|
||||
super.dispose();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,84 @@
|
||||
import 'dart:async';
|
||||
import 'package:flutter/material.dart';
|
||||
import '../models/nextcloud_item.dart';
|
||||
import 'session_controller.dart';
|
||||
|
||||
/// The Trash tab. Kept separate from Files' own loading/error state so a
|
||||
/// trash-fetch failure can't bleed a stale error into Files.
|
||||
class TrashController extends ChangeNotifier {
|
||||
final SessionController session;
|
||||
|
||||
List<NextcloudItem> _items = [];
|
||||
bool _isLoading = false;
|
||||
String? _errorMessage;
|
||||
|
||||
TrashController(this.session) {
|
||||
session.addAccountClearedListener(_onAccountCleared);
|
||||
session.addAccountActivatedListener(_onAccountActivated);
|
||||
}
|
||||
|
||||
List<NextcloudItem> get items => _items;
|
||||
bool get isLoading => _isLoading;
|
||||
String? get errorMessage => _errorMessage;
|
||||
|
||||
void _onAccountCleared() {
|
||||
_items = [];
|
||||
_isLoading = false;
|
||||
_errorMessage = null;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
void _onAccountActivated() {
|
||||
unawaited(fetchAll());
|
||||
}
|
||||
|
||||
Future<void> fetchAll() async {
|
||||
final service = session.service;
|
||||
if (!session.isLoggedIn || service == null) return;
|
||||
final gen = session.sessionGeneration;
|
||||
|
||||
_isLoading = true;
|
||||
_errorMessage = null;
|
||||
notifyListeners();
|
||||
|
||||
try {
|
||||
final trash = await service.fetchTrash();
|
||||
if (gen != session.sessionGeneration) return;
|
||||
_items = trash;
|
||||
} catch (e) {
|
||||
if (gen != session.sessionGeneration) return;
|
||||
debugPrint('[TrashController] Error fetching trash: $e');
|
||||
_errorMessage = e.toString().replaceAll('Exception: ', '');
|
||||
} finally {
|
||||
if (gen == session.sessionGeneration) {
|
||||
_isLoading = false;
|
||||
notifyListeners();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Restores a trashed item (identified by [NextcloudItem.path], the
|
||||
/// trash-relative name) back to where it was deleted from.
|
||||
Future<bool> restore(NextcloudItem item) async {
|
||||
final service = session.service;
|
||||
if (service == null) return false;
|
||||
final success = await service.restoreTrashItem(item.path);
|
||||
if (success) {
|
||||
_items = _items.where((i) => i.id != item.id).toList();
|
||||
notifyListeners();
|
||||
}
|
||||
return success;
|
||||
}
|
||||
|
||||
/// Permanently deletes a trashed item. Cannot be undone.
|
||||
Future<bool> deleteForever(NextcloudItem item) async {
|
||||
final service = session.service;
|
||||
if (service == null) return false;
|
||||
final success = await service.deleteTrashItemForever(item.path);
|
||||
if (success) {
|
||||
_items = _items.where((i) => i.id != item.id).toList();
|
||||
notifyListeners();
|
||||
}
|
||||
return success;
|
||||
}
|
||||
}
|
||||
@@ -20,6 +20,7 @@ class AccountStore {
|
||||
static const _prefAccountsList = 'accounts_list';
|
||||
static const _prefActiveAccountId = 'active_account_id';
|
||||
static const _prefMigrationDone = 'account_migration_v1_done';
|
||||
static const _prefSignedOutAccounts = 'signed_out_account_ids';
|
||||
|
||||
/// The per-account browsing prefs that get namespaced under
|
||||
/// `acct_<id>_<key>` on migration/save - everything else (theme, tab
|
||||
@@ -27,7 +28,6 @@ class AccountStore {
|
||||
/// by account switching.
|
||||
static const perAccountPrefKeys = [
|
||||
'ui_grid_view',
|
||||
'ui_show_favorites_only',
|
||||
'ui_show_favorites_only_photos',
|
||||
'ui_storage_scope',
|
||||
'ui_show_hidden',
|
||||
@@ -35,8 +35,12 @@ class AccountStore {
|
||||
'ui_sort_field',
|
||||
'ui_sort_ascending',
|
||||
'ui_folder_sort',
|
||||
'ui_files_type_filter',
|
||||
'ui_cache_policy',
|
||||
'ui_cache_interval_minutes',
|
||||
'ui_synced_folders',
|
||||
'ui_synced_folder_types',
|
||||
'ui_sync_everything',
|
||||
];
|
||||
|
||||
String accountPrefKey(String accountId, String baseKey) =>
|
||||
@@ -127,6 +131,24 @@ class AccountStore {
|
||||
}
|
||||
}
|
||||
|
||||
/// Accounts the user explicitly logged out of. They stay saved (password
|
||||
/// and prefs intact, resumable from the login screen) but are treated as
|
||||
/// signed out - notably, they don't sync in the background. Cleared again
|
||||
/// the moment the account is activated.
|
||||
Set<String> loadSignedOut(SharedPreferences prefs) =>
|
||||
(prefs.getStringList(_prefSignedOutAccounts) ?? const []).toSet();
|
||||
|
||||
Future<void> setSignedOut(
|
||||
SharedPreferences prefs,
|
||||
String accountId,
|
||||
bool signedOut,
|
||||
) async {
|
||||
final current = loadSignedOut(prefs);
|
||||
final changed = signedOut ? current.add(accountId) : current.remove(accountId);
|
||||
if (!changed) return;
|
||||
await prefs.setStringList(_prefSignedOutAccounts, current.toList());
|
||||
}
|
||||
|
||||
Future<String?> readPassword(String accountId) =>
|
||||
_storage.read(key: '$_passwordKeyPrefix$accountId');
|
||||
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
import 'dart:convert';
|
||||
import 'package:flutter/services.dart';
|
||||
import '../models/nextcloud_item.dart';
|
||||
import '../providers/session_controller.dart';
|
||||
import 'native_channel.dart';
|
||||
|
||||
/// Hands a download off to `DownloadService.kt`'s Android foreground
|
||||
/// service - the download counterpart of `UploadService`/
|
||||
/// `ShareUploadService.kt` (see that pair's doc comments for why this
|
||||
/// isn't done in Dart/Dio: only a real Android Service survives the
|
||||
/// Flutter engine/Activity being gone, the same guarantee a real
|
||||
/// file-manager app's download notification gives you). Saves straight
|
||||
/// into the device's public Downloads folder with one cancellable
|
||||
/// progress notification for the whole batch, instead of the old
|
||||
/// download-to-app-cache-then-`file_saver`-prompt flow.
|
||||
class DownloadService {
|
||||
static const _channel = MethodChannel('dev.ayushya.noo/download_service');
|
||||
|
||||
/// Starts downloading [items]. Fire-and-forget from Dart's perspective -
|
||||
/// once this returns, the service owns the rest and reports
|
||||
/// progress/completion/cancellation through its own notification, not
|
||||
/// back to the app.
|
||||
static Future<void> startDownload(
|
||||
SessionController session,
|
||||
List<NextcloudItem> items,
|
||||
) async {
|
||||
final args = baseChannelArgs(session);
|
||||
final filesJson = jsonEncode(
|
||||
items
|
||||
.map(
|
||||
(i) => {
|
||||
'path': i.path,
|
||||
'name': i.name,
|
||||
'mimeType': i.mimeType,
|
||||
'size': i.size,
|
||||
},
|
||||
)
|
||||
.toList(),
|
||||
);
|
||||
|
||||
await _channel.invokeMethod('startDownload', {...args, 'files': filesJson});
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
import '../providers/session_controller.dart';
|
||||
|
||||
/// The "get this account's auth header, or bail" guard every native-
|
||||
/// MethodChannel service (`UploadService`/`DownloadService`/`SyncService`)
|
||||
/// needs before handing a batch off to Kotlin - was independently repeated
|
||||
/// in each of them.
|
||||
String requireAuthHeader(SessionController session) {
|
||||
final authHeader = session.service?.authHeaders['Authorization'];
|
||||
if (session.service == null || authHeader == null) {
|
||||
throw Exception('Not logged in.');
|
||||
}
|
||||
return authHeader;
|
||||
}
|
||||
|
||||
/// The `{serverUrl, username, authHeader}` trio every one of those
|
||||
/// services' `invokeMethod` argument maps includes.
|
||||
Map<String, String> baseChannelArgs(SessionController session) {
|
||||
return {
|
||||
'serverUrl': session.serverUrl,
|
||||
'username': session.username,
|
||||
'authHeader': requireAuthHeader(session),
|
||||
};
|
||||
}
|
||||
@@ -699,6 +699,170 @@ class NextcloudService {
|
||||
return results;
|
||||
}
|
||||
|
||||
/// Finds every favorited file/folder anywhere in the account (not just
|
||||
/// the currently browsed folder) via the same WebDAV SEARCH-REPORT
|
||||
/// mechanism as [fetchAllMedia], filtered by `oc:favorite` instead of
|
||||
/// mimetype. Used by the Files tab's favorites-only toggle: filtering
|
||||
/// should still be strict (only favorited items), but the *scope* is the
|
||||
/// whole account, not whatever folder happens to be open - otherwise a
|
||||
/// favorited item nested a few folders down would never show up just
|
||||
/// because its parent folders aren't favorited themselves.
|
||||
Future<List<NextcloudItem>> fetchFavorites() async {
|
||||
final url = '$_cleanServerUrl/remote.php/dav/';
|
||||
debugPrint('[Nextcloud DAV] SEARCH for favorites from $url');
|
||||
|
||||
final body =
|
||||
'''<?xml version="1.0" encoding="utf-8" ?>
|
||||
<d:searchrequest xmlns:d="DAV:" xmlns:oc="http://owncloud.org/ns" xmlns:nc="http://nextcloud.org/ns">
|
||||
<d:basicsearch>
|
||||
<d:select>
|
||||
<d:prop>
|
||||
<d:displayname/>
|
||||
<d:getcontentlength/>
|
||||
<d:getlastmodified/>
|
||||
<d:creationdate/>
|
||||
<d:getcontenttype/>
|
||||
<d:resourcetype/>
|
||||
<oc:favorite/>
|
||||
<oc:fileid/>
|
||||
<nc:mount-type/>
|
||||
</d:prop>
|
||||
</d:select>
|
||||
<d:from>
|
||||
<d:scope>
|
||||
<d:href>/files/$username</d:href>
|
||||
<d:depth>infinity</d:depth>
|
||||
</d:scope>
|
||||
</d:from>
|
||||
<d:where>
|
||||
<d:eq>
|
||||
<d:prop><oc:favorite/></d:prop>
|
||||
<d:literal>1</d:literal>
|
||||
</d:eq>
|
||||
</d:where>
|
||||
<d:orderby>
|
||||
<d:order>
|
||||
<d:prop><d:displayname/></d:prop>
|
||||
<d:ascending/>
|
||||
</d:order>
|
||||
</d:orderby>
|
||||
</d:basicsearch>
|
||||
</d:searchrequest>''';
|
||||
|
||||
final request = http.Request('SEARCH', Uri.parse(url))
|
||||
..headers.addAll({..._headers, 'Content-Type': 'text/xml'})
|
||||
..body = body;
|
||||
|
||||
final streamed = await http.Client().send(request);
|
||||
final responseBody = await streamed.stream.bytesToString();
|
||||
debugPrint(
|
||||
'[Nextcloud DAV] Favorites SEARCH status: ${streamed.statusCode}, bytes: ${responseBody.length}',
|
||||
);
|
||||
|
||||
if (streamed.statusCode != 207 && streamed.statusCode != 200) {
|
||||
throw Exception('Failed to load favorites. HTTP ${streamed.statusCode}');
|
||||
}
|
||||
|
||||
final document = xml.XmlDocument.parse(responseBody);
|
||||
final responses = document.findLocalDescendants('response');
|
||||
|
||||
final results = <NextcloudItem>[];
|
||||
for (var res in responses) {
|
||||
final hrefNode =
|
||||
res.findLocalChildren('href').firstOrNull ??
|
||||
res.findLocalDescendants('href').firstOrNull;
|
||||
final href = hrefNode?.innerText ?? '';
|
||||
if (href.isEmpty) continue;
|
||||
|
||||
final props = res.findLocalDescendants('prop');
|
||||
if (props.isEmpty) continue;
|
||||
|
||||
bool isCollection = false;
|
||||
String? sizeStr;
|
||||
String? lastModStr;
|
||||
String? createdStr;
|
||||
String? mimeType;
|
||||
String? fileId;
|
||||
String? mountType;
|
||||
|
||||
for (var prop in props) {
|
||||
if (!isCollection) {
|
||||
final resTypeNode = prop
|
||||
.findLocalChildren('resourcetype')
|
||||
.firstOrNull;
|
||||
if (resTypeNode != null &&
|
||||
resTypeNode.findLocalChildren('collection').isNotEmpty) {
|
||||
isCollection = true;
|
||||
}
|
||||
}
|
||||
sizeStr ??= prop
|
||||
.findLocalChildren('getcontentlength')
|
||||
.firstOrNull
|
||||
?.innerText;
|
||||
lastModStr ??= prop
|
||||
.findLocalChildren('getlastmodified')
|
||||
.firstOrNull
|
||||
?.innerText;
|
||||
createdStr ??= prop
|
||||
.findLocalChildren('creationdate')
|
||||
.firstOrNull
|
||||
?.innerText;
|
||||
mimeType ??= prop
|
||||
.findLocalChildren('getcontenttype')
|
||||
.firstOrNull
|
||||
?.innerText;
|
||||
fileId ??= prop.findLocalChildren('fileid').firstOrNull?.innerText;
|
||||
mountType ??= prop
|
||||
.findLocalChildren('mount-type')
|
||||
.firstOrNull
|
||||
?.innerText;
|
||||
}
|
||||
|
||||
var decodedHref = Uri.decodeFull(href);
|
||||
if (decodedHref.endsWith('/') && decodedHref.length > 1) {
|
||||
decodedHref = decodedHref.substring(0, decodedHref.length - 1);
|
||||
}
|
||||
final name = decodedHref.split('/').where((s) => s.isNotEmpty).last;
|
||||
if (name.isEmpty) continue;
|
||||
|
||||
// Strip the DAV root prefix so `path` matches what fetchDirectory produces.
|
||||
final marker = '/files/$username';
|
||||
final markerIndex = decodedHref.indexOf(marker);
|
||||
final itemPath = markerIndex >= 0
|
||||
? decodedHref.substring(markerIndex + marker.length)
|
||||
: decodedHref;
|
||||
if (itemPath.isEmpty) continue;
|
||||
|
||||
final size = int.tryParse(sizeStr ?? '0') ?? 0;
|
||||
final lastMod = _parseDavDate(lastModStr) ?? DateTime.now();
|
||||
final created = _parseDavDate(createdStr);
|
||||
final itemType = NextcloudItem.deduceType(name, isCollection, mimeType);
|
||||
final validId = (fileId != null && fileId.isNotEmpty) ? fileId : name;
|
||||
|
||||
results.add(
|
||||
NextcloudItem(
|
||||
id: validId,
|
||||
name: name,
|
||||
path: itemPath,
|
||||
type: itemType,
|
||||
size: size,
|
||||
lastModified: lastMod,
|
||||
dateCreated: created,
|
||||
isFavorite: true,
|
||||
mimeType: mimeType,
|
||||
previewUrl:
|
||||
'$_cleanServerUrl/core/preview?fileId=$validId&x=500&y=500',
|
||||
mountType: mountType,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
debugPrint(
|
||||
'[Nextcloud DAV] Favorites SEARCH found ${results.length} items',
|
||||
);
|
||||
return results;
|
||||
}
|
||||
|
||||
/// Finds recently modified files across the whole account (folders
|
||||
/// excluded), newest first — same SEARCH-REPORT mechanism as
|
||||
/// [fetchAllMedia], just without the image/video mimetype filter.
|
||||
@@ -939,44 +1103,6 @@ class NextcloudService {
|
||||
return [];
|
||||
}
|
||||
|
||||
/// Uploads a file from disk, streaming it so large files don't need to be
|
||||
/// buffered fully in memory, with progress reporting.
|
||||
Future<bool> uploadFileFromPath(
|
||||
String folderPath,
|
||||
String fileName,
|
||||
String localFilePath, {
|
||||
void Function(int sent, int total)? onProgress,
|
||||
}) async {
|
||||
var cleanPath = folderPath.trim();
|
||||
if (!cleanPath.startsWith('/')) cleanPath = '/$cleanPath';
|
||||
if (!cleanPath.endsWith('/')) cleanPath = '$cleanPath/';
|
||||
|
||||
final url =
|
||||
'$_cleanServerUrl/remote.php/dav/files/$username$cleanPath$fileName';
|
||||
debugPrint('[Nextcloud DAV] Streaming upload to $url');
|
||||
|
||||
final file = File(localFilePath);
|
||||
final length = await file.length();
|
||||
final dio = Dio();
|
||||
|
||||
final response = await dio.put<void>(
|
||||
url,
|
||||
data: file.openRead(),
|
||||
options: Options(
|
||||
headers: {..._headers, Headers.contentLengthHeader: length},
|
||||
contentType: 'application/octet-stream',
|
||||
),
|
||||
onSendProgress: onProgress,
|
||||
);
|
||||
|
||||
debugPrint(
|
||||
'[Nextcloud DAV] Streaming upload status: ${response.statusCode}',
|
||||
);
|
||||
return response.statusCode == 201 ||
|
||||
response.statusCode == 204 ||
|
||||
response.statusCode == 200;
|
||||
}
|
||||
|
||||
Future<bool> deleteItem(String itemPath) async {
|
||||
var cleanPath = itemPath.trim();
|
||||
if (!cleanPath.startsWith('/')) cleanPath = '/$cleanPath';
|
||||
@@ -989,6 +1115,43 @@ class NextcloudService {
|
||||
return response.statusCode == 204 || response.statusCode == 200;
|
||||
}
|
||||
|
||||
/// Shared MOVE/COPY request - WebDAV COPY is the same shape as the MOVE
|
||||
/// [renameItem] uses, just a different verb and a caller-controlled
|
||||
/// `Overwrite` rather than always forced off. Returns the raw HTTP status
|
||||
/// rather than a bool so callers can tell a conflict (412 - only
|
||||
/// possible when `overwrite` is false) apart from any other failure
|
||||
/// without a separate existence-check request per item.
|
||||
Future<int> _moveOrCopy(
|
||||
String sourcePath,
|
||||
String destPath, {
|
||||
required bool copy,
|
||||
required bool overwrite,
|
||||
}) async {
|
||||
var cleanSource = sourcePath.trim();
|
||||
if (!cleanSource.startsWith('/')) cleanSource = '/$cleanSource';
|
||||
var cleanDest = destPath.trim();
|
||||
if (!cleanDest.startsWith('/')) cleanDest = '/$cleanDest';
|
||||
|
||||
final sourceUrl =
|
||||
'$_cleanServerUrl/remote.php/dav/files/$username$cleanSource';
|
||||
final destUrl = '$_cleanServerUrl/remote.php/dav/files/$username$cleanDest';
|
||||
debugPrint(
|
||||
'[Nextcloud DAV] ${copy ? 'Copying' : 'Moving'} $sourceUrl -> $destUrl',
|
||||
);
|
||||
|
||||
final request = http.Request(copy ? 'COPY' : 'MOVE', Uri.parse(sourceUrl))
|
||||
..headers.addAll({
|
||||
..._headers,
|
||||
'Destination': Uri.encodeFull(destUrl),
|
||||
'Overwrite': overwrite ? 'T' : 'F',
|
||||
});
|
||||
final response = await http.Client().send(request);
|
||||
debugPrint(
|
||||
'[Nextcloud DAV] ${copy ? 'Copy' : 'Move'} status: ${response.statusCode}',
|
||||
);
|
||||
return response.statusCode;
|
||||
}
|
||||
|
||||
/// Renames (or moves within the same folder) an item via WebDAV MOVE.
|
||||
Future<bool> renameItem(String itemPath, String newName) async {
|
||||
var cleanPath = itemPath.trim();
|
||||
@@ -997,20 +1160,75 @@ class NextcloudService {
|
||||
final segments = cleanPath.split('/')..removeLast();
|
||||
final destPath = '${segments.join('/')}/$newName';
|
||||
|
||||
final sourceUrl =
|
||||
'$_cleanServerUrl/remote.php/dav/files/$username$cleanPath';
|
||||
final destUrl = '$_cleanServerUrl/remote.php/dav/files/$username$destPath';
|
||||
debugPrint('[Nextcloud DAV] Renaming $sourceUrl -> $destUrl');
|
||||
final status = await _moveOrCopy(
|
||||
cleanPath,
|
||||
destPath,
|
||||
copy: false,
|
||||
overwrite: false,
|
||||
);
|
||||
return status == 201 || status == 204;
|
||||
}
|
||||
|
||||
final request = http.Request('MOVE', Uri.parse(sourceUrl))
|
||||
..headers.addAll({
|
||||
..._headers,
|
||||
'Destination': Uri.encodeFull(destUrl),
|
||||
'Overwrite': 'F',
|
||||
});
|
||||
final response = await http.Client().send(request);
|
||||
debugPrint('[Nextcloud DAV] Rename status: ${response.statusCode}');
|
||||
return response.statusCode == 201 || response.statusCode == 204;
|
||||
Future<int> _moveOrCopyToFolder(
|
||||
String itemPath,
|
||||
String destFolderPath, {
|
||||
required bool copy,
|
||||
required bool overwrite,
|
||||
String? newName,
|
||||
}) {
|
||||
var cleanPath = itemPath.trim();
|
||||
if (!cleanPath.startsWith('/')) cleanPath = '/$cleanPath';
|
||||
final name = newName ?? cleanPath.split('/').last;
|
||||
|
||||
var cleanDestFolder = destFolderPath.trim();
|
||||
if (!cleanDestFolder.startsWith('/')) cleanDestFolder = '/$cleanDestFolder';
|
||||
if (cleanDestFolder.endsWith('/') && cleanDestFolder != '/') {
|
||||
cleanDestFolder = cleanDestFolder.substring(
|
||||
0,
|
||||
cleanDestFolder.length - 1,
|
||||
);
|
||||
}
|
||||
final destPath = cleanDestFolder == '/'
|
||||
? '/$name'
|
||||
: '$cleanDestFolder/$name';
|
||||
return _moveOrCopy(cleanPath, destPath, copy: copy, overwrite: overwrite);
|
||||
}
|
||||
|
||||
/// Moves [itemPath] into [destFolderPath], keeping its current filename
|
||||
/// unless [newName] is given (used to resolve a "keep both" conflict
|
||||
/// with a renamed destination). Returns the raw HTTP status - 201/204
|
||||
/// success, 412 means an item with the same name already exists there
|
||||
/// ([overwrite] was false).
|
||||
Future<int> moveItem(
|
||||
String itemPath,
|
||||
String destFolderPath, {
|
||||
bool overwrite = false,
|
||||
String? newName,
|
||||
}) {
|
||||
return _moveOrCopyToFolder(
|
||||
itemPath,
|
||||
destFolderPath,
|
||||
copy: false,
|
||||
overwrite: overwrite,
|
||||
newName: newName,
|
||||
);
|
||||
}
|
||||
|
||||
/// Same as [moveItem] but duplicates the item instead of relocating it -
|
||||
/// WebDAV COPY, recursive for folders by default just like MOVE.
|
||||
Future<int> copyItem(
|
||||
String itemPath,
|
||||
String destFolderPath, {
|
||||
bool overwrite = false,
|
||||
String? newName,
|
||||
}) {
|
||||
return _moveOrCopyToFolder(
|
||||
itemPath,
|
||||
destFolderPath,
|
||||
copy: true,
|
||||
overwrite: overwrite,
|
||||
newName: newName,
|
||||
);
|
||||
}
|
||||
|
||||
Future<bool> createFolder(String parentPath, String folderName) async {
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
import 'package:flutter/services.dart';
|
||||
import '../models/pick_request.dart';
|
||||
|
||||
/// Talks to `MainActivity.kt`'s hand-rolled GET_CONTENT picker handling
|
||||
/// (mirrors `ShareIntentService`'s split between a cold-start check and a
|
||||
/// stream for an intent arriving while the app is already running - the
|
||||
/// same `singleTask` launch mode applies here).
|
||||
class PickIntentService {
|
||||
static const _methodChannel = MethodChannel('dev.ayushya.noo/pick_intent');
|
||||
static const _newPickChannel = EventChannel(
|
||||
'dev.ayushya.noo/pick_intent/new',
|
||||
);
|
||||
|
||||
/// Non-null if the app was launched cold as another app's file/photo
|
||||
/// picker.
|
||||
static Future<PickRequest?> getPickRequest() async {
|
||||
final result = await _methodChannel.invokeMethod<Map<dynamic, dynamic>>(
|
||||
'getPickRequest',
|
||||
);
|
||||
return result == null ? null : PickRequest.fromMap(result);
|
||||
}
|
||||
|
||||
/// Emits whenever the app is asked to act as a picker while already
|
||||
/// running.
|
||||
static Stream<PickRequest> get onNewPickRequest {
|
||||
return _newPickChannel.receiveBroadcastStream().map(
|
||||
(event) => PickRequest.fromMap(event as Map<dynamic, dynamic>),
|
||||
);
|
||||
}
|
||||
|
||||
/// Hands the already-downloaded local files back to the caller and closes
|
||||
/// the picker. [mimeTypes] is parallel to [localPaths].
|
||||
static Future<void> finishPick(
|
||||
List<String> localPaths,
|
||||
List<String> mimeTypes,
|
||||
) {
|
||||
return _methodChannel.invokeMethod('finishPick', {
|
||||
'paths': localPaths,
|
||||
'mimeTypes': mimeTypes,
|
||||
});
|
||||
}
|
||||
|
||||
/// Backs out of picking mode with no result, closing the picker.
|
||||
static Future<void> cancelPick() {
|
||||
return _methodChannel.invokeMethod('cancelPick');
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,61 @@
|
||||
import 'package:flutter/services.dart';
|
||||
|
||||
/// A file shared to Noo from another app's "Share to..." sheet, before its
|
||||
/// bytes have been touched - just the `content://` Uri and whatever cheap
|
||||
/// metadata Android will hand over without reading the file itself.
|
||||
class SharedFileRef {
|
||||
final String uri;
|
||||
final String name;
|
||||
final String? mimeType;
|
||||
final int? size;
|
||||
|
||||
const SharedFileRef({
|
||||
required this.uri,
|
||||
required this.name,
|
||||
this.mimeType,
|
||||
this.size,
|
||||
});
|
||||
|
||||
factory SharedFileRef.fromMap(Map<dynamic, dynamic> map) {
|
||||
return SharedFileRef(
|
||||
uri: map['uri'] as String,
|
||||
name: map['name'] as String? ?? 'shared_file',
|
||||
mimeType: map['mimeType'] as String?,
|
||||
size: (map['size'] as num?)?.toInt(),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/// Talks to `MainActivity.kt`'s hand-rolled share-intent handling (see its
|
||||
/// doc comment for why this isn't the receive_sharing_intent plugin): it
|
||||
/// only ever exposes cheap Uri metadata up front. Actually reading a shared
|
||||
/// file's bytes - preparing and uploading it - is [UploadService]'s job
|
||||
/// (`ShareUploadService.kt`'s Android foreground service), not this one.
|
||||
class ShareIntentService {
|
||||
static const _methodChannel = MethodChannel('dev.ayushya.noo/share_intent');
|
||||
static const _newShareChannel = EventChannel(
|
||||
'dev.ayushya.noo/share_intent/new',
|
||||
);
|
||||
|
||||
/// Whatever was shared to launch the app cold (empty if it was launched
|
||||
/// normally, not via a share).
|
||||
static Future<List<SharedFileRef>> getInitialShare() async {
|
||||
final result = await _methodChannel.invokeMethod<List<dynamic>>(
|
||||
'getInitialShare',
|
||||
);
|
||||
return (result ?? [])
|
||||
.cast<Map<dynamic, dynamic>>()
|
||||
.map(SharedFileRef.fromMap)
|
||||
.toList();
|
||||
}
|
||||
|
||||
/// Emits whenever another share arrives while the app is already running.
|
||||
static Stream<List<SharedFileRef>> get onNewShare {
|
||||
return _newShareChannel.receiveBroadcastStream().map((event) {
|
||||
return (event as List<dynamic>)
|
||||
.cast<Map<dynamic, dynamic>>()
|
||||
.map(SharedFileRef.fromMap)
|
||||
.toList();
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,325 @@
|
||||
import 'dart:convert';
|
||||
import 'dart:io';
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:path/path.dart' as p;
|
||||
import 'package:shared_preferences/shared_preferences.dart';
|
||||
import 'package:path_provider/path_provider.dart';
|
||||
import '../models/sync_status.dart';
|
||||
import '../models/saved_account.dart';
|
||||
import '../providers/files_controller.dart';
|
||||
import '../providers/session_controller.dart';
|
||||
import '../providers/sync_status_controller.dart';
|
||||
|
||||
/// A snapshot of native device-sync status - see `SyncStatusBus.kt` (the
|
||||
/// in-process pub/sub it mirrors) and `MainActivity.kt`'s `syncStatusMap`.
|
||||
class SyncStatusSnapshot {
|
||||
final String? accountId;
|
||||
final bool syncing;
|
||||
final Set<String> syncingFileIds;
|
||||
final Set<String> syncedFileIds;
|
||||
final List<SyncConflictInfo> conflicts;
|
||||
|
||||
/// Configured sync paths the server says no longer exist (deleted on the
|
||||
/// web) - the app drops them from its synced list.
|
||||
final Set<String> missingRoots;
|
||||
|
||||
const SyncStatusSnapshot({
|
||||
required this.accountId,
|
||||
required this.syncing,
|
||||
required this.syncingFileIds,
|
||||
required this.syncedFileIds,
|
||||
required this.conflicts,
|
||||
this.missingRoots = const {},
|
||||
});
|
||||
|
||||
factory SyncStatusSnapshot.fromMap(Map<dynamic, dynamic> map) {
|
||||
return SyncStatusSnapshot(
|
||||
accountId: map['accountId'] as String?,
|
||||
syncing: map['syncing'] as bool? ?? false,
|
||||
syncingFileIds: ((map['syncingFileIds'] as List?) ?? const [])
|
||||
.cast<String>()
|
||||
.toSet(),
|
||||
syncedFileIds: ((map['syncedFileIds'] as List?) ?? const [])
|
||||
.cast<String>()
|
||||
.toSet(),
|
||||
conflicts: ((map['conflicts'] as List?) ?? const [])
|
||||
.cast<Map<dynamic, dynamic>>()
|
||||
.map(SyncConflictInfo.fromMap)
|
||||
.toList(),
|
||||
missingRoots: ((map['missingRoots'] as List?) ?? const [])
|
||||
.cast<String>()
|
||||
.toSet(),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/// Talks to `SyncWorker`/`SyncEngine.kt`'s Android WorkManager-based device
|
||||
/// sync (see `server.md`'s "Device sync" section for the full design) -
|
||||
/// Dart's job here is only to gather what the native side needs, push a
|
||||
/// fresh config whenever it changes, and listen for live status; the actual
|
||||
/// PROPFIND-walk/diff/GET/PUT engine runs entirely in Kotlin, independent
|
||||
/// of the Flutter engine. Takes [SessionController]/[SyncStatusController]
|
||||
/// directly rather than a single god-object provider, since those are the
|
||||
/// only two domains this ever needs.
|
||||
class SyncService {
|
||||
static const _channel = MethodChannel('dev.ayushya.noo/sync_service');
|
||||
static const _statusChannel = EventChannel(
|
||||
'dev.ayushya.noo/sync_service/status',
|
||||
);
|
||||
|
||||
/// Brings the background periodic sync jobs in line with every saved
|
||||
/// account's current settings - one job per account with sync enabled
|
||||
/// (paths or "sync everything", and the Files Cache policy set to refresh
|
||||
/// periodically), cancelled for accounts without and for accounts the
|
||||
/// user logged out of. Background sync is deliberately not limited to the
|
||||
/// active account: each account's job carries that account's own
|
||||
/// credentials, paths and interval, so switching accounts doesn't stop the
|
||||
/// others.
|
||||
///
|
||||
/// Call whenever any of that changes - a periodic `WorkRequest`'s input is
|
||||
/// fixed at enqueue time and can only be updated by re-enqueueing. The
|
||||
/// active account's settings come from [sync]/its live state (they may not
|
||||
/// have been persisted yet); every other account's are read from storage.
|
||||
static Future<void> reschedule(
|
||||
SessionController session,
|
||||
SyncStatusController sync,
|
||||
) async {
|
||||
final prefs = await session.prefsFuture;
|
||||
final store = session.accountStore;
|
||||
final wifiOnly = !sync.syncOnCellular;
|
||||
final signedOut = store.loadSignedOut(prefs);
|
||||
|
||||
for (final account in session.accounts) {
|
||||
try {
|
||||
if (signedOut.contains(account.id)) {
|
||||
await cancelAccount(account.id);
|
||||
continue;
|
||||
}
|
||||
final isActive = account.id == session.activeAccountId;
|
||||
final config = isActive
|
||||
? _SyncConfig(
|
||||
paths: sync.syncEverything ? ['/'] : sync.syncedPaths,
|
||||
intervalMinutes: sync.backgroundSyncIntervalMinutes,
|
||||
)
|
||||
: _SyncConfig.fromPrefs(prefs, store.accountPrefKey, account.id);
|
||||
final password = await store.readPassword(account.id);
|
||||
if (password == null ||
|
||||
config.paths.isEmpty ||
|
||||
config.intervalMinutes == null) {
|
||||
await cancelAccount(account.id);
|
||||
continue;
|
||||
}
|
||||
await _channel.invokeMethod('reschedule', {
|
||||
'accountId': account.id,
|
||||
'serverUrl': account.serverUrl,
|
||||
'username': account.username,
|
||||
'authHeader': _basicAuth(account, password),
|
||||
'folders': jsonEncode(config.paths),
|
||||
'wifiOnly': wifiOnly,
|
||||
'intervalMinutes': config.intervalMinutes,
|
||||
'notify': sync.syncNotifications,
|
||||
});
|
||||
} catch (e) {
|
||||
debugPrint('[SyncService] Could not schedule ${account.id}: $e');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static String _basicAuth(SavedAccount account, String password) =>
|
||||
'Basic ${base64Encode(utf8.encode('${account.username}:$password'))}';
|
||||
|
||||
/// Stops [accountId]'s periodic job (the account was removed, or has
|
||||
/// nothing left to sync).
|
||||
static Future<void> cancelAccount(String accountId) async {
|
||||
await _channel.invokeMethod('cancel', {'accountId': accountId});
|
||||
}
|
||||
|
||||
/// Runs a one-off sync pass immediately, independent of the periodic
|
||||
/// schedule.
|
||||
///
|
||||
/// [force] (Settings' "Sync now", a newly-added path): full walk of every
|
||||
/// synced root, visible progress notification, supersedes any run already
|
||||
/// in flight. Without it (pull-to-refresh, foreground timer, app resume)
|
||||
/// the pass is a quiet check that uses the cheap root-etag shortcut and
|
||||
/// never interrupts a run already in progress. [respectNetworkSetting]
|
||||
/// makes such a pass wait for Wi-Fi when "Sync on cellular" is off (the
|
||||
/// automatic triggers do; a deliberate pull doesn't).
|
||||
static Future<void> syncNow(
|
||||
SessionController session,
|
||||
SyncStatusController sync, {
|
||||
bool force = true,
|
||||
bool respectNetworkSetting = false,
|
||||
}) async {
|
||||
final accountId = session.activeAccountId;
|
||||
final authHeader = session.service?.authHeaders['Authorization'];
|
||||
if (accountId == null || authHeader == null) {
|
||||
throw Exception('Not logged in.');
|
||||
}
|
||||
|
||||
final paths = sync.syncEverything ? ['/'] : sync.syncedPaths;
|
||||
await _channel.invokeMethod('syncNow', {
|
||||
'accountId': accountId,
|
||||
'serverUrl': session.serverUrl,
|
||||
'username': session.username,
|
||||
'authHeader': authHeader,
|
||||
'folders': jsonEncode(paths),
|
||||
'force': force,
|
||||
'notify': sync.syncNotifications,
|
||||
if (respectNetworkSetting) 'wifiOnly': !sync.syncOnCellular,
|
||||
});
|
||||
}
|
||||
|
||||
/// One-shot status snapshot - used to seed [SyncStatusController]'s state
|
||||
/// right after login/account-switch, before the first [statusStream]
|
||||
/// event arrives.
|
||||
///
|
||||
/// [accountId] is required for `syncedFileIds` to be populated on a fresh
|
||||
/// app start - the native bus only knows an account once a sync pass has
|
||||
/// run in this process.
|
||||
static Future<SyncStatusSnapshot> getStatus(String? accountId) async {
|
||||
final result = await _channel.invokeMethod<Map<dynamic, dynamic>>(
|
||||
'getSyncStatus',
|
||||
{'accountId': accountId},
|
||||
);
|
||||
return SyncStatusSnapshot.fromMap(result ?? const {});
|
||||
}
|
||||
|
||||
/// Live status updates pushed from `SyncStatusBus` (Kotlin) - syncing
|
||||
/// started/stopped, per-file progress, new/resolved conflicts.
|
||||
///
|
||||
/// One shared stream, deliberately: every call to
|
||||
/// `EventChannel.receiveBroadcastStream()` opens its *own* native
|
||||
/// subscription, and the native side only keeps one listener - a second
|
||||
/// subscriber (the Offline tab's controller, once it became eagerly
|
||||
/// created) silently took the events away from the first
|
||||
/// (`SyncStatusController`), so sync badges stopped updating until the app
|
||||
/// was restarted. This is a broadcast stream, so any number of Dart
|
||||
/// listeners share the one native subscription.
|
||||
static final Stream<SyncStatusSnapshot> statusStream = _statusChannel
|
||||
.receiveBroadcastStream()
|
||||
.map(
|
||||
(event) => SyncStatusSnapshot.fromMap(event as Map<dynamic, dynamic>),
|
||||
);
|
||||
|
||||
/// In-app conflict resolution (the header's "Keep local"/"Use server"
|
||||
/// buttons) - shares the exact same native `ConflictResolveWorker`
|
||||
/// enqueue path the notification actions use, just triggered from Dart
|
||||
/// instead of a `PendingIntent`.
|
||||
static Future<void> resolveConflict(
|
||||
SessionController session,
|
||||
SyncConflictInfo conflict,
|
||||
String resolution,
|
||||
) async {
|
||||
final authHeader = session.service?.authHeaders['Authorization'];
|
||||
if (authHeader == null) throw Exception('Not logged in.');
|
||||
await _channel.invokeMethod('resolveConflict', {
|
||||
'accountId': conflict.accountId,
|
||||
'serverUrl': session.serverUrl,
|
||||
'username': session.username,
|
||||
'authHeader': authHeader,
|
||||
'fileId': conflict.fileId,
|
||||
'remotePath': conflict.remotePath,
|
||||
'relPath': conflict.relPath,
|
||||
'resolution': resolution,
|
||||
});
|
||||
}
|
||||
|
||||
/// Deletes [path]'s local mirror and its recorded sync state - called
|
||||
/// when the user turns sync off for a path, so the on-device copy
|
||||
/// actually goes away instead of just stopping future updates. See
|
||||
/// `SyncEngine.removeLocalSync`'s doc comment for why the state also has
|
||||
/// to be cleared, not just the files.
|
||||
static Future<void> removeLocalSync(
|
||||
SessionController session,
|
||||
String path,
|
||||
) async {
|
||||
final accountId = session.activeAccountId;
|
||||
if (accountId == null) return;
|
||||
await _channel.invokeMethod('removeLocalSync', {
|
||||
'accountId': accountId,
|
||||
'path': path,
|
||||
});
|
||||
}
|
||||
|
||||
/// The deterministic local mirror path for [remoteItemPath] under
|
||||
/// account [accountId] - mirrors `SyncEngine.kt#syncRoot`'s
|
||||
/// `<externalFilesDir>/sync/<accountId>/...` layout exactly, so this
|
||||
/// never needs to read native sync state. Returns null if nothing's
|
||||
/// actually been synced there yet.
|
||||
static Future<String?> localSyncedFilePath(
|
||||
String accountId,
|
||||
String remoteItemPath,
|
||||
) async {
|
||||
final base = await getExternalStorageDirectory();
|
||||
if (base == null) return null;
|
||||
final relPath = remoteItemPath.startsWith('/')
|
||||
? remoteItemPath.substring(1)
|
||||
: remoteItemPath;
|
||||
final file = File(p.join(base.path, 'sync', accountId, relPath));
|
||||
return file.existsSync() ? file.path : null;
|
||||
}
|
||||
}
|
||||
|
||||
/// One account's background-sync settings, as far as scheduling is
|
||||
/// concerned.
|
||||
class _SyncConfig {
|
||||
final List<String> paths;
|
||||
|
||||
/// Null = background sync off for this account.
|
||||
final int? intervalMinutes;
|
||||
|
||||
const _SyncConfig({required this.paths, required this.intervalMinutes});
|
||||
|
||||
/// Reads a *non-active* account's persisted settings - the same per-account
|
||||
/// keys `SyncStatusController`/`FilesController` write. Malformed values
|
||||
/// fall back to "nothing to sync" rather than throwing.
|
||||
factory _SyncConfig.fromPrefs(
|
||||
SharedPreferences prefs,
|
||||
String Function(String accountId, String baseKey) key,
|
||||
String accountId,
|
||||
) {
|
||||
var paths = <String>[];
|
||||
try {
|
||||
final everything =
|
||||
prefs.getBool(
|
||||
key(accountId, SyncStatusController.prefSyncEverything),
|
||||
) ??
|
||||
false;
|
||||
final json = prefs.getString(
|
||||
key(accountId, SyncStatusController.prefSyncedPaths),
|
||||
);
|
||||
if (everything) {
|
||||
paths = ['/'];
|
||||
} else if (json != null) {
|
||||
paths = (jsonDecode(json) as List).cast<String>();
|
||||
}
|
||||
} catch (e) {
|
||||
debugPrint('[SyncService] Unreadable sync paths for $accountId: $e');
|
||||
}
|
||||
|
||||
var policy = defaultCachePolicy;
|
||||
var minutes = defaultCacheIntervalMinutes;
|
||||
try {
|
||||
final policyName = prefs.getString(
|
||||
key(accountId, FilesController.prefCachePolicy),
|
||||
);
|
||||
policy = CachePolicy.values.firstWhere(
|
||||
(c) => c.name == policyName,
|
||||
orElse: () => defaultCachePolicy,
|
||||
);
|
||||
minutes =
|
||||
prefs.getInt(
|
||||
key(accountId, FilesController.prefCacheIntervalMinutes),
|
||||
) ??
|
||||
defaultCacheIntervalMinutes;
|
||||
} catch (e) {
|
||||
debugPrint('[SyncService] Unreadable cache rule for $accountId: $e');
|
||||
}
|
||||
|
||||
return _SyncConfig(
|
||||
paths: paths,
|
||||
intervalMinutes: policy == CachePolicy.interval ? minutes : null,
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,40 @@
|
||||
import 'dart:convert';
|
||||
import 'package:flutter/services.dart';
|
||||
import '../providers/files_controller.dart';
|
||||
import '../providers/session_controller.dart';
|
||||
import 'native_channel.dart';
|
||||
import 'share_intent_service.dart';
|
||||
|
||||
/// Hands a "Share to Noo" upload off to `ShareUploadService.kt`'s Android
|
||||
/// foreground service, which does the actual prepare+upload entirely on its
|
||||
/// own from there - including surviving the app being closed - with a
|
||||
/// single cancellable progress notification for the whole batch. See that
|
||||
/// service's doc comment for why this isn't done in Dart/Dio: a Dart
|
||||
/// isolate doesn't keep running once the Flutter engine is gone, only a
|
||||
/// real Android Service does.
|
||||
class UploadService {
|
||||
static const _channel = MethodChannel('dev.ayushya.noo/upload_service');
|
||||
|
||||
/// Starts uploading [files] into the active account's current folder.
|
||||
/// Fire-and-forget from Dart's perspective - once this returns, the
|
||||
/// service owns the rest and reports progress/completion/cancellation
|
||||
/// through its own notification, not back to the app.
|
||||
static Future<void> startUpload(
|
||||
SessionController session,
|
||||
FilesController files,
|
||||
List<SharedFileRef> sharedFiles,
|
||||
) async {
|
||||
final args = baseChannelArgs(session);
|
||||
final filesJson = jsonEncode(
|
||||
sharedFiles
|
||||
.map((f) => {'uri': f.uri, 'name': f.name, 'size': f.size})
|
||||
.toList(),
|
||||
);
|
||||
|
||||
await _channel.invokeMethod('startUpload', {
|
||||
...args,
|
||||
'files': filesJson,
|
||||
'remoteFolder': files.currentFolderPath,
|
||||
});
|
||||
}
|
||||
}
|
||||