From 641f96504406ce77b52366c0b0c3e10e3666fb95 Mon Sep 17 00:00:00 2001 From: David Iglesias Date: Wed, 26 Feb 2020 17:10:50 -0800 Subject: [PATCH 1/5] Revert "[connectivity_platform_interface] Add `ConnectivityResult.unknown`. (#2560)" This reverts commit 4411247270069e8b4d4969652b6c2d1d9b694d82. --- .../connectivity_platform_interface/CHANGELOG.md | 5 ----- .../connectivity_platform_interface/lib/src/enums.dart | 5 +---- .../connectivity_platform_interface/lib/src/utils.dart | 3 +-- .../connectivity_platform_interface/pubspec.yaml | 2 +- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/packages/connectivity/connectivity_platform_interface/CHANGELOG.md b/packages/connectivity/connectivity_platform_interface/CHANGELOG.md index 3766106f9b0b..d249985c65f4 100644 --- a/packages/connectivity/connectivity_platform_interface/CHANGELOG.md +++ b/packages/connectivity/connectivity_platform_interface/CHANGELOG.md @@ -1,8 +1,3 @@ -## 2.0.0 - -* Added `ConnectivityResult.unknown`, for the cases where the plugin is unable to determine the -connectivity status of the device. _(This happens mostly in the `web` platform.)_ - ## 1.0.3 * Make the pedantic dev_dependency explicit. diff --git a/packages/connectivity/connectivity_platform_interface/lib/src/enums.dart b/packages/connectivity/connectivity_platform_interface/lib/src/enums.dart index a2d5f8d10f10..9d8cef9e1a66 100644 --- a/packages/connectivity/connectivity_platform_interface/lib/src/enums.dart +++ b/packages/connectivity/connectivity_platform_interface/lib/src/enums.dart @@ -7,10 +7,7 @@ enum ConnectivityResult { mobile, /// None: Device not connected to any network - none, - - /// Unknown: The plugin wasn't able to determine the connectivity status of the device - unknown, + none } /// The status of the location service authorization. diff --git a/packages/connectivity/connectivity_platform_interface/lib/src/utils.dart b/packages/connectivity/connectivity_platform_interface/lib/src/utils.dart index ae412e89c7c9..2ae22e1c9fc3 100644 --- a/packages/connectivity/connectivity_platform_interface/lib/src/utils.dart +++ b/packages/connectivity/connectivity_platform_interface/lib/src/utils.dart @@ -8,9 +8,8 @@ ConnectivityResult parseConnectivityResult(String state) { case 'mobile': return ConnectivityResult.mobile; case 'none': - return ConnectivityResult.none; default: - return ConnectivityResult.unknown; + return ConnectivityResult.none; } } diff --git a/packages/connectivity/connectivity_platform_interface/pubspec.yaml b/packages/connectivity/connectivity_platform_interface/pubspec.yaml index 489515cebc51..78f9473c4452 100644 --- a/packages/connectivity/connectivity_platform_interface/pubspec.yaml +++ b/packages/connectivity/connectivity_platform_interface/pubspec.yaml @@ -3,7 +3,7 @@ description: A common platform interface for the connectivity plugin. homepage: https://github.com/flutter/plugins/tree/master/packages/connectivity/connectivity_platform_interface # NOTE: We strongly prefer non-breaking changes, even at the expense of a # less-clean API. See https://flutter.dev/go/platform-interface-breaking-changes -version: 2.0.0 +version: 1.0.3 dependencies: flutter: From 4434defb35818a7ff562c7636102c9406298fc0d Mon Sep 17 00:00:00 2001 From: David Iglesias Date: Wed, 26 Feb 2020 17:38:42 -0800 Subject: [PATCH 2/5] Version 1.0.3+1 Change to 1.0.3+1 so this can be merged easily after 2.0.0 is removed. --- .../connectivity/connectivity_platform_interface/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/connectivity/connectivity_platform_interface/pubspec.yaml b/packages/connectivity/connectivity_platform_interface/pubspec.yaml index 78f9473c4452..b83def5c825d 100644 --- a/packages/connectivity/connectivity_platform_interface/pubspec.yaml +++ b/packages/connectivity/connectivity_platform_interface/pubspec.yaml @@ -3,7 +3,7 @@ description: A common platform interface for the connectivity plugin. homepage: https://github.com/flutter/plugins/tree/master/packages/connectivity/connectivity_platform_interface # NOTE: We strongly prefer non-breaking changes, even at the expense of a # less-clean API. See https://flutter.dev/go/platform-interface-breaking-changes -version: 1.0.3 +version: 1.0.3+1 dependencies: flutter: From 704a3094034bd6d87b352c0935d213dac461f30f Mon Sep 17 00:00:00 2001 From: David Iglesias Date: Wed, 26 Feb 2020 17:40:07 -0800 Subject: [PATCH 3/5] Document version 1.0.3+1 Document why 1.0.3+1 version was needed (to remove version 2.0.0) --- .../connectivity/connectivity_platform_interface/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/connectivity/connectivity_platform_interface/CHANGELOG.md b/packages/connectivity/connectivity_platform_interface/CHANGELOG.md index d249985c65f4..a4832092073c 100644 --- a/packages/connectivity/connectivity_platform_interface/CHANGELOG.md +++ b/packages/connectivity/connectivity_platform_interface/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.0.3+1 + +* Remove bad `2.0.0` version. + ## 1.0.3 * Make the pedantic dev_dependency explicit. From 1122f8d356bf825aa243b3ee75b3a0a19a5a6e3e Mon Sep 17 00:00:00 2001 From: David Iglesias Date: Thu, 27 Feb 2020 11:17:21 -0800 Subject: [PATCH 4/5] Undo patch bump No need to publish a patch bump in this case, this'll land on red regardless. --- .../connectivity/connectivity_platform_interface/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/connectivity/connectivity_platform_interface/pubspec.yaml b/packages/connectivity/connectivity_platform_interface/pubspec.yaml index b83def5c825d..78f9473c4452 100644 --- a/packages/connectivity/connectivity_platform_interface/pubspec.yaml +++ b/packages/connectivity/connectivity_platform_interface/pubspec.yaml @@ -3,7 +3,7 @@ description: A common platform interface for the connectivity plugin. homepage: https://github.com/flutter/plugins/tree/master/packages/connectivity/connectivity_platform_interface # NOTE: We strongly prefer non-breaking changes, even at the expense of a # less-clean API. See https://flutter.dev/go/platform-interface-breaking-changes -version: 1.0.3+1 +version: 1.0.3 dependencies: flutter: From 3525aa350377eba79032c2145ebc3dbb27334616 Mon Sep 17 00:00:00 2001 From: David Iglesias Date: Thu, 27 Feb 2020 11:17:57 -0800 Subject: [PATCH 5/5] Remove patch bump No need for the patch bump. --- .../connectivity/connectivity_platform_interface/CHANGELOG.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/connectivity/connectivity_platform_interface/CHANGELOG.md b/packages/connectivity/connectivity_platform_interface/CHANGELOG.md index a4832092073c..d249985c65f4 100644 --- a/packages/connectivity/connectivity_platform_interface/CHANGELOG.md +++ b/packages/connectivity/connectivity_platform_interface/CHANGELOG.md @@ -1,7 +1,3 @@ -## 1.0.3+1 - -* Remove bad `2.0.0` version. - ## 1.0.3 * Make the pedantic dev_dependency explicit.