fix: Showing no connection page when wwan is connection is active (#1393)

Feichtmeier · web-flow · commit e314f2dd7610 · 2025-11-19T08:00:38.000+01:00
Fixes #1390
diff --git a/lib/app/connectivity_model.dart b/lib/app/connectivity_model.dart
@@ -1,86 +1,44 @@
 import 'dart:async';
 
-import 'package:connectivity_plus/connectivity_plus.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_it/flutter_it.dart';
+import 'package:internet_connection_checker_plus/internet_connection_checker_plus.dart';
 import 'package:safe_change_notifier/safe_change_notifier.dart';
 
-import '../common/data/audio_type.dart';
-import '../common/view/snackbars.dart';
-import '../extensions/connectivity_x.dart';
-import '../l10n/l10n.dart';
 import '../player/player_service.dart';
-import '../radio/radio_model.dart';
-import '../settings/settings_model.dart';
 
 class ConnectivityModel extends SafeChangeNotifier {
   ConnectivityModel({
     required PlayerService playerService,
-    required Connectivity connectivity,
-  }) : _connectivity = connectivity,
-       _playerService = playerService;
+    required InternetConnection internetConnection,
+  }) : _playerService = playerService,
+       _internetConnection = internetConnection;
 
   final PlayerService _playerService;
-  final Connectivity _connectivity;
-  Stream<List<ConnectivityResult>> get onConnectivityChanged =>
-      _connectivity.onConnectivityChanged;
-  StreamSubscription<List<ConnectivityResult>>? _connectivitySubscription;
+  final InternetConnection _internetConnection;
+  StreamSubscription<InternetStatus>? _internetConnectionSubscription;
 
-  Future<void> init() async {
-    // TODO: fix https://github.com/fluttercommunity/plus_plugins/issues/1451
-    final fallback = [ConnectivityResult.wifi];
-
-    _connectivitySubscription ??= _connectivity.onConnectivityChanged.listen(
-      _updateConnectivity,
-      onError: (e) => _result = fallback,
-    );
-
-    return _connectivity
-        .checkConnectivity()
-        .then(_updateConnectivity)
-        .catchError((_) => _updateConnectivity(fallback));
-  }
-
-  bool get isOnline => _connectivity.isOnline(_result);
-
-  bool get isMaybeLowBandWidth => _connectivity.isNotWifiNorEthernet(_result);
+  InternetStatus? _internetStatus;
+  bool get isOnline => _internetStatus == InternetStatus.connected;
 
-  List<ConnectivityResult>? get result => _result;
-  List<ConnectivityResult>? _result;
-  void _updateConnectivity(List<ConnectivityResult> newResult) {
-    if (!_connectivity.isOnline(newResult) &&
-        _playerService.audio?.audioType == AudioType.radio) {
-      _playerService.pause();
-    }
-    _result = newResult;
-    notifyListeners();
+  Future<void> init() async {
+    _internetConnectionSubscription ??= _internetConnection.onStatusChange
+        .listen((status) {
+          if (status == InternetStatus.disconnected &&
+              _playerService.audio!.path == null) {
+            _playerService.pause();
+          }
+          _internetStatus = status;
+          notifyListeners();
+        });
+
+    return _internetConnection.internetStatus.then((status) {
+      _internetStatus = status;
+      notifyListeners();
+    });
   }
 
   @override
   Future<void> dispose() async {
-    await _connectivitySubscription?.cancel();
+    await _internetConnectionSubscription?.cancel();
     super.dispose();
   }
 }
-
-void onConnectivityChangedHandler(
-  BuildContext context,
-  AsyncSnapshot<List<ConnectivityResult>?> res,
-  void Function() cancel,
-) {
-  final l10n = context.l10n;
-  final dataSafeMode = di<RadioModel>().dataSafeMode;
-  final notifyDataSafeMode = di<SettingsModel>().notifyDataSafeMode;
-  if (!res.hasData || !context.mounted || !notifyDataSafeMode) {
-    return;
-  }
-
-  if (!dataSafeMode && di<Connectivity>().isNotWifiNorEthernet(res.data)) {
-    di<RadioModel>().setDataSafeMode(true);
-    showSnackBar(context: context, content: Text(l10n.dataSafeModeEnabled));
-  } else if (dataSafeMode &&
-      !di<Connectivity>().isNotWifiNorEthernet(res.data)) {
-    di<RadioModel>().setDataSafeMode(false);
-    showSnackBar(context: context, content: Text(l10n.dataSafeModeDisabled));
-  }
-}
diff --git a/lib/app/view/desktop_home_page.dart b/lib/app/view/desktop_home_page.dart
@@ -73,12 +73,6 @@ class _DesktopHomePageState extends State<DesktopHomePage> {
       select: (DownloadModel m) => m.messageStream,
       handler: downloadMessageStreamHandler,
     );
-
-    registerStreamHandler(
-      select: (ConnectivityModel m) => m.onConnectivityChanged,
-      handler: onConnectivityChangedHandler,
-    );
-
     registerStreamHandler(
       select: (LocalAudioModel m) =>
           m.fileWatcher?.events ?? const Stream<WatchEvent>.empty(),
diff --git a/lib/app/view/mobile_page.dart b/lib/app/view/mobile_page.dart
@@ -11,7 +11,6 @@ import '../../player/view/player_main_controls.dart';
 import '../../player/view/player_view.dart';
 import '../../podcasts/download_model.dart';
 import '../app_model.dart';
-import '../connectivity_model.dart';
 import 'create_master_items.dart';
 import 'mobile_bottom_bar.dart';
 import 'routing_manager.dart';
@@ -31,11 +30,6 @@ class MobilePage extends StatelessWidget with WatchItMixin {
       handler: downloadMessageStreamHandler,
     );
 
-    registerStreamHandler(
-      select: (ConnectivityModel m) => m.onConnectivityChanged,
-      handler: onConnectivityChangedHandler,
-    );
-
     return PopScope(
       canPop: !fullWindowMode,
       onPopInvokedWithResult: (didPop, result) {
diff --git a/lib/common/view/data_safe_mode_dialog.dart b/lib/common/view/data_safe_mode_dialog.dart
diff --git a/lib/extensions/connectivity_x.dart b/lib/extensions/connectivity_x.dart
diff --git a/lib/podcasts/view/lazy_podcast_page.dart b/lib/podcasts/view/lazy_podcast_page.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:podcast_search/podcast_search.dart';
 import 'package:flutter_it/flutter_it.dart';
 
+import '../../app/connectivity_model.dart';
 import '../../common/data/audio.dart';
 import '../../common/logging.dart';
 import '../../common/view/no_search_result_page.dart';
@@ -68,7 +69,10 @@ class _LazyPodcastPageState extends State<LazyPodcastPage> {
 
   @override
   Widget build(BuildContext context) {
+    final isOnline = watchPropertyValue((ConnectivityModel m) => m.isOnline);
+
     return FutureBuilder(
+      key: ValueKey(isOnline),
       future: _episodes,
       builder: (context, snapshot) {
         final feedUrl = widget.feedUrl ?? widget.podcastItem?.feedUrl;
@@ -119,6 +123,7 @@ class _LazyPodcastPageState extends State<LazyPodcastPage> {
           episodes: episodes,
           feedUrl: feedUrl,
           title: title,
+          isOnline: isOnline,
         );
       },
     );
diff --git a/lib/podcasts/view/podcast_page.dart b/lib/podcasts/view/podcast_page.dart
@@ -32,12 +32,14 @@ class PodcastPage extends StatelessWidget with WatchItMixin {
     required this.feedUrl,
     required this.episodes,
     required this.title,
+    this.isOnline = true,
   });
 
   final String feedUrl;
   final String? imageUrl;
   final String title;
   final List<Audio> episodes;
+  final bool isOnline;
 
   @override
   Widget build(BuildContext context) {
@@ -165,6 +167,7 @@ class PodcastPage extends StatelessWidget with WatchItMixin {
                   sliver: SliverPodcastPageList(
                     audios: episodesWithDownloads,
                     pageId: feedUrl,
+                    isOnline: isOnline,
                   ),
                 ),
               ],
diff --git a/lib/podcasts/view/sliver_podcast_page_list.dart b/lib/podcasts/view/sliver_podcast_page_list.dart
@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_it/flutter_it.dart';
 
-import '../../app/connectivity_model.dart';
 import '../../common/data/audio.dart';
 import '../../library/library_model.dart';
 import '../../player/player_model.dart';
@@ -12,17 +11,18 @@ class SliverPodcastPageList extends StatelessWidget with WatchItMixin {
     super.key,
     required this.audios,
     required this.pageId,
+    required this.isOnline,
   });
 
   final List<Audio> audios;
   final String pageId;
+  final bool isOnline;
 
   @override
   Widget build(BuildContext context) {
     final playerModel = di<PlayerModel>();
     final libraryModel = di<LibraryModel>();
     final selectedAudio = watchPropertyValue((PlayerModel m) => m.audio);
-    final isOnline = watchPropertyValue((ConnectivityModel m) => m.isOnline);
 
     return SliverList(
       delegate: SliverChildBuilderDelegate(childCount: audios.length, (
diff --git a/lib/register.dart b/lib/register.dart
@@ -1,9 +1,9 @@
-import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_discord_rpc/flutter_discord_rpc.dart';
 import 'package:flutter_it/flutter_it.dart';
 import 'package:github/github.dart';
+import 'package:internet_connection_checker_plus/internet_connection_checker_plus.dart';
 import 'package:local_notifier/local_notifier.dart';
 import 'package:media_kit/media_kit.dart';
 import 'package:media_kit_video/media_kit_video.dart';
@@ -227,7 +227,7 @@ void registerDependencies() {
       ),
       dependsOn: [SettingsService, LibraryService, NotificationsService],
     )
-    ..registerLazySingleton<Connectivity>(() => Connectivity())
+    ..registerLazySingleton<InternetConnection>(() => InternetConnection())
     ..registerSingletonAsync<RadioService>(
       () async {
         final s = RadioService(
@@ -245,7 +245,7 @@ void registerDependencies() {
     ..registerSingletonAsync<ConnectivityModel>(() async {
       final connectivityModel = ConnectivityModel(
         playerService: di<PlayerService>(),
-        connectivity: di<Connectivity>(),
+        internetConnection: di<InternetConnection>(),
       );
       await connectivityModel.init();
       return connectivityModel;
diff --git a/lib/settings/view/resource_section.dart b/lib/settings/view/resource_section.dart
@@ -52,16 +52,6 @@ class ResourceSection extends StatelessWidget with WatchItMixin {
               value: watchPropertyValue((RadioModel m) => m.dataSafeMode),
             ),
           ),
-          YaruTile(
-            title: Text(l10n.notifyMeAboutDataSafeModeTitle),
-            subtitle: Text(l10n.notifyMeAboutDataSafeModeDescription),
-            trailing: CommonSwitch(
-              onChanged: di<SettingsModel>().setNotifyDataSafeMode,
-              value: watchPropertyValue(
-                (SettingsModel m) => m.notifyDataSafeMode,
-              ),
-            ),
-          ),
           YaruTile(
             title: Text(l10n.saveWindowSizeTitle),
             subtitle: Text(l10n.saveWindowSizeDescription),
diff --git a/pubspec.lock b/pubspec.lock
@@ -283,7 +283,7 @@ packages:
     source: hosted
     version: "8.0.0"
   connectivity_plus:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: connectivity_plus
       sha256: "33bae12a398f841c6cda09d1064212957265869104c478e5ad51e2fb26c3973c"
@@ -726,6 +726,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.5.4"
+  internet_connection_checker_plus:
+    dependency: "direct main"
+    description:
+      name: internet_connection_checker_plus
+      sha256: "66dc124f9b58a630844f61c1ae6f01f100f5fe63d9410506218d81d93d86ead3"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.9.1"
   intl:
     dependency: "direct main"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -18,7 +18,6 @@ dependencies:
   blur: ^4.0.2
   cached_network_image: ^3.4.1
   collection: ^1.18.0
-  connectivity_plus: ^7.0.0
   cupertino_icons: ^1.0.8
   dio: ^5.7.0
   file: ^7.0.0
@@ -40,7 +39,7 @@ dependencies:
   github: ^9.24.0
   gtk: ^2.1.0
   handy_window: ^0.4.0
-
+  internet_connection_checker_plus: ^2.9.1
   intl: ^0.20.2
   lastfm: ^0.0.6
   listenbrainz_dart: ^0.0.4
