Skip to content

fix: prevent crash on Linux without NetworkManager from connectivity_plus DBus FD leak #1035

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Nyantad wants to merge 1 commit into
base: develop
Choose a base branch
from
+52 −28
Open

fix: prevent crash on Linux without NetworkManager from connectivity_plus DBus FD leak #1035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 46 additions & 26 deletions lib/providers/connectivity_provider.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,19 @@ enum ConnectionState {
@Riverpod(keepAlive: true)
class ConnectivityStatus extends _$ConnectivityStatus {
String? localUrl;
DateTime? _lastCheck;
static const Duration _minCheckInterval = Duration(seconds: 5);

@override
ConnectionState build() {
ref.listen(userProvider, (previous, next) {
checkLocalUrl(previous, next);
});
Connectivity().onConnectivityChanged.listen(onStateChange);
final sub = Connectivity().onConnectivityChanged.listen(
onStateChange,
onError: (error) => log('Connectivity stream error: $error'),
);
ref.onDispose(sub.cancel);
checkConnectivity();
return ConnectionState.mobile;
}
Expand All @@ -50,35 +56,49 @@ class ConnectivityStatus extends _$ConnectivityStatus {
}

Future<void> onStateChange(List<ConnectivityResult> connectivityResult) async {
if (connectivityResult.contains(ConnectivityResult.ethernet)) {
state = ConnectionState.ethernet;
} else if (connectivityResult.contains(ConnectivityResult.wifi)) {
state = ConnectionState.wifi;
} else if (connectivityResult.contains(ConnectivityResult.mobile)) {
state = ConnectionState.mobile;
} else if (connectivityResult.contains(ConnectivityResult.none)) {
state = ConnectionState.offline;
try {
if (connectivityResult.contains(ConnectivityResult.ethernet)) {
state = ConnectionState.ethernet;
} else if (connectivityResult.contains(ConnectivityResult.wifi)) {
state = ConnectionState.wifi;
} else if (connectivityResult.contains(ConnectivityResult.mobile)) {
state = ConnectionState.mobile;
} else if (connectivityResult.contains(ConnectivityResult.none)) {
state = ConnectionState.offline;
}
final newUrl = ref.read(userProvider.select((value) => value?.credentials.localUrl));
if (localUrl == newUrl) return;
localUrl = newUrl;
final localConnection = localUrl != null && localUrl?.isNotEmpty == true
? await fetchSystemInfoDynamic(normalizeUrl(localUrl!))
: null;
final correctServerResponse =
localConnection?.id == ref.read(userProvider.select((value) => value?.credentials.serverId));
ref.read(localConnectionAvailableProvider.notifier).update((state) => correctServerResponse);
} catch (e) {
log('Error handling connectivity state change: $e');
}
final newUrl = ref.read(userProvider.select((value) => value?.credentials.localUrl));
if (localUrl == newUrl) return;
localUrl = newUrl;
final localConnection =
localUrl != null && localUrl?.isNotEmpty == true ? await fetchSystemInfoDynamic(normalizeUrl(localUrl!)) : null;
final correctServerResponse =
localConnection?.id == ref.read(userProvider.select((value) => value?.credentials.serverId));
ref.read(localConnectionAvailableProvider.notifier).update((state) => correctServerResponse);
}

Future<void> checkConnectivity() async {
final connectivityResult = await Connectivity().checkConnectivity();
final serverUrl = ref.read(serverUrlProvider);
final checkServer = await probeJellyfinUrl(
serverUrl ?? "",
);
if (checkServer != null) {
onStateChange(connectivityResult);
} else {
onStateChange([ConnectivityResult.none]);
final now = DateTime.now();
if (_lastCheck != null && now.difference(_lastCheck!) < _minCheckInterval) {
return;
}
_lastCheck = now;
try {
final connectivityResult = await Connectivity().checkConnectivity();
final serverUrl = ref.read(serverUrlProvider);
final checkServer = await probeJellyfinUrl(
serverUrl ?? "",
);
if (checkServer != null) {
onStateChange(connectivityResult);
} else {
onStateChange([ConnectivityResult.none]);
}
} catch (e) {
log('Failed to check connectivity: $e');
}
}

Expand Down
8 changes: 6 additions & 2 deletions lib/services/notification_service.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,12 @@ class NotificationService {
}

static Future<String?> getInitialNotificationPayload() async {
final details = await _plugin.getNotificationAppLaunchDetails();
return details?.notificationResponse?.payload;
try {
final details = await _plugin.getNotificationAppLaunchDetails();
return details?.notificationResponse?.payload;
} catch (e) {
return null;
}
}

static Future<bool> requestPermission() async {
Expand Down
Loading