Skip to content
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

support new connectivity plus multiple connection types #47

Merged
merged 3 commits into from
Mar 28, 2024
Merged

support new connectivity plus multiple connection types #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
74c04f8
fix:xcode 15 connectivity_plus making crash on iphone
alihassan143 Dec 30, 2023
ef33d19
Merge branch 'Iteo:master' into master
alihassan143 Mar 28, 2024
fe206c3
support new connectivity plus mutiple connection type
alihassan143 Mar 28, 2024
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
21 changes: 12 additions & 9 deletions lib/src/connection_checker.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,11 +177,8 @@ class ConnectionChecker {
Stream<bool> get connectionStream => CombineLatestStream(
[
ConcatStream([
_connectivity
.checkConnectivity()
.asStream()
.map(_connectionTypeMapper.call),
_connectivity.onConnectivityChanged.map(_connectionTypeMapper.call),
_connectivity.checkConnectivity().asStream().map(_connectionType),
_connectivity.onConnectivityChanged.map(_connectionType),
]),
Stream<void>.periodic(_requestInterval),
],
Expand All @@ -204,16 +201,22 @@ class ConnectionChecker {
/// it is more secure to listen for [connectionStream].
Future<bool> get isConnected async {
final result = await _connectivity.checkConnectivity();
final isConnectionTypeOnline =
_connectionTypeMapper.call(result).onlineType;
final isConnectionTypeOnline = _connectionType(result).onlineType;

final reachability = await Future.wait([_hostReachable, _baseUrlReachable]);
final isHostReachable = [isConnectionTypeOnline, ...reachability]
.every((reachable) => reachable == true);
.every((reachable) => reachable);

return isHostReachable;
}

ConnectionType _connectionType(List<ConnectivityResult> results) {
for (final data in results) {
return _connectionTypeMapper.call(data);
}
return ConnectionType.none;
}

/// Returns the current [ConnectionType] of your device.
///
/// Do not use it for determination of your current connection status - this
Expand All @@ -224,7 +227,7 @@ class ConnectionChecker {
/// cellular data connection for example.
Future<ConnectionType> get connectionType async {
final connectivityResult = await _connectivity.checkConnectivity();
return _connectionTypeMapper.call(connectivityResult);
return _connectionType(connectivityResult);
}

/// Resolves as soon as internet connection status get back from offline state.
Expand Down
4 changes: 2 additions & 2 deletions pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ environment:
flutter: ">=3.10.0"

dependencies:
connectivity_plus: ^5.0.2
connectivity_plus: ^6.0.1
flutter:
sdk: flutter
http: ^1.1.0
http: ^1.1.2
rxdart: ^0.27.7

dev_dependencies:
Expand Down
38 changes: 19 additions & 19 deletions test/connection_checker_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ void main() {
),
).thenAnswer((_) => Future.value(true));
when(() => connectivity.checkConnectivity())
.thenAnswer((_) => Future.value(ConnectivityResult.wifi));
.thenAnswer((_) => Future.value([ConnectivityResult.wifi]));
when(() => connectionTypeMapper.call(any()))
.thenAnswer((_) => ConnectionType.wifi);

Expand All @@ -77,7 +77,7 @@ void main() {
),
).thenAnswer((_) => Future.value(true));
when(() => connectivity.checkConnectivity())
.thenAnswer((_) => Future.value(ConnectivityResult.wifi));
.thenAnswer((_) => Future.value([ConnectivityResult.wifi]));
when(() => connectionTypeMapper.call(any()))
.thenAnswer((_) => ConnectionType.wifi);

Expand All @@ -100,7 +100,7 @@ void main() {
),
).thenAnswer((_) => Future.value(true));
when(() => connectivity.checkConnectivity())
.thenAnswer((_) => Future.value(ConnectivityResult.none));
.thenAnswer((_) => Future.value([ConnectivityResult.none]));
when(() => connectionTypeMapper.call(any()))
.thenAnswer((_) => ConnectionType.none);

Expand All @@ -125,7 +125,7 @@ void main() {
when(() => hostReachabilityChecker.canReachAnyHost())
.thenAnswer((_) => Future.value(true));
when(() => connectivity.checkConnectivity())
.thenAnswer((_) => Future.value(ConnectivityResult.wifi));
.thenAnswer((_) => Future.value([ConnectivityResult.wifi]));
when(() => connectionTypeMapper.call(any()))
.thenAnswer((_) => ConnectionType.wifi);

Expand All @@ -145,7 +145,7 @@ void main() {
const expected = ConnectionType.wifi;

when(() => connectivity.checkConnectivity())
.thenAnswer((_) => Future.value(ConnectivityResult.wifi));
.thenAnswer((_) => Future.value([ConnectivityResult.wifi]));
when(() => connectionTypeMapper.call(any())).thenAnswer((_) => expected);

final result = await connectionChecker.connectionType;
Expand All @@ -160,7 +160,7 @@ void main() {
group('untilConnects', () {
test('returns the Future once, after the connection is renewed', () async {
final completer = Completer<bool>();
final controller = StreamController<ConnectivityResult>();
final controller = StreamController<List<ConnectivityResult>>();
when(() => hostReachabilityChecker.canReachAnyHost())
.thenAnswer((_) => Future.value(true));
when(
Expand All @@ -175,14 +175,14 @@ void main() {
when(() => connectionTypeMapper.call(ConnectivityResult.none))
.thenAnswer((_) => ConnectionType.none);
when(() => connectivity.checkConnectivity())
.thenAnswer((_) => Future.value(ConnectivityResult.wifi));
.thenAnswer((_) => Future.value([ConnectivityResult.wifi]));

connectionChecker.untilConnects().whenComplete(() {
completer.complete(true);
});
controller.add(ConnectivityResult.none);
controller.add([ConnectivityResult.none]);
await Future<void>.delayed(requestInterval);
controller.add(ConnectivityResult.wifi);
controller.add([ConnectivityResult.wifi]);

expect(completer.future, completion(true));

Expand All @@ -194,7 +194,7 @@ void main() {
test(
'returns [true] from Stream while hosts are reachable, base url is reachable and connection type is online',
() async {
final controller = StreamController<ConnectivityResult>();
final controller = StreamController<List<ConnectivityResult>>();
when(() => hostReachabilityChecker.canReachAnyHost())
.thenAnswer((_) => Future.value(true));
when(
Expand All @@ -207,7 +207,7 @@ void main() {
when(() => connectionTypeMapper.call(any()))
.thenAnswer((_) => ConnectionType.wifi);
when(() => connectivity.checkConnectivity())
.thenAnswer((_) => Future.value(ConnectivityResult.wifi));
.thenAnswer((_) => Future.value([ConnectivityResult.wifi]));

expectLater(
connectionChecker.connectionStream,
Expand All @@ -219,15 +219,15 @@ void main() {
.called(1);
},
);
controller.add(ConnectivityResult.wifi);
controller.add([ConnectivityResult.wifi]);

controller.close();
});

test(
'returns [true, false] from Stream while hosts are reachable, base url is reachable but connection dropped',
() async {
final controller = StreamController<ConnectivityResult>();
final controller = StreamController<List<ConnectivityResult>>();
when(() => hostReachabilityChecker.canReachAnyHost())
.thenAnswer((_) => Future.value(true));
when(
Expand All @@ -242,7 +242,7 @@ void main() {
when(() => connectionTypeMapper.call(ConnectivityResult.none))
.thenAnswer((_) => ConnectionType.none);
when(() => connectivity.checkConnectivity())
.thenAnswer((_) => Future.value(ConnectivityResult.wifi));
.thenAnswer((_) => Future.value([ConnectivityResult.wifi]));

expectLater(
connectionChecker.connectionStream,
Expand All @@ -253,17 +253,17 @@ void main() {
verify(() => hostReachabilityChecker.hostLookup(baseUrl: baseUrl))
.called(1);
});
controller.add(ConnectivityResult.wifi);
controller.add([ConnectivityResult.wifi]);
await Future<void>.delayed(requestInterval);
controller.add(ConnectivityResult.none);
controller.add([ConnectivityResult.none]);

controller.close();
});

test(
'returns [false] from Stream while hosts are not reachable although connection type is online',
() async {
final controller = StreamController<ConnectivityResult>.broadcast();
final controller = StreamController<List<ConnectivityResult>>.broadcast();
when(() => hostReachabilityChecker.canReachAnyHost())
.thenAnswer((_) => Future.value(false));
when(
Expand All @@ -276,7 +276,7 @@ void main() {
when(() => connectionTypeMapper.call(ConnectivityResult.wifi))
.thenAnswer((_) => ConnectionType.wifi);
when(() => connectivity.checkConnectivity())
.thenAnswer((_) => Future.value(ConnectivityResult.wifi));
.thenAnswer((_) => Future.value([ConnectivityResult.wifi]));

expectLater(
connectionChecker.connectionStream,
Expand All @@ -290,7 +290,7 @@ void main() {
);
},
);
controller.add(ConnectivityResult.wifi);
controller.add([ConnectivityResult.wifi]);

controller.close();
});
Expand Down
Loading