Build APK / build (push) Successful in 7m40s
- Let Noo be picked as a source (Files + Photos) by other apps' native file/photo pickers via Android's GET_CONTENT intent, mirroring the existing "Share to Noo" plumbing: MainActivity.kt/PickIntentService/ PickRequest, ServerProvider.pickRequest/confirmPick/cancelPick, and pick-mode tap handling in FilesView/PhotosView. While picking, the bottom nav and MoreTabsButton are restricted to Files/Photos only. - Fix two account bugs: testConnection() failures no longer delete a still-valid stored app password (only an actual 401 does), and switchAccount() now retries a nominally-active-but-logged-out account instead of no-op'ing - both were silently locking users out of "Continue as" with no way back in except removing and re-adding the account (now exposed via login_view.dart's inline remove button). - Fix the login WebView: clear cookies before every load so "Add Account" can't silently reuse an existing session, and push it as a non-animated route to avoid a known WebView-as-PlatformView black-screen- on-pop issue under Impeller. - Redesign the Files/Photos selection toolbar to take over the top app bar entirely (SyncedHeaderScaffold.selectionBar) instead of sitting as a second bar under the controls row, with a horizontally-scrollable, uniformly-colored actions row and the same one-shot scroll-hint nudge the controls row uses. - Redesign ShareUploadView to share the same SyncedHeaderScaffold chrome as every tab, with the uploading-file summary (marqueed via the new shared MarqueeTitle widget) and upload button grouped into one rounded/elevated bottom sheet. - Restyle ShareSheet to open on the same DetailsHeader every other per-item sheet uses, and fix a couple of small design-language drifts (hardcoded text style, a non-rounded icon). - Settings' account card: icon buttons with tooltips instead of text buttons for refresh/logout/remove, divider removed.
102 lines
3.5 KiB
Dart
102 lines
3.5 KiB
Dart
import 'package:flutter/material.dart';
|
|
import 'package:provider/provider.dart';
|
|
import 'package:webview_flutter/webview_flutter.dart';
|
|
import '../providers/server_provider.dart';
|
|
|
|
/// Every Login Flow v2 page - first login or an additional account -
|
|
/// rendered in Flutter's own WebView rather than a Chrome Custom Tab or
|
|
/// url_launcher's `LaunchMode.inAppWebView`. The latter hosts a bare native
|
|
/// WebView Activity with no chrome of its own: no close button, and on at
|
|
/// least some devices it draws edge-to-edge and hides the status bar with
|
|
/// no way back short of the OS back gesture. A normal Scaffold/AppBar here
|
|
/// gets the status bar/safe-area handling and a close button for free,
|
|
/// exactly like every other screen in the app - and unlike a Custom Tab,
|
|
/// this screen can close itself automatically once login succeeds.
|
|
///
|
|
/// See ServerProvider.startLoginFlow's doc comment for the full rationale.
|
|
class LoginWebViewView extends StatefulWidget {
|
|
final Uri url;
|
|
|
|
const LoginWebViewView({super.key, required this.url});
|
|
|
|
@override
|
|
State<LoginWebViewView> createState() => _LoginWebViewViewState();
|
|
}
|
|
|
|
class _LoginWebViewViewState extends State<LoginWebViewView> {
|
|
late final WebViewController _controller;
|
|
bool _pageLoading = true;
|
|
bool _popped = false;
|
|
|
|
@override
|
|
void initState() {
|
|
super.initState();
|
|
_controller = WebViewController()
|
|
..setJavaScriptMode(JavaScriptMode.unrestricted)
|
|
..setNavigationDelegate(
|
|
NavigationDelegate(
|
|
onPageStarted: (_) {
|
|
if (mounted) setState(() => _pageLoading = true);
|
|
},
|
|
onPageFinished: (_) {
|
|
if (mounted) setState(() => _pageLoading = false);
|
|
},
|
|
),
|
|
);
|
|
// Android's WebView CookieManager is a single store shared/persisted
|
|
// across every WebView instance in the app, not scoped to this
|
|
// controller - without clearing it first, "Add Account" (or logging
|
|
// back in as a different user on the same server) would silently land
|
|
// on whichever account's Nextcloud session cookie is already there
|
|
// instead of prompting for credentials, defeating the point of
|
|
// starting a fresh Login Flow v2 at all.
|
|
WebViewCookieManager().clearCookies().then((_) {
|
|
if (mounted) _controller.loadRequest(widget.url);
|
|
});
|
|
}
|
|
|
|
void _cancel() {
|
|
context.read<ServerProvider>().cancelLoginFlow();
|
|
Navigator.of(context).pop();
|
|
}
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
final provider = context.watch<ServerProvider>();
|
|
|
|
// The login flow finished (success or error) or was cancelled
|
|
// elsewhere - close this screen automatically rather than leaving it
|
|
// sitting open over a flow that's no longer awaiting the browser.
|
|
if (!_popped &&
|
|
provider.loginFlowStatus != LoginFlowStatus.awaitingBrowser) {
|
|
_popped = true;
|
|
WidgetsBinding.instance.addPostFrameCallback((_) {
|
|
if (mounted) Navigator.of(context).pop();
|
|
});
|
|
}
|
|
|
|
return PopScope(
|
|
canPop: false,
|
|
onPopInvokedWithResult: (didPop, _) {
|
|
if (!didPop) _cancel();
|
|
},
|
|
child: Scaffold(
|
|
appBar: AppBar(
|
|
title: const Text('Sign in'),
|
|
leading: IconButton(
|
|
icon: const Icon(Icons.close_rounded),
|
|
tooltip: 'Cancel',
|
|
onPressed: _cancel,
|
|
),
|
|
),
|
|
body: Stack(
|
|
children: [
|
|
WebViewWidget(controller: _controller),
|
|
if (_pageLoading) const LinearProgressIndicator(),
|
|
],
|
|
),
|
|
),
|
|
);
|
|
}
|
|
}
|