fix(bootstrap): skip refresh page if no network

canonical · Apr 5, 2024 · 7f23980 · 7f23980
1 parent 113cbb4
commit 7f23980
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 5 deletions.
diff --git a/packages/ubuntu_bootstrap/lib/pages/refresh/refresh_model.dart b/packages/ubuntu_bootstrap/lib/pages/refresh/refresh_model.dart
@@ -4,22 +4,27 @@ import 'dart:io';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:ubuntu_bootstrap/services.dart';
+import 'package:ubuntu_provision/services.dart';
 
 export 'package:subiquity_client/subiquity_client.dart' show RefreshCheckState;
 export 'package:ubuntu_bootstrap/services.dart' show RefreshState;
 
-final refreshModelProvider =
-    ChangeNotifierProvider((_) => RefreshModel(getService<RefreshService>()));
+final refreshModelProvider = ChangeNotifierProvider((_) => RefreshModel(
+      getService<RefreshService>(),
+      getService<NetworkService>(),
+    ));
 
 class RefreshModel extends ChangeNotifier {
-  RefreshModel(this._service);
+  RefreshModel(this._service, this._network);
 
   final RefreshService _service;
+  final NetworkService _network;
   StreamSubscription<RefreshState>? _stateChanged;
 
   RefreshState get state => _service.state;
 
   Future<bool> init() async {
+    if (!_network.isConnected) return false;
     _stateChanged = _service.stateChanged.listen((_) => notifyListeners());
     return _service.check().then((state) => state.available);
   }

diff --git a/packages/ubuntu_bootstrap/test/refresh/refresh_model_test.dart b/packages/ubuntu_bootstrap/test/refresh/refresh_model_test.dart
@@ -18,7 +18,10 @@ void main() async {
     when(service.stateChanged).thenAnswer((_) => controller.stream);
     when(service.check()).thenAnswer((_) async => checking);
 
-    final model = RefreshModel(service);
+    final network = MockNetworkService();
+    when(network.isConnected).thenReturn(true);
+
+    final model = RefreshModel(service, network);
     expect(model.state, equals(checking));
 
     await model.init();
@@ -36,8 +39,22 @@ void main() async {
   test('refresh', () async {
     final service = MockRefreshService();
 
-    final model = RefreshModel(service);
+    final network = MockNetworkService();
+    when(network.isConnected).thenReturn(true);
+
+    final model = RefreshModel(service, network);
     await model.refresh();
     verify(service.refresh()).called(1);
   });
+
+  test('no network', () async {
+    final service = MockRefreshService();
+
+    final network = MockNetworkService();
+    when(network.isConnected).thenReturn(false);
+
+    final model = RefreshModel(service, network);
+    final available = await model.init();
+    expect(available, isFalse);
+  });
 }