Skip to content

A cross platform Audiobookshelf client for Android and iOS

Dart

Keep sessions signed in and show queue loading in Android Auto

Barnabas512a8908cd82
diff --git a/lib/providers/_lp_core.dart b/lib/providers/_lp_core.dart
index 8f3b32c5..cda7be1d 100644
--- a/lib/providers/_lp_core.dart
+++ b/lib/providers/_lp_core.dart
@@ -701,6 +701,8 @@ mixin _CoreMixin on ChangeNotifier, _StateMixin {
Future<void> _refreshProgress() async {
if (_api == null) return;
try {
+ final pendingSyncs =
+ (await ScopedPrefs.getStringList('pending_syncs')).toSet();
final me = await _api!.getMe();
if (me != null) {
final progressList = me['mediaProgress'] as List<dynamic>?;
@@ -770,6 +772,10 @@ mixin _CoreMixin on ChangeNotifier, _StateMixin {
return true;
}
if (serverData != null && serverData['isFinished'] == false) {
+ if (pendingSyncs.contains(key)) {
+ debugPrint('[Progress] Keeping local finished (sync pending): $key');
+ return false;
+ }
debugPrint('[Progress] Clearing local finished (server says not finished): $key');
return true;
}
@@ -778,6 +784,7 @@ mixin _CoreMixin on ChangeNotifier, _StateMixin {
});
final overridesBefore = _localProgressOverrides.length;
_localProgressOverrides.removeWhere((key, localProgress) {
+ if (pendingSyncs.contains(key)) return false;
if (_locallyFinishedItems.contains(key)) return false;
// Keep the override if local progress is ahead of server
final serverProgress = ((_progressMap[key]?['progress'] as num?)?.toDouble()) ?? 0;
diff --git a/lib/providers/auth_provider.dart b/lib/providers/auth_provider.dart
index 980310fd..75b9cf09 100644
--- a/lib/providers/auth_provider.dart
+++ b/lib/providers/auth_provider.dart
@@ -60,6 +60,7 @@ class AuthProvider extends ChangeNotifier {
bool _isLoading = true;
String? _errorMessage;
+ bool _authExpiryInProgress = false;
// Getters
bool get isAuthenticated => _accessToken != null && _serverUrl != null;
@@ -189,30 +190,70 @@ class AuthProvider extends ChangeNotifier {
ApiService? get apiService {
final url = activeServerUrl;
if (url != null && _accessToken != null) {
- return ApiService(
+ return _createSessionApi(
baseUrl: url,
token: _accessToken!,
refreshToken: _refreshToken,
isLegacyToken: _isLegacyToken,
- customHeaders: _customHeaders,
- onTokensRefreshed: _onTokensRefreshed,
- onAuthExpired: _onAuthExpired,
);
}
return null;
}
- void _onTokensRefreshed(String newAccessToken, String? newRefreshToken) {
+ ApiService _createSessionApi({
+ required String baseUrl,
+ required String token,
+ required String? refreshToken,
+ required bool isLegacyToken,
+ }) {
+ final sessionServer = _serverUrl ?? baseUrl;
+ final sessionUsername = _username;
+ return ApiService(
+ baseUrl: baseUrl,
+ token: token,
+ refreshToken: refreshToken,
+ isLegacyToken: isLegacyToken,
+ customHeaders: _customHeaders,
+ loadPersistedTokens: () => UserAccountService()
+ .loadPersistedTokens(sessionServer, sessionUsername),
+ onTokensRefreshed: (access, refresh) => _onTokensRefreshed(
+ sessionServer,
+ sessionUsername,
+ access,
+ refresh,
+ ),
+ onAuthExpired: () => _onAuthExpired(sessionServer, sessionUsername),
+ );
+ }
+
+ bool _isCurrentSession(String serverUrl, String? username) {
+ final currentServer = _serverUrl;
+ return currentServer != null &&
+ normalizeServerUrl(currentServer) == normalizeServerUrl(serverUrl) &&
+ _username == username;
+ }
+
+ Future<void> _onTokensRefreshed(
+ String sessionServer,
+ String? sessionUsername,
+ String newAccessToken,
+ String? newRefreshToken,
+ ) async {
+ if (!_isCurrentSession(sessionServer, sessionUsername) ||
+ _accessToken == null) {
+ return;
+ }
_accessToken = newAccessToken;
if (newRefreshToken != null) _refreshToken = newRefreshToken;
- // Persist updated tokens
- SharedPreferences.getInstance().then((prefs) {
- prefs.setString('token', _accessToken!);
- if (_refreshToken != null) prefs.setString('refresh_token', _refreshToken!);
- });
- // Update saved account
- if (_serverUrl != null && _username != null) {
- UserAccountService().updateTokens(_serverUrl!, _username!, _accessToken!, refreshToken: _refreshToken);
+ try {
+ await UserAccountService().persistRefreshedTokens(
+ _accessToken!,
+ _refreshToken,
+ serverUrl: sessionServer,
+ username: sessionUsername,
+ );
+ } catch (e) {
+ debugPrint('[Auth] Failed to persist refreshed tokens: $e');
}
// Push new token to socket
SocketService().updateToken(_accessToken!);
@@ -239,14 +280,22 @@ class AuthProvider extends ChangeNotifier {
);
}
- void _onAuthExpired() {
+ void _onAuthExpired(String sessionServer, String? sessionUsername) {
+ if (!_isCurrentSession(sessionServer, sessionUsername) ||
+ _accessToken == null ||
+ _authExpiryInProgress) {
+ return;
+ }
+ _authExpiryInProgress = true;
debugPrint('[Auth] Token refresh failed, forcing re-login');
// Show a message to the user
final ctx = rootNavigatorKey.currentContext;
final l = ctx != null ? AppLocalizations.of(ctx) : null;
final msg = l?.authSessionExpired ?? 'Session expired. Please log in again.';
if (ctx != null) showOverlayToast(ctx, msg, icon: Icons.error_outline_rounded);
- logout();
+ unawaited(logout(forgetAccount: false).whenComplete(() {
+ _authExpiryInProgress = false;
+ }));
}
/// Try to restore a saved session from SharedPreferences.
@@ -336,14 +385,11 @@ class AuthProvider extends ChangeNotifier {
if (reachable) {
try {
debugPrint('[Auth] fetching /me... (${sw.elapsedMilliseconds}ms)');
- final api = ApiService(
+ final api = _createSessionApi(
baseUrl: activeServerUrl!,
token: savedToken,
refreshToken: savedRefreshToken,
isLegacyToken: _isLegacyToken,
- customHeaders: _customHeaders,
- onTokensRefreshed: _onTokensRefreshed,
- onAuthExpired: _onAuthExpired,
);
// Prefer /api/authorize over /api/me because it returns the
// full login payload (including ereaderDevices) — /api/me drops
@@ -378,6 +424,11 @@ class AuthProvider extends ChangeNotifier {
} catch (_) {}
_fetchServerVersion(activeServerUrl!);
}
+ } else if (savedUrl != null) {
+ // A rejected refresh clears credentials but keeps enough identity to
+ // prefill the login form instead of making the user re-enter the server.
+ _serverUrl = normalizeServerUrl(savedUrl);
+ _username = savedUsername;
}
} catch (e) {
// Restore failed — but if we already set credentials, keep them
@@ -409,14 +460,11 @@ class AuthProvider extends ChangeNotifier {
if (!isAuthenticated || _accessToken == null || activeServerUrl == null) return;
_ensuringUserInfo = true;
try {
- final api = ApiService(
+ final api = _createSessionApi(
baseUrl: activeServerUrl!,
token: _accessToken!,
refreshToken: _refreshToken,
isLegacyToken: _isLegacyToken,
- customHeaders: _customHeaders,
- onTokensRefreshed: _onTokensRefreshed,
- onAuthExpired: _onAuthExpired,
);
final auth = await api.authorize();
if (auth != null) {
@@ -859,7 +907,10 @@ class AuthProvider extends ChangeNotifier {
} catch (_) {}
}
- Future<void> logout() async {
+ Future<void> logout({
+ bool forgetAccount = true,
+ bool keepServer = false,
+ }) async {
// Stop any active playback
try {
final player = AudioPlayerService();
@@ -890,8 +941,10 @@ class AuthProvider extends ChangeNotifier {
_accessToken = null;
_refreshToken = null;
_isLegacyToken = false;
- _serverUrl = null;
- _username = null;
+ if (forgetAccount) {
+ _serverUrl = keepServer ? logoutServer : null;
+ _username = null;
+ }
_userId = null;
_defaultLibraryId = null;
_userJson = null;
@@ -903,13 +956,23 @@ class AuthProvider extends ChangeNotifier {
try {
if (logoutServer != null && logoutUser != null) {
- await UserAccountService().removeAccount(logoutServer, logoutUser);
+ if (forgetAccount) {
+ await UserAccountService().removeAccount(logoutServer, logoutUser);
+ } else {
+ await UserAccountService().clearTokens(logoutServer, logoutUser);
+ }
}
final prefs = await SharedPreferences.getInstance();
- await prefs.remove('server_url');
+ if (forgetAccount) {
+ if (keepServer && logoutServer != null) {
+ await prefs.setString('server_url', logoutServer);
+ } else {
+ await prefs.remove('server_url');
+ }
+ }
await prefs.remove('token');
await prefs.remove('refresh_token');
- await prefs.remove('username');
+ if (forgetAccount) await prefs.remove('username');
await prefs.remove('user_id');
await prefs.remove('default_library_id');
} catch (_) {}
@@ -924,6 +987,8 @@ class AuthProvider extends ChangeNotifier {
/// Stops playback, swaps credentials, and notifies listeners so the
/// app reloads with the new user's data.
Future<bool> switchToAccount(SavedAccount account) async {
+ if (account.token.isEmpty) return false;
+
// Stop current playback
try {
final player = AudioPlayerService();
@@ -937,8 +1002,11 @@ class AuthProvider extends ChangeNotifier {
AndroidAutoService().clearCache();
CarPlayService().clearAndRefresh();
- // Set the new account as active in the account service
- UserAccountService().switchTo(account.serverUrl, account.username);
+ // Set the new account as active in the account service. It may have been
+ // removed since the caller loaded its saved-account row.
+ final selected =
+ UserAccountService().switchTo(account.serverUrl, account.username);
+ if (selected == null) return false;
// Notify widgets that read scoped settings (e.g. card button layout) so
// they reload from the new account's ScopedPrefs instead of keeping the
@@ -1003,14 +1071,11 @@ class AuthProvider extends ChangeNotifier {
// Verify the token still works and get user info
try {
- final api = ApiService(
+ final api = _createSessionApi(
baseUrl: _serverUrl!,
token: _accessToken!,
refreshToken: _refreshToken,
isLegacyToken: _isLegacyToken,
- customHeaders: _customHeaders,
- onTokensRefreshed: _onTokensRefreshed,
- onAuthExpired: _onAuthExpired,
);
final auth = await api.authorize();
if (auth != null) {
diff --git a/lib/providers/library_provider.dart b/lib/providers/library_provider.dart
index bbef9bdd..125a4675 100644
--- a/lib/providers/library_provider.dart
+++ b/lib/providers/library_provider.dart
@@ -386,13 +386,17 @@ class LibraryProvider extends ChangeNotifier
if (_api != null) {
await ProgressSyncService().flushPendingSync(api: _api!);
}
+ final pendingSyncs =
+ (await ScopedPrefs.getStringList('pending_syncs')).toSet();
_lastFinishedItemId = null;
await Future.wait([
loadPersonalizedView(force: true),
_refreshProgress(),
]);
- _localProgressOverrides.clear();
- _locallyFinishedItems.clear();
+ _localProgressOverrides
+ .removeWhere((itemId, _) => !pendingSyncs.contains(itemId));
+ _locallyFinishedItems
+ .removeWhere((itemId) => !pendingSyncs.contains(itemId));
final sync = ProgressSyncService();
for (final entry in _progressMap.entries) {
final itemId = entry.key;
diff --git a/lib/screens/login_screen.dart b/lib/screens/login_screen.dart
index ce82409d..b850411d 100644
--- a/lib/screens/login_screen.dart
+++ b/lib/screens/login_screen.dart
@@ -22,7 +22,14 @@ import '../l10n/app_localizations.dart';
import '../services/wording.dart';
class LoginScreen extends StatefulWidget {
- const LoginScreen({super.key});
+ final SavedAccount? prefillAccount;
+ final String? prefillServerUrl;
+
+ const LoginScreen({
+ super.key,
+ this.prefillAccount,
+ this.prefillServerUrl,
+ });
@override
State<LoginScreen> createState() => _LoginScreenState();
@@ -88,6 +95,36 @@ class _LoginScreenState extends State<LoginScreen>
_animController.forward();
_serverController.addListener(_onServerChanged);
_loadVersion();
+ WidgetsBinding.instance.addPostFrameCallback((_) {
+ if (!mounted) return;
+ final auth = context.read<AuthProvider>();
+ final account = widget.prefillAccount;
+ if (account != null) {
+ _prefillLogin(account.serverUrl, account.username);
+ return;
+ }
+ final requestedServer = widget.prefillServerUrl;
+ if (requestedServer != null && requestedServer.isNotEmpty) {
+ _prefillLogin(requestedServer, '');
+ return;
+ }
+ final serverUrl = auth.serverUrl;
+ if (!auth.isAuthenticated && serverUrl != null && serverUrl.isNotEmpty) {
+ _prefillLogin(serverUrl, auth.username ?? '');
+ }
+ });
+ }
+
+ void _prefillLogin(String serverUrl, String username) {
+ final uri = Uri.tryParse(serverUrl);
+ final protocol = uri?.scheme == 'http' || uri?.scheme == 'https'
+ ? '${uri!.scheme}://'
+ : _protocol;
+ setState(() => _protocol = protocol);
+ _serverController.text = serverUrl.startsWith(protocol)
+ ? serverUrl.substring(protocol.length)
+ : serverUrl;
+ _usernameController.text = username;
}
Future<void> _loadVersion() async {
@@ -1034,6 +1071,12 @@ class _LoginScreenState extends State<LoginScreen>
}
Future<void> _quickSwitch(SavedAccount account) async {
+ if (account.token.isEmpty) {
+ _prefillLogin(account.serverUrl, account.username);
+ _passwordController.clear();
+ _usernameFocus.unfocus();
+ return;
+ }
setState(() => _isConnecting = true);
final auth = context.read<AuthProvider>();
diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dart
index 632715ea..bfac6fc3 100644
--- a/lib/screens/settings_screen.dart
+++ b/lib/screens/settings_screen.dart
@@ -4382,7 +4382,9 @@ class _SettingsScreenState extends State<SettingsScreen> {
onPressed: () async {
Navigator.pop(ctx);
await _stopAndSyncPlayback();
- if (context.mounted) context.read<AuthProvider>().logout();
+ if (context.mounted) {
+ context.read<AuthProvider>().logout(keepServer: true);
+ }
},
style: FilledButton.styleFrom(backgroundColor: cs.error),
child: Text(l.signOut),
@@ -4392,13 +4394,22 @@ class _SettingsScreenState extends State<SettingsScreen> {
);
}
- void _addAccount(BuildContext context) async {
+ Future<void> _addAccount(
+ BuildContext context, {
+ SavedAccount? prefillAccount,
+ }) async {
// Stop playback and sync before navigating to login
await _stopAndSyncPlayback();
if (!context.mounted) return;
+ final currentServer = context.read<AuthProvider>().serverUrl;
// Navigate to login screen as a pushed route (not replacing current)
await Navigator.of(context, rootNavigator: true).push(
- MaterialPageRoute(builder: (_) => const LoginScreen()),
+ MaterialPageRoute(
+ builder: (_) => LoginScreen(
+ prefillAccount: prefillAccount,
+ prefillServerUrl: prefillAccount == null ? currentServer : null,
+ ),
+ ),
);
// After login, refresh the library for the newly active account
if (!context.mounted) return;
@@ -4543,6 +4554,11 @@ class _SettingsScreenState extends State<SettingsScreen> {
);
if (confirmed != true || !context.mounted) return;
+ if (account.token.isEmpty) {
+ await _addAccount(context, prefillAccount: account);
+ return;
+ }
+
// Stop playback and sync before switching
await _stopAndSyncPlayback();
if (!context.mounted) return;
@@ -4550,7 +4566,8 @@ class _SettingsScreenState extends State<SettingsScreen> {
final auth = context.read<AuthProvider>();
final lib = context.read<LibraryProvider>();
- await auth.switchToAccount(account);
+ final switched = await auth.switchToAccount(account);
+ if (!switched) return;
// Re-init the library provider with the new user
if (context.mounted) {
diff --git a/lib/services/android_auto_service.dart b/lib/services/android_auto_service.dart
index ace802ee..c2224dc9 100644
--- a/lib/services/android_auto_service.dart
+++ b/lib/services/android_auto_service.dart
@@ -10,6 +10,7 @@ import 'audio_player_service.dart';
import 'download_service.dart';
import 'progress_sync_service.dart';
import 'scoped_prefs.dart';
+import 'user_account_service.dart';
import '../l10n/app_localizations.dart';
import '../main.dart' show rootNavigatorKey;
@@ -289,6 +290,7 @@ class AndroidAutoService {
final url = prefs.getString('server_url');
final token = prefs.getString('token');
final refreshToken = prefs.getString('refresh_token');
+ final username = prefs.getString('username');
if (url == null || token == null) return null;
Map<String, String> customHeaders = const {};
final headersJson = prefs.getString('custom_headers');
@@ -303,6 +305,15 @@ class AndroidAutoService {
refreshToken: refreshToken,
isLegacyToken: refreshToken == null,
customHeaders: customHeaders,
+ loadPersistedTokens: () =>
+ UserAccountService().loadPersistedTokens(url, username),
+ onTokensRefreshed: (access, refresh) =>
+ UserAccountService().persistRefreshedTokens(
+ access,
+ refresh,
+ serverUrl: url,
+ username: username,
+ ),
);
}
diff --git a/lib/services/api_service.dart b/lib/services/api_service.dart
index d12a93e8..fbb964d2 100644
--- a/lib/services/api_service.dart
+++ b/lib/services/api_service.dart
@@ -83,6 +83,12 @@ class MediaUploadResult {
const MediaUploadResult({required this.success, this.error});
}
+enum _RefreshOutcome {
+ refreshed,
+ rejected,
+ transientFailure,
+}
+
class ApiService {
static String appVersion = '1.3.0'; // fallback; overwritten by initVersion()
static String appBuild = ''; // build number; set by initVersion()
@@ -120,13 +126,20 @@ class ApiService {
final http.Client? _httpClient;
/// Called after a successful token refresh so the auth layer can persist.
- void Function(String newAccessToken, String? newRefreshToken)? onTokensRefreshed;
+ FutureOr<void> Function(String newAccessToken, String? newRefreshToken)? onTokensRefreshed;
+
+ /// Loads the latest persisted tokens before refreshing. Background isolates
+ /// can rotate tokens while this instance is still alive, so the store is the
+ /// only source of truth shared by every ApiService holder.
+ Future<AuthTokens?> Function()? loadPersistedTokens;
/// Called when refresh fails and the user must re-login.
VoidCallback? onAuthExpired;
+ final Duration _refreshRetryDelay;
+
// Concurrency lock for refresh
- Completer<bool>? _refreshCompleter;
+ Completer<_RefreshOutcome>? _refreshCompleter;
// Device info - set once at app start
static String deviceManufacturer = '';
@@ -152,11 +165,14 @@ class ApiService {
bool isLegacyToken = false,
this.customHeaders = const {},
this.onTokensRefreshed,
+ this.loadPersistedTokens,
this.onAuthExpired,
+ Duration refreshRetryDelay = const Duration(milliseconds: 250),
http.Client? httpClient,
}) : _accessToken = token,
_refreshToken = refreshToken,
_isLegacyToken = isLegacyToken,
+ _refreshRetryDelay = refreshRetryDelay,
_httpClient = httpClient;
/// Current access token (for external use like cover URLs, socket auth).
@@ -194,52 +210,115 @@ class ApiService {
return _httpClient?.delete(url, headers: headers) ?? http.delete(url, headers: headers);
}
- /// Attempt to refresh the access token using the refresh token.
- /// Returns true if successful. Uses a lock so concurrent 401s only
- /// trigger one refresh.
- Future<bool> _refreshAccessToken() async {
+ Future<bool> _adoptPersistedTokens() async {
+ final loader = loadPersistedTokens;
+ if (loader == null) return false;
+
+ final previousAccess = _accessToken;
+ try {
+ final persisted = await loader();
+ final persistedAccess = persisted?.accessToken;
+ if (persistedAccess == null) return false;
+ _accessToken = persistedAccess;
+ if (persisted?.refreshToken != null) {
+ _refreshToken = persisted!.refreshToken;
+ }
+ final adopted = _accessToken != previousAccess;
+ if (adopted) {
+ await _notifyTokensRefreshed();
+ }
+ return adopted;
+ } catch (e) {
+ debugPrint('[API] Failed to reload persisted tokens: $e');
+ return false;
+ }
+ }
+
+ Future<void> _notifyTokensRefreshed() async {
+ try {
+ await onTokensRefreshed?.call(_accessToken, _refreshToken);
+ } catch (e) {
+ debugPrint('[API] Failed to persist refreshed tokens: $e');
+ }
+ }
+
+ /// Attempt to refresh the access token using the refresh token. A rejected
+ /// refresh is kept distinct from a temporary network/server failure so only
+ /// an explicit 401/403 can expire the local session.
+ Future<_RefreshOutcome> _refreshAccessToken() async {
if (_isLegacyToken || _refreshToken == null) {
debugPrint('[API] Cannot refresh: isLegacy=$_isLegacyToken, hasRefreshToken=${_refreshToken != null}');
- return false;
+ return _RefreshOutcome.transientFailure;
}
// If a refresh is already in progress, wait for it
if (_refreshCompleter != null) return _refreshCompleter!.future;
- _refreshCompleter = Completer<bool>();
+ _refreshCompleter = Completer<_RefreshOutcome>();
try {
- // Timeout is load-bearing: this is awaited from tryRestoreSession via
- // the 401-retry path, and a stalled response here would otherwise hold
- // the splash screen forever.
- final response = await _post(
- Uri.parse('$_cleanBaseUrl/auth/refresh'),
- headers: {
- ...customHeaders,
- 'x-refresh-token': _refreshToken!,
- },
- ).timeout(const Duration(seconds: 15));
+ if (await _adoptPersistedTokens()) {
+ _refreshCompleter!.complete(_RefreshOutcome.refreshed);
+ return _RefreshOutcome.refreshed;
+ }
- if (response.statusCode == 200) {
- final data = jsonDecode(response.body) as Map<String, dynamic>;
- final tokens = AuthTokens.fromResponse(data);
- final newAccess = tokens.accessToken;
- final newRefresh = tokens.refreshToken;
- if (newAccess != null) {
- _accessToken = newAccess;
- if (newRefresh != null) _refreshToken = newRefresh;
- onTokensRefreshed?.call(_accessToken, _refreshToken);
- debugPrint('[API] Token refreshed successfully');
- _refreshCompleter!.complete(true);
- return true;
+ for (var attempt = 0; attempt < 2; attempt++) {
+ final refreshTokenSent = _refreshToken;
+ if (refreshTokenSent == null) break;
+
+ try {
+ // Timeout is load-bearing: this is awaited from tryRestoreSession via
+ // the 401-retry path, and a stalled response here would otherwise hold
+ // the splash screen forever.
+ final response = await _post(
+ Uri.parse('$_cleanBaseUrl/auth/refresh'),
+ headers: {
+ ...customHeaders,
+ 'x-refresh-token': refreshTokenSent,
+ },
+ ).timeout(const Duration(seconds: 15));
+
+ if (response.statusCode == 200) {
+ final data = jsonDecode(response.body) as Map<String, dynamic>;
+ final tokens = AuthTokens.fromResponse(data);
+ final newAccess = tokens.accessToken;
+ final newRefresh = tokens.refreshToken;
+ if (newAccess != null) {
+ _accessToken = newAccess;
+ if (newRefresh != null) _refreshToken = newRefresh;
+ await _notifyTokensRefreshed();
+ debugPrint('[API] Token refreshed successfully');
+ _refreshCompleter!.complete(_RefreshOutcome.refreshed);
+ return _RefreshOutcome.refreshed;
+ }
+ }
+
+ if (response.statusCode == 401 || response.statusCode == 403) {
+ if (await _adoptPersistedTokens()) {
+ _refreshCompleter!.complete(_RefreshOutcome.refreshed);
+ return _RefreshOutcome.refreshed;
+ }
+ if (_refreshToken != refreshTokenSent && attempt == 0) continue;
+ debugPrint('[API] Token refresh rejected: ${response.statusCode}');
+ _refreshCompleter!.complete(_RefreshOutcome.rejected);
+ return _RefreshOutcome.rejected;
+ }
+
+ debugPrint('[API] Token refresh failed: ${response.statusCode}');
+ } catch (e) {
+ debugPrint('[API] Token refresh error: $e');
+ }
+
+ if (attempt == 0) {
+ await Future<void>.delayed(_refreshRetryDelay);
+ if (await _adoptPersistedTokens()) {
+ _refreshCompleter!.complete(_RefreshOutcome.refreshed);
+ return _RefreshOutcome.refreshed;
+ }
}
}
- debugPrint('[API] Token refresh failed: ${response.statusCode}');
- _refreshCompleter!.complete(false);
- return false;
- } catch (e) {
- debugPrint('[API] Token refresh error: $e');
- _refreshCompleter!.complete(false);
- return false;
+
+ _refreshCompleter!.complete(_RefreshOutcome.transientFailure);
+ return _RefreshOutcome.transientFailure;
} finally {
_refreshCompleter = null;
}
@@ -254,12 +333,13 @@ class ApiService {
debugPrint('[API] 401 on GET ${url.path} - isLegacy=$_isLegacyToken, hasRefresh=${_refreshToken != null}, tokenLen=${_accessToken.length}');
}
if (response.statusCode == 401 && !_isLegacyToken) {
- if (await _refreshAccessToken()) {
+ final outcome = await _refreshAccessToken();
+ if (outcome == _RefreshOutcome.refreshed) {
final refreshedHeaders = Map<String, String>.from(h)
..['Authorization'] = 'Bearer $_accessToken';
response = await _get(url, headers: refreshedHeaders).timeout(timeout);
}
- if (response.statusCode == 401) onAuthExpired?.call();
+ if (outcome == _RefreshOutcome.rejected) onAuthExpired?.call();
}
return response;
}
@@ -270,12 +350,13 @@ class ApiService {
final h = headers ?? _headers;
var response = await _post(url, headers: h, body: body).timeout(timeout);
if (response.statusCode == 401 && !_isLegacyToken) {
- if (await _refreshAccessToken()) {
+ final outcome = await _refreshAccessToken();
+ if (outcome == _RefreshOutcome.refreshed) {
final refreshedHeaders = Map<String, String>.from(h)
..['Authorization'] = 'Bearer $_accessToken';
response = await _post(url, headers: refreshedHeaders, body: body).timeout(timeout);
}
- if (response.statusCode == 401) onAuthExpired?.call();
+ if (outcome == _RefreshOutcome.rejected) onAuthExpired?.call();
}
return response;
}
@@ -285,12 +366,13 @@ class ApiService {
final h = headers ?? _headers;
var response = await _patch(url, headers: h, body: body).timeout(timeout);
if (response.statusCode == 401 && !_isLegacyToken) {
- if (await _refreshAccessToken()) {
+ final outcome = await _refreshAccessToken();
+ if (outcome == _RefreshOutcome.refreshed) {
final refreshedHeaders = Map<String, String>.from(h)
..['Authorization'] = 'Bearer $_accessToken';
response = await _patch(url, headers: refreshedHeaders, body: body).timeout(timeout);
}
- if (response.statusCode == 401) onAuthExpired?.call();
+ if (outcome == _RefreshOutcome.rejected) onAuthExpired?.call();
}
return response;
}
@@ -300,12 +382,13 @@ class ApiService {
final h = headers ?? _headers;
var response = await _delete(url, headers: h).timeout(timeout);
if (response.statusCode == 401 && !_isLegacyToken) {
- if (await _refreshAccessToken()) {
+ final outcome = await _refreshAccessToken();
+ if (outcome == _RefreshOutcome.refreshed) {
final refreshedHeaders = Map<String, String>.from(h)
..['Authorization'] = 'Bearer $_accessToken';
response = await _delete(url, headers: refreshedHeaders).timeout(timeout);
}
- if (response.statusCode == 401) onAuthExpired?.call();
+ if (outcome == _RefreshOutcome.rejected) onAuthExpired?.call();
}
return response;
}
diff --git a/lib/services/audio_player_service.dart b/lib/services/audio_player_service.dart
index acf2da06..e3dff77b 100644
--- a/lib/services/audio_player_service.dart
+++ b/lib/services/audio_player_service.dart
@@ -131,20 +131,54 @@ class AudioPlayerHandler extends BaseAudioHandler with SeekHandler {
bool _bookmarkSavedFlash = false;
Timer? _bookmarkFlashTimer;
- // While the next item is loading (queue advance or fresh play), report
- // `loading` instead of idle/completed so Android Auto animates its
- // buffering bar rather than blanking. Cleared automatically once the
- // player reaches ready.
- bool _advanceLoading = false;
- void setAdvanceLoading(bool value) {
- if (_advanceLoading == value) return;
- _advanceLoading = value;
+ // Keep the media session in buffering while a queued item is taking over.
+ // Android maps AudioProcessingState.loading to STATE_CONNECTING, which does
+ // not show the buffering animation used for an in-progress media load.
+ bool _advanceBuffering = false;
+ DateTime? _advanceBufferingUntil;
+ Timer? _advanceBufferingMinimumTimer;
+
+ void setAdvanceBuffering(
+ bool value, {
+ Duration minimumDuration = Duration.zero,
+ }) {
+ _advanceBufferingMinimumTimer?.cancel();
+ _advanceBufferingMinimumTimer = null;
+ final changed = _advanceBuffering != value;
+ _advanceBuffering = value;
+ _advanceBufferingUntil = value
+ ? DateTime.now().add(minimumDuration)
+ : null;
+ if (value) _clearAdvanceBufferingIfReady();
+ if (!changed && !value) return;
refreshPlaybackState();
}
+ void _clearAdvanceBufferingIfReady({bool refresh = true}) {
+ if (!_advanceBuffering ||
+ _player.processingState != ProcessingState.ready) {
+ return;
+ }
+ final remaining = _advanceBufferingUntil?.difference(DateTime.now()) ??
+ Duration.zero;
+ if (remaining > Duration.zero) {
+ _advanceBufferingMinimumTimer?.cancel();
+ _advanceBufferingMinimumTimer = Timer(remaining, () {
+ _advanceBufferingMinimumTimer = null;
+ _clearAdvanceBufferingIfReady();
+ });
+ return;
+ }
+ _advanceBuffering = false;
+ _advanceBufferingUntil = null;
+ if (refresh) refreshPlaybackState();
+ }
+
void _subscribePlaybackEvents() {
- _player.playbackEventStream.map(_transformEvent).listen(
- (state) {
+ _player.playbackEventStream.listen(
+ (event) {
+ _clearAdvanceBufferingIfReady(refresh: false);
+ final state = _transformEvent(event);
// Only push state on meaningful changes (play/pause, processing state)
// or at most every 5 seconds for position updates
final now = DateTime.now();
@@ -152,12 +186,6 @@ class AudioPlayerHandler extends BaseAudioHandler with SeekHandler {
final processingChanged = _player.processingState != _lastProcessingState;
final elapsed = now.difference(_lastPlaybackStateUpdate);
- // Load finished: hand state reporting back to the real player.
- if (_advanceLoading &&
- _player.processingState == ProcessingState.ready) {
- _advanceLoading = false;
- }
-
if (playingChanged || processingChanged || elapsed.inSeconds >= 5) {
playbackState.add(state);
_lastPlaybackStateUpdate = now;
@@ -304,11 +332,7 @@ class AudioPlayerHandler extends BaseAudioHandler with SeekHandler {
ProcessingState.ready: AudioProcessingState.ready,
ProcessingState.completed: AudioProcessingState.completed,
}[_player.processingState]!;
- if (_advanceLoading &&
- (mapped == AudioProcessingState.idle ||
- mapped == AudioProcessingState.completed)) {
- return AudioProcessingState.loading;
- }
+ if (_advanceBuffering) return AudioProcessingState.buffering;
return mapped;
}(),
playing: _player.playing,
@@ -1188,7 +1212,7 @@ class AudioPlayerService extends ChangeNotifier {
Map<String, dynamic>? _preloadedNextBook;
bool _autoQueueAdvancing = false;
Timer? _bgSaveTimer;
- Timer? _advanceLoadingBackstop;
+ Timer? _advanceBufferingBackstop;
Timer? _pauseStopTimer;
static const _pauseStopTimeout = Duration(minutes: 10);
// A streamed book's cover isn't in the content-provider cache on first play,
@@ -1198,6 +1222,26 @@ class AudioPlayerService extends ChangeNotifier {
// cover has been fetched. Tracks the item already scheduled for this.
String? _coverRepushItem;
Timer? _coverRepushTimer;
+
+ void _beginAdvanceBuffering() {
+ if (!Platform.isAndroid) return;
+ _handler?.setAdvanceBuffering(
+ true,
+ minimumDuration: const Duration(milliseconds: 900),
+ );
+ _advanceBufferingBackstop?.cancel();
+ _advanceBufferingBackstop = Timer(const Duration(seconds: 30), () {
+ _advanceBufferingBackstop = null;
+ _handler?.setAdvanceBuffering(false);
+ });
+ }
+
+ void _endAdvanceBuffering() {
+ if (!Platform.isAndroid) return;
+ _advanceBufferingBackstop?.cancel();
+ _advanceBufferingBackstop = null;
+ _handler?.setAdvanceBuffering(false);
+ }
/// Last known position in seconds — used to detect end→0 position jumps.
double _lastKnownPositionSec = 0;
// ── Stream error retry tracking ──
@@ -1634,6 +1678,7 @@ class AudioPlayerService extends ChangeNotifier {
if (next == null) return;
if (_autoQueueAdvancing) return;
_autoQueueAdvancing = true;
+ _beginAdvanceBuffering();
debugPrint('[PreBuffer] Auto-queue advanced to ${next['title']}');
final oldItemId = _currentItemId;
@@ -2483,18 +2528,6 @@ class AudioPlayerService extends ChangeNotifier {
'startTime=$startTime forceStartTime=$forceStartTime\n'
'Caller:\n${StackTrace.current}');
- // Report a buffering state to the media session while the item loads
- // (session start + source build), so Android Auto shows its animated
- // loading bar instead of a blank one - most visible during queue
- // auto-advance where the previous book already stopped. The handler
- // clears the flag itself once the player reaches ready; the timer is a
- // backstop for load failures so the session can't stay stuck buffering.
- _handler!.setAdvanceLoading(true);
- _advanceLoadingBackstop?.cancel();
- _advanceLoadingBackstop = Timer(const Duration(seconds: 30), () {
- _handler?.setAdvanceLoading(false);
- });
-
// Don't start local playback while casting
final cast = ChromecastService();
if (cast.isCasting) {
@@ -2502,6 +2535,8 @@ class AudioPlayerService extends ChangeNotifier {
return null;
}
+ _beginAdvanceBuffering();
+
final playbackGeneration = ++_playbackGeneration;
// Stop old audio immediately so it doesn't keep playing while the new
@@ -2613,6 +2648,7 @@ class AudioPlayerService extends ChangeNotifier {
final manualOffline = prefs.getBool('manual_offline_mode') ?? false;
if (manualOffline) {
debugPrint('[Player] Manual offline — cannot stream non-downloaded item');
+ _endAdvanceBuffering();
_clearState();
return 'This item isn\'t downloaded and offline mode is on';
}
@@ -2638,6 +2674,7 @@ class AudioPlayerService extends ChangeNotifier {
}
_isLoadingNewItem = false;
+ if (result != null) _endAdvanceBuffering();
notifyListeners();
// Session-start rewind: rewind by maxRewind when starting a new session
@@ -5167,9 +5204,7 @@ class AudioPlayerService extends ChangeNotifier {
Future<void> stop() async {
_pauseStopTimer?.cancel();
_pauseStopTimer = null;
- _advanceLoadingBackstop?.cancel();
- _advanceLoadingBackstop = null;
- _handler?.setAdvanceLoading(false);
+ _endAdvanceBuffering();
final wasPlaying = _player?.playing ?? false;
// Save final position locally
if (_currentItemId != null) {
@@ -5232,6 +5267,7 @@ class AudioPlayerService extends ChangeNotifier {
/// Stop playback without saving progress — used by reset progress.
Future<void> stopWithoutSaving() async {
+ _endAdvanceBuffering();
// Close server session without syncing position
if (_playbackSessionId != null && _api != null) {
try {
@@ -5252,6 +5288,7 @@ class AudioPlayerService extends ChangeNotifier {
@override
void dispose() {
+ _endAdvanceBuffering();
_syncSub?.cancel();
_bgSaveTimer?.cancel();
_pauseStopTimer?.cancel();
diff --git a/lib/services/episode_notification_service.dart b/lib/services/episode_notification_service.dart
index 948a08ff..f26542a0 100644
--- a/lib/services/episode_notification_service.dart
+++ b/lib/services/episode_notification_service.dart
@@ -245,6 +245,7 @@ Future<ApiService?> _buildApiService() async {
final token = prefs.getString('token');
if (remoteUrl == null || token == null) return null;
final refreshToken = prefs.getString('refresh_token');
+ final username = prefs.getString('username');
Map<String, String>? customHeaders;
final headersJson = prefs.getString('custom_headers');
@@ -270,7 +271,14 @@ Future<ApiService?> _buildApiService() async {
refreshToken: refreshToken,
isLegacyToken: refreshToken == null,
customHeaders: headers,
+ loadPersistedTokens: () =>
+ UserAccountService().loadPersistedTokens(remoteUrl, username),
onTokensRefreshed: (access, refresh) =>
- UserAccountService().persistRefreshedTokens(access, refresh),
+ UserAccountService().persistRefreshedTokens(
+ access,
+ refresh,
+ serverUrl: remoteUrl,
+ username: username,
+ ),
);
}
diff --git a/lib/services/home_widget_service.dart b/lib/services/home_widget_service.dart
index e9f00850..055b21e0 100644
--- a/lib/services/home_widget_service.dart
+++ b/lib/services/home_widget_service.dart
@@ -258,6 +258,7 @@ class HomeWidgetService {
return;
}
final refreshToken = prefs.getString('refresh_token');
+ final username = prefs.getString('username');
Map<String, String>? customHeaders;
final headersJson = prefs.getString('custom_headers');
@@ -275,6 +276,15 @@ class HomeWidgetService {
refreshToken: refreshToken,
isLegacyToken: refreshToken == null,
customHeaders: customHeaders ?? const {},
+ loadPersistedTokens: () =>
+ UserAccountService().loadPersistedTokens(serverUrl, username),
+ onTokensRefreshed: (access, refresh) =>
+ UserAccountService().persistRefreshedTokens(
+ access,
+ refresh,
+ serverUrl: serverUrl,
+ username: username,
+ ),
);
try {
@@ -363,6 +373,7 @@ class HomeWidgetService {
final serverUrl = prefs.getString('server_url');
final token = prefs.getString('token');
final refreshToken = prefs.getString('refresh_token');
+ final username = prefs.getString('username');
debugPrint(
'[HomeWidget] play_pause: server=${serverUrl != null}, token=${token != null}',
);
@@ -384,6 +395,15 @@ class HomeWidgetService {
refreshToken: refreshToken,
isLegacyToken: refreshToken == null,
customHeaders: customHeaders ?? const {},
+ loadPersistedTokens: () =>
+ UserAccountService().loadPersistedTokens(serverUrl, username),
+ onTokensRefreshed: (access, refresh) =>
+ UserAccountService().persistRefreshedTokens(
+ access,
+ refresh,
+ serverUrl: serverUrl,
+ username: username,
+ ),
);
final episodeId = prefs.getString('widget_episode_id');
@@ -880,6 +900,7 @@ class HomeWidgetService {
final token = prefs.getString('token');
if (remoteUrl == null || token == null) return null;
final refreshToken = prefs.getString('refresh_token');
+ final username = prefs.getString('username');
Map<String, String>? customHeaders;
final headersJson = prefs.getString('custom_headers');
@@ -912,8 +933,15 @@ class HomeWidgetService {
refreshToken: refreshToken,
isLegacyToken: refreshToken == null,
customHeaders: headers,
+ loadPersistedTokens: () =>
+ UserAccountService().loadPersistedTokens(remoteUrl, username),
onTokensRefreshed: (access, refresh) =>
- UserAccountService().persistRefreshedTokens(access, refresh),
+ UserAccountService().persistRefreshedTokens(
+ access,
+ refresh,
+ serverUrl: remoteUrl,
+ username: username,
+ ),
);
}
diff --git a/lib/services/progress_sync_service.dart b/lib/services/progress_sync_service.dart
index 680c4c0b..cb1313a2 100644
--- a/lib/services/progress_sync_service.dart
+++ b/lib/services/progress_sync_service.dart
@@ -18,6 +18,7 @@ class ProgressSyncService {
bool _isOnline = true;
bool _isFlushing = false;
bool _flushAgain = false;
+ Completer<void>? _flushCompleter;
bool _isFlushingOfflineListening = false;
int _consecutiveFailures = 0;
static const _maxConsecutiveFailures = 10;
@@ -191,10 +192,14 @@ class ProgressSyncService {
if (_isFlushing) {
_flushAgain = true;
+ final activeFlush = _flushCompleter;
+ if (activeFlush != null) await activeFlush.future;
return;
}
_isFlushing = true;
+ final flushCompleter = Completer<void>();
+ _flushCompleter = flushCompleter;
try {
final pendingList = List<String>.from(
await ScopedPrefs.getStringList('pending_syncs'));
@@ -327,6 +332,10 @@ class ProgressSyncService {
}
} finally {
_isFlushing = false;
+ if (!flushCompleter.isCompleted) flushCompleter.complete();
+ if (identical(_flushCompleter, flushCompleter)) {
+ _flushCompleter = null;
+ }
}
final remaining = await ScopedPrefs.getStringList('pending_syncs');
diff --git a/lib/services/user_account_service.dart b/lib/services/user_account_service.dart
index b0a32c66..e7336c98 100644
--- a/lib/services/user_account_service.dart
+++ b/lib/services/user_account_service.dart
@@ -1,6 +1,8 @@
import 'dart:convert';
import 'package:flutter/foundation.dart';
import 'package:shared_preferences/shared_preferences.dart';
+import '../utils/server_url.dart';
+import 'auth_tokens.dart';
/// Represents a saved user account (server + credentials).
class SavedAccount {
@@ -36,7 +38,7 @@ class SavedAccount {
'token': token,
if (refreshToken != null) 'refreshToken': refreshToken,
'userId': userId,
- if (isLegacyToken) 'isLegacyToken': true,
+ 'isLegacyToken': isLegacyToken,
};
factory SavedAccount.fromJson(Map<String, dynamic> json) => SavedAccount(
@@ -161,18 +163,68 @@ class UserAccountService {
/// single-use - so a refresh whose result is only kept in memory strands
/// the on-disk session with an expired access token and a consumed refresh
/// token, and the next app launch can't sign in.
- Future<void> persistRefreshedTokens(String accessToken, String? refreshToken) async {
+ Future<void> persistRefreshedTokens(
+ String accessToken,
+ String? refreshToken, {
+ required String serverUrl,
+ required String? username,
+ }) async {
final prefs = await SharedPreferences.getInstance();
+ await prefs.reload();
+ final activeServer = prefs.getString('server_url');
+ final activeUsername = prefs.getString('username');
+ if (activeServer == null ||
+ normalizeServerUrl(activeServer) != normalizeServerUrl(serverUrl) ||
+ activeUsername != username) {
+ return;
+ }
await prefs.setString('token', accessToken);
if (refreshToken != null) await prefs.setString('refresh_token', refreshToken);
- final serverUrl = prefs.getString('server_url');
- final username = prefs.getString('username');
- if (serverUrl != null && username != null) {
+ if (username != null) {
if (_accounts.isEmpty) await init();
await updateTokens(serverUrl, username, accessToken, refreshToken: refreshToken);
}
}
+ /// Reload the active session from disk. SharedPreferences keeps an
+ /// isolate-local cache, so reload is required before a foreground client can
+ /// see a token rotation performed by background work.
+ Future<AuthTokens?> loadPersistedTokens(
+ String serverUrl, String? username) async {
+ final prefs = await SharedPreferences.getInstance();
+ await prefs.reload();
+ final activeServer = prefs.getString('server_url');
+ final activeUsername = prefs.getString('username');
+ if (activeServer == null ||
+ normalizeServerUrl(activeServer) != normalizeServerUrl(serverUrl) ||
+ activeUsername != username) {
+ return null;
+ }
+ final accessToken = prefs.getString('token');
+ if (accessToken == null || accessToken.isEmpty) return null;
+ return AuthTokens(
+ accessToken: accessToken,
+ refreshToken: prefs.getString('refresh_token'),
+ );
+ }
+
+ /// Keep the server/account available for a prefilled re-login while making
+ /// sure a rejected token cannot be quick-switched back into the app.
+ Future<void> clearTokens(String serverUrl, String username) async {
+ final idx = _accounts.indexWhere(
+ (a) => a.serverUrl == serverUrl && a.username == username);
+ if (idx < 0) return;
+ final old = _accounts[idx];
+ _accounts[idx] = SavedAccount(
+ serverUrl: old.serverUrl,
+ username: old.username,
+ token: '',
+ userId: old.userId,
+ isLegacyToken: old.isLegacyToken,
+ );
+ await _persist();
+ }
+
/// Change the server URL of a saved account (e.g. a dynamic-DNS hostname
/// changed) WITHOUT losing the account's per-user data. The scopeKey is
/// derived from the URL, so every scoped SharedPreferences key is migrated