diff --git a/lib/sync/firebase_backend.dart b/lib/sync/firebase_backend.dart index 934ea0b..ce91818 100644 --- a/lib/sync/firebase_backend.dart +++ b/lib/sync/firebase_backend.dart @@ -12,6 +12,7 @@ /// half. On Android there is no such file. library; +import 'dart:developer'; import 'package:crdt_sync/crdt_sync.dart'; import 'package:flutter_secure_storage/flutter_secure_storage.dart'; @@ -63,9 +64,16 @@ Future loadAccount() async { final provisioned = await accountFromWrapper(Uri.base); if (provisioned != null) await saveAccount(provisioned); return provisioned; - } on Exception { - // No secret service available: behave as "not configured" rather than - // crashing the settings screen. + } on Exception catch (error, stackTrace) { + // Still "not configured" rather than crashing the settings screen -- but + // never silent: this hid *why* provisioning failed, which is + // indistinguishable from "no account set" until you say so. + log( + 'loadAccount failed; treating this device as not configured', + level: 1000, + error: error, + stackTrace: stackTrace, + ); return null; } } diff --git a/lib/ui/capture_screen.dart b/lib/ui/capture_screen.dart index 37819e3..5bff6ea 100644 --- a/lib/ui/capture_screen.dart +++ b/lib/ui/capture_screen.dart @@ -1,5 +1,5 @@ -import 'dart:async'; +import 'dart:async'; import 'package:crdt_sync/crdt_sync.dart'; import 'package:flutter/material.dart'; import 'package:http/http.dart' as http; @@ -8,6 +8,7 @@ import 'package:todo/data/note.dart'; import 'package:todo/data/note_repository.dart'; import 'package:todo/data/note_template.dart'; import 'package:todo/frame_stats.dart'; +import 'package:todo/sync/firebase_backend.dart'; import 'package:todo/sync/local_backup.dart'; import 'package:todo/sync/local_backup_factory.dart'; import 'package:todo/sync/run_sync.dart'; @@ -231,7 +232,12 @@ class _CaptureScreenState extends State /// lands in the status line so drift can't go unnoticed for days. Future _autoSync() async { final settings = _settings; - if (_autoSyncing || settings == null || !settings.isConfigured) return; + if (_autoSyncing || settings == null) return; + // Either backend counts. `isConfigured` means "has a GitHub token", so + // gating on it alone silently skips every sync on a device connected + // only to Firebase -- and once the mirror is retired that is every + // device. + if (!settings.isConfigured && await openFirebase() == null) return; _autoSyncing = true; try { final result = await runSync( @@ -285,8 +291,8 @@ class _CaptureScreenState extends State /// Runs a full sync, routing to settings first if not yet configured. Future _sync() async { final settings = _settings ?? await SyncSettings.load(); - if (!settings.isConfigured) { - _showSnack('Add a GitHub token in settings to enable sync'); + if (!settings.isConfigured && await openFirebase() == null) { + _showSnack('Connect Firebase (or add a GitHub token) in settings'); await _openSettings(); return; } diff --git a/test/capture_screen_test.dart b/test/capture_screen_test.dart index 3df0be1..636a6b2 100644 --- a/test/capture_screen_test.dart +++ b/test/capture_screen_test.dart @@ -151,7 +151,7 @@ void main() { expect(raw.controller!.text, isEmpty); }); - testWidgets('tapping Sync while unconfigured prompts for a token', ( + testWidgets('tapping Sync while unconfigured prompts to connect a backend', ( tester, ) async { await pumpCapture(tester); // empty prefs → no token → not configured @@ -160,7 +160,11 @@ void main() { await tester.pump(); // settings load + snackbar await tester.pump(); - expect(find.textContaining('Add a GitHub token'), findsOneWidget); + // The behaviour that matters is the routing, not the wording: an + // unconfigured device is sent to settings to connect a backend. Asserting + // on the snackbar text tied this to one phrasing, and the snackbar is + // gone by the time settings has pushed anyway. + expect(find.textContaining('Connect Firebase'), findsWidgets); }); testWidgets('the notes-list button navigates to the list screen', (