Skip to content

A cross platform Audiobookshelf client for Android and iOS

Dart

Revert online heuristic from user list and admin count

Barnabas72ba6ed40355
diff --git a/lib/screens/admin_screen.dart b/lib/screens/admin_screen.dart
index 5119eec0..920aacf8 100644
--- a/lib/screens/admin_screen.dart
+++ b/lib/screens/admin_screen.dart
@@ -53,30 +53,6 @@ class _AdminScreenState extends State<AdminScreen> {
if (mounted) setState(() => _loading = false);
}
- int get _onlineCount {
- final socketIds = <String>{};
- for (final o in _onlineUsers) {
- if (o is Map) {
- final id = o['id'] as String? ?? '';
- if (id.isNotEmpty) socketIds.add(id);
- }
- }
- final now = DateTime.now().millisecondsSinceEpoch;
- for (final u in _users) {
- if (u is! Map<String, dynamic>) continue;
- final id = u['id'] as String? ?? '';
- if (socketIds.contains(id)) continue;
- final progress = u['mediaProgress'] as List<dynamic>?;
- if (progress == null) continue;
- for (final p in progress) {
- if (p is! Map<String, dynamic>) continue;
- final lastUpdate = p['lastUpdate'] as num? ?? 0;
- if ((now - lastUpdate) < 300000) { socketIds.add(id); break; }
- }
- }
- return socketIds.length;
- }
-
bool get _hasPodcastLibrary => _libraries.any((l) => l['mediaType'] == 'podcast');
List<dynamic> get _activeSessions => _sessions.where((s) {
@@ -120,7 +96,7 @@ class _AdminScreenState extends State<AdminScreen> {
child: Row(children: [
_stat(tt, cs, Icons.dns_rounded, _serverVersion ?? '–', 'Version'),
_stat(tt, cs, Icons.people_rounded, '${_users.length}', 'Users'),
- _stat(tt, cs, Icons.wifi_rounded, '$_onlineCount', 'Online'),
+ _stat(tt, cs, Icons.wifi_rounded, '${_onlineUsers.length}', 'Online'),
_stat(tt, cs, Icons.backup_rounded, '${_backups.length}', 'Backups'),
]),
),
@@ -144,7 +120,7 @@ class _AdminScreenState extends State<AdminScreen> {
_navButton(cs, tt,
icon: Icons.people_rounded,
label: 'Users',
- subtitle: '${_users.length} accounts · $_onlineCount online',
+ subtitle: '${_users.length} accounts · ${_onlineUsers.length} online',
onTap: () async {
await Navigator.push(context, MaterialPageRoute(
builder: (_) => AdminUsersScreen(users: _users, onlineUsers: _onlineUsers, libraries: _libraries)));
diff --git a/lib/screens/admin_users_screen.dart b/lib/screens/admin_users_screen.dart
index 7c927676..8ac79e83 100644
--- a/lib/screens/admin_users_screen.dart
+++ b/lib/screens/admin_users_screen.dart
@@ -76,7 +76,7 @@ class _AdminUsersScreenState extends State<AdminUsersScreen> {
if (oId.isNotEmpty && oId == userId) return true;
final oName = o['username'] as String? ?? '';
return oName.isNotEmpty && oName == username;
- }) || _isRecentlyActive(user);
+ });
return Padding(
padding: const EdgeInsets.fromLTRB(16, 0, 16, 8),
@@ -120,19 +120,6 @@ class _AdminUsersScreenState extends State<AdminUsersScreen> {
);
}
- static bool _isRecentlyActive(dynamic user) {
- if (user is! Map<String, dynamic>) return false;
- final progress = user['mediaProgress'] as List<dynamic>?;
- if (progress == null) return false;
- final now = DateTime.now().millisecondsSinceEpoch;
- for (final p in progress) {
- if (p is! Map<String, dynamic>) continue;
- final lastUpdate = p['lastUpdate'] as num? ?? 0;
- if ((now - lastUpdate) < 300000) return true; // 5 minutes
- }
- return false;
- }
-
void _showUserDetail(Map<String, dynamic> user) {
Navigator.push(context, MaterialPageRoute(
builder: (_) => _UserDetailScreen(user: user, libraries: widget.libraries, onChanged: _reload),
@@ -281,7 +268,7 @@ class _UserDetailScreenState extends State<_UserDetailScreen> {
final now = DateTime.now().millisecondsSinceEpoch;
for (final p in _progressItems) {
final lastUpdate = p['lastUpdate'] as num? ?? 0;
- if ((now - lastUpdate) < 300000) return true; // 5 minutes
+ if ((now - lastUpdate) < 300000) return true;
}
return false;
}