Skip to content

A cross platform Audiobookshelf client for Android and iOS

Dart

Stop the now playing screen from rebuilding itself nonstop and reuse the server client instead of making a new one on every call

Barnabase2c7b8ce4099
diff --git a/lib/providers/auth_provider.dart b/lib/providers/auth_provider.dart
index f4b0f330..03d5642c 100644
--- a/lib/providers/auth_provider.dart
+++ b/lib/providers/auth_provider.dart
@@ -264,18 +264,34 @@ class AuthProvider extends ChangeNotifier {
}).toList();
}
+ // The client for the current session, kept until any of its inputs
+ // change. This getter runs from build methods, and a new client each time
+ // was a new BookOrbit cover proxy check each time, hundreds a second.
+ ApiService? _sessionApi;
+ String? _sessionApiKey;
+
ApiService? get apiService {
// Signed out, every server call fails straight away as unreachable,
// which playback and sync already treat as offline.
if (isSignedOut) return SignedOutPlayback.api();
final url = activeServerUrl;
if (url != null && _accessToken != null) {
- return _createSessionApi(
- baseUrl: url,
- token: _accessToken!,
- refreshToken: _refreshToken,
- isLegacyToken: _isLegacyToken,
- );
+ final headers = (_customHeaders.entries.toList()
+ ..sort((a, b) => a.key.compareTo(b.key)))
+ .map((e) => '${e.key}=${e.value}')
+ .join('&');
+ final key = '${_backend.name}|$url|$_accessToken|$_refreshToken|'
+ '$_isLegacyToken|$_serverUrl|$_username|$headers';
+ if (key != _sessionApiKey || _sessionApi == null) {
+ _sessionApi = _createSessionApi(
+ baseUrl: url,
+ token: _accessToken!,
+ refreshToken: _refreshToken,
+ isLegacyToken: _isLegacyToken,
+ );
+ _sessionApiKey = key;
+ }
+ return _sessionApi;
}
return null;
}
diff --git a/lib/screens/absorbing_screen.dart b/lib/screens/absorbing_screen.dart
index 84d945f9..93b6192a 100644
--- a/lib/screens/absorbing_screen.dart
+++ b/lib/screens/absorbing_screen.dart
@@ -148,7 +148,16 @@ class _AbsorbingScreenState extends State<AbsorbingScreen> {
final qpId = await PlayerSettings.getQueuePlaylistId();
final qcName = await PlayerSettings.getQueueCollectionName();
final showUpNext = await PlayerSettings.getShowUpNextLabel();
- if (mounted) {
+ if (!mounted) return;
+ // build() calls this on every pass, so a setState with nothing new would
+ // schedule the next build and keep the screen rebuilding without end.
+ final changed = mode != _queueMode ||
+ bm != _bookQueueMode ||
+ pm != _podcastQueueMode ||
+ qpId != _queuePlaylistId ||
+ qcName != _queueCollectionName ||
+ showUpNext != _showUpNextLabel;
+ if (changed) {
setState(() {
_queueMode = mode;
_bookQueueMode = bm;
@@ -157,8 +166,8 @@ class _AbsorbingScreenState extends State<AbsorbingScreen> {
_queueCollectionName = qcName;
_showUpNextLabel = showUpNext;
});
- _refreshUpNext();
}
+ _refreshUpNext();
}
bool _showUpNextLabel = true;