From f9965906833186f653ea54059354dafbd1e287d5 Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Wed, 3 May 2023 09:52:17 -0500 Subject: [PATCH] fix version downgrades; remove internet specificity; update licenses --- .../gradle/wrapper/gradle-wrapper.properties | 2 + lib/licenses.dart | 410 ++++++++++++++++++ .../connectivity_plus/README.md | 2 + .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../plus/connectivity/Connectivity.java | 25 +- .../lib/src/connectivity_plus_linux.dart | 13 +- .../src/web/utils/connectivity_result.dart | 5 +- .../CHANGELOG.md | 94 ---- .../lib/src/enums.dart | 9 - .../lib/src/utils.dart | 7 +- pubspec.lock | 35 +- pubspec.yaml | 3 +- 12 files changed, 435 insertions(+), 172 deletions(-) delete mode 100644 lib/third_party/connectivity_plus/connectivity_plus_platform_interface/CHANGELOG.md diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index a5210939..42a7a584 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ #Mon Jun 20 10:33:21 PDT 2022 distributionBase=GRADLE_USER_HOME +# third party plugin connectivity_plus should match, so when updating, also update +# lib/third_party/connectivity_plus/connectivity_plus/android/gradle/wrapper/gradle-wrapper.properties distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists diff --git a/lib/licenses.dart b/lib/licenses.dart index c1cc96e0..6c0e9903 100644 --- a/lib/licenses.dart +++ b/lib/licenses.dart @@ -139,6 +139,416 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.'''); + yield LicenseEntryWithLineBreaks(["connectivity_plus", "connectivity_plus_platform_interface"], ''' + Copyright 2017 The Chromium Authors. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following disclaimer + in the documentation and/or other materials provided with the + distribution. + * Neither the name of Google Inc. nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.'''); + + yield LicenseEntryWithLineBreaks(["connectivity_plus"], ''' + * Copyright (c) 2013-2020, The PurpleI2P Project + * + * This file is part of Purple i2pd project and licensed under BSD3 + * + * See full license text in LICENSE file at top of project tree'''); + + yield LicenseEntryWithLineBreaks(["nm"], '''Mozilla Public License Version 2.0 +================================== + +1. Definitions +-------------- + +1.1. "Contributor" + means each individual or legal entity that creates, contributes to + the creation of, or owns Covered Software. + +1.2. "Contributor Version" + means the combination of the Contributions of others (if any) used + by a Contributor and that particular Contributor's Contribution. + +1.3. "Contribution" + means Covered Software of a particular Contributor. + +1.4. "Covered Software" + means Source Code Form to which the initial Contributor has attached + the notice in Exhibit A, the Executable Form of such Source Code + Form, and Modifications of such Source Code Form, in each case + including portions thereof. + +1.5. "Incompatible With Secondary Licenses" + means + + (a) that the initial Contributor has attached the notice described + in Exhibit B to the Covered Software; or + + (b) that the Covered Software was made available under the terms of + version 1.1 or earlier of the License, but not also under the + terms of a Secondary License. + +1.6. "Executable Form" + means any form of the work other than Source Code Form. + +1.7. "Larger Work" + means a work that combines Covered Software with other material, in + a separate file or files, that is not Covered Software. + +1.8. "License" + means this document. + +1.9. "Licensable" + means having the right to grant, to the maximum extent possible, + whether at the time of the initial grant or subsequently, any and + all of the rights conveyed by this License. + +1.10. "Modifications" + means any of the following: + + (a) any file in Source Code Form that results from an addition to, + deletion from, or modification of the contents of Covered + Software; or + + (b) any new file in Source Code Form that contains any Covered + Software. + +1.11. "Patent Claims" of a Contributor + means any patent claim(s), including without limitation, method, + process, and apparatus claims, in any patent Licensable by such + Contributor that would be infringed, but for the grant of the + License, by the making, using, selling, offering for sale, having + made, import, or transfer of either its Contributions or its + Contributor Version. + +1.12. "Secondary License" + means either the GNU General Public License, Version 2.0, the GNU + Lesser General Public License, Version 2.1, the GNU Affero General + Public License, Version 3.0, or any later versions of those + licenses. + +1.13. "Source Code Form" + means the form of the work preferred for making modifications. + +1.14. "You" (or "Your") + means an individual or a legal entity exercising rights under this + License. For legal entities, "You" includes any entity that + controls, is controlled by, or is under common control with You. For + purposes of this definition, "control" means (a) the power, direct + or indirect, to cause the direction or management of such entity, + whether by contract or otherwise, or (b) ownership of more than + fifty percent (50%) of the outstanding shares or beneficial + ownership of such entity. + +2. License Grants and Conditions +-------------------------------- + +2.1. Grants + +Each Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than patent or trademark) + Licensable by such Contributor to use, reproduce, make available, + modify, display, perform, distribute, and otherwise exploit its + Contributions, either on an unmodified basis, with Modifications, or + as part of a Larger Work; and + +(b) under Patent Claims of such Contributor to make, use, sell, offer + for sale, have made, import, and otherwise transfer either its + Contributions or its Contributor Version. + +2.2. Effective Date + +The licenses granted in Section 2.1 with respect to any Contribution +become effective for each Contribution on the date the Contributor first +distributes such Contribution. + +2.3. Limitations on Grant Scope + +The licenses granted in this Section 2 are the only rights granted under +this License. No additional rights or licenses will be implied from the +distribution or licensing of Covered Software under this License. +Notwithstanding Section 2.1(b) above, no patent license is granted by a +Contributor: + +(a) for any code that a Contributor has removed from Covered Software; + or + +(b) for infringements caused by: (i) Your and any other third party's + modifications of Covered Software, or (ii) the combination of its + Contributions with other software (except as part of its Contributor + Version); or + +(c) under Patent Claims infringed by Covered Software in the absence of + its Contributions. + +This License does not grant any rights in the trademarks, service marks, +or logos of any Contributor (except as may be necessary to comply with +the notice requirements in Section 3.4). + +2.4. Subsequent Licenses + +No Contributor makes additional grants as a result of Your choice to +distribute the Covered Software under a subsequent version of this +License (see Section 10.2) or under the terms of a Secondary License (if +permitted under the terms of Section 3.3). + +2.5. Representation + +Each Contributor represents that the Contributor believes its +Contributions are its original creation(s) or it has sufficient rights +to grant the rights to its Contributions conveyed by this License. + +2.6. Fair Use + +This License is not intended to limit any rights You have under +applicable copyright doctrines of fair use, fair dealing, or other +equivalents. + +2.7. Conditions + +Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted +in Section 2.1. + +3. Responsibilities +------------------- + +3.1. Distribution of Source Form + +All distribution of Covered Software in Source Code Form, including any +Modifications that You create or to which You contribute, must be under +the terms of this License. You must inform recipients that the Source +Code Form of the Covered Software is governed by the terms of this +License, and how they can obtain a copy of this License. You may not +attempt to alter or restrict the recipients' rights in the Source Code +Form. + +3.2. Distribution of Executable Form + +If You distribute Covered Software in Executable Form then: + +(a) such Covered Software must also be made available in Source Code + Form, as described in Section 3.1, and You must inform recipients of + the Executable Form how they can obtain a copy of such Source Code + Form by reasonable means in a timely manner, at a charge no more + than the cost of distribution to the recipient; and + +(b) You may distribute such Executable Form under the terms of this + License, or sublicense it under different terms, provided that the + license for the Executable Form does not attempt to limit or alter + the recipients' rights in the Source Code Form under this License. + +3.3. Distribution of a Larger Work + +You may create and distribute a Larger Work under terms of Your choice, +provided that You also comply with the requirements of this License for +the Covered Software. If the Larger Work is a combination of Covered +Software with a work governed by one or more Secondary Licenses, and the +Covered Software is not Incompatible With Secondary Licenses, this +License permits You to additionally distribute such Covered Software +under the terms of such Secondary License(s), so that the recipient of +the Larger Work may, at their option, further distribute the Covered +Software under the terms of either this License or such Secondary +License(s). + +3.4. Notices + +You may not remove or alter the substance of any license notices +(including copyright notices, patent notices, disclaimers of warranty, +or limitations of liability) contained within the Source Code Form of +the Covered Software, except that You may alter any license notices to +the extent required to remedy known factual inaccuracies. + +3.5. Application of Additional Terms + +You may choose to offer, and to charge a fee for, warranty, support, +indemnity or liability obligations to one or more recipients of Covered +Software. However, You may do so only on Your own behalf, and not on +behalf of any Contributor. You must make it absolutely clear that any +such warranty, support, indemnity, or liability obligation is offered by +You alone, and You hereby agree to indemnify every Contributor for any +liability incurred by such Contributor as a result of warranty, support, +indemnity or liability terms You offer. You may include additional +disclaimers of warranty and limitations of liability specific to any +jurisdiction. + +4. Inability to Comply Due to Statute or Regulation +--------------------------------------------------- + +If it is impossible for You to comply with any of the terms of this +License with respect to some or all of the Covered Software due to +statute, judicial order, or regulation then You must: (a) comply with +the terms of this License to the maximum extent possible; and (b) +describe the limitations and the code they affect. Such description must +be placed in a text file included with all distributions of the Covered +Software under this License. Except to the extent prohibited by statute +or regulation, such description must be sufficiently detailed for a +recipient of ordinary skill to be able to understand it. + +5. Termination +-------------- + +5.1. The rights granted under this License will terminate automatically +if You fail to comply with any of its terms. However, if You become +compliant, then the rights granted under this License from a particular +Contributor are reinstated (a) provisionally, unless and until such +Contributor explicitly and finally terminates Your grants, and (b) on an +ongoing basis, if such Contributor fails to notify You of the +non-compliance by some reasonable means prior to 60 days after You have +come back into compliance. Moreover, Your grants from a particular +Contributor are reinstated on an ongoing basis if such Contributor +notifies You of the non-compliance by some reasonable means, this is the +first time You have received notice of non-compliance with this License +from such Contributor, and You become compliant prior to 30 days after +Your receipt of the notice. + +5.2. If You initiate litigation against any entity by asserting a patent +infringement claim (excluding declaratory judgment actions, +counter-claims, and cross-claims) alleging that a Contributor Version +directly or indirectly infringes any patent, then the rights granted to +You by any and all Contributors for the Covered Software under Section +2.1 of this License shall terminate. + +5.3. In the event of termination under Sections 5.1 or 5.2 above, all +end user license agreements (excluding distributors and resellers) which +have been validly granted by You or Your distributors under this License +prior to termination shall survive termination. + +************************************************************************ +* * +* 6. Disclaimer of Warranty * +* ------------------------- * +* * +* Covered Software is provided under this License on an "as is" * +* basis, without warranty of any kind, either expressed, implied, or * +* statutory, including, without limitation, warranties that the * +* Covered Software is free of defects, merchantable, fit for a * +* particular purpose or non-infringing. The entire risk as to the * +* quality and performance of the Covered Software is with You. * +* Should any Covered Software prove defective in any respect, You * +* (not any Contributor) assume the cost of any necessary servicing, * +* repair, or correction. This disclaimer of warranty constitutes an * +* essential part of this License. No use of any Covered Software is * +* authorized under this License except under this disclaimer. * +* * +************************************************************************ + +************************************************************************ +* * +* 7. Limitation of Liability * +* -------------------------- * +* * +* Under no circumstances and under no legal theory, whether tort * +* (including negligence), contract, or otherwise, shall any * +* Contributor, or anyone who distributes Covered Software as * +* permitted above, be liable to You for any direct, indirect, * +* special, incidental, or consequential damages of any character * +* including, without limitation, damages for lost profits, loss of * +* goodwill, work stoppage, computer failure or malfunction, or any * +* and all other commercial damages or losses, even if such party * +* shall have been informed of the possibility of such damages. This * +* limitation of liability shall not apply to liability for death or * +* personal injury resulting from such party's negligence to the * +* extent applicable law prohibits such limitation. Some * +* jurisdictions do not allow the exclusion or limitation of * +* incidental or consequential damages, so this exclusion and * +* limitation may not apply to You. * +* * +************************************************************************ + +8. Litigation +------------- + +Any litigation relating to this License may be brought only in the +courts of a jurisdiction where the defendant maintains its principal +place of business and such litigation shall be governed by laws of that +jurisdiction, without reference to its conflict-of-law provisions. +Nothing in this Section shall prevent a party's ability to bring +cross-claims or counter-claims. + +9. Miscellaneous +---------------- + +This License represents the complete agreement concerning the subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent +necessary to make it enforceable. Any law or regulation which provides +that the language of a contract shall be construed against the drafter +shall not be used to construe this License against a Contributor. + +10. Versions of the License +--------------------------- + +10.1. New Versions + +Mozilla Foundation is the license steward. Except as provided in Section +10.3, no one other than the license steward has the right to modify or +publish new versions of this License. Each version will be given a +distinguishing version number. + +10.2. Effect of New Versions + +You may distribute the Covered Software under the terms of the version +of the License under which You originally received the Covered Software, +or under the terms of any subsequent version published by the license +steward. + +10.3. Modified Versions + +If you create software not governed by this License, and you want to +create a new license for such software, you may create and use a +modified version of this License if you rename the license and remove +any references to the name of the license steward (except to note that +such modified license differs from this License). + +10.4. Distributing Source Code Form that is Incompatible With Secondary +Licenses + +If You choose to distribute Source Code Form that is Incompatible With +Secondary Licenses under the terms of this version of the License, the +notice described in Exhibit B of this License must be attached. + +Exhibit A - Source Code Form License Notice +------------------------------------------- + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. + +If it is not possible or desirable to put the notice in a particular +file, then You may include the notice in a location (such as a LICENSE +file in a relevant directory) where a recipient would be likely to look +for such a notice. + +You may add additional accurate notices of copyright ownership. + +Exhibit B - "Incompatible With Secondary Licenses" Notice +--------------------------------------------------------- + + This Source Code Form is "Incompatible With Secondary Licenses", as + defined by the Mozilla Public License, v. 2.0.'''); + yield LicenseEntryWithLineBreaks(["Roboto fonts"], ''' Apache License diff --git a/lib/third_party/connectivity_plus/connectivity_plus/README.md b/lib/third_party/connectivity_plus/connectivity_plus/README.md index 8e5b2956..ffdfb29b 100644 --- a/lib/third_party/connectivity_plus/connectivity_plus/README.md +++ b/lib/third_party/connectivity_plus/connectivity_plus/README.md @@ -1,5 +1,7 @@ # connectivity_plus +- Open Privacy has updated this package to use local and stripped down version of `nm` package + [![Flutter Community: connectivity_plus](https://fluttercommunity.dev/_github/header/connectivity_plus)](https://github.com/fluttercommunity/community) [![pub package](https://img.shields.io/pub/v/connectivity_plus.svg)](https://pub.dev/packages/connectivity_plus) diff --git a/lib/third_party/connectivity_plus/connectivity_plus/android/gradle/wrapper/gradle-wrapper.properties b/lib/third_party/connectivity_plus/connectivity_plus/android/gradle/wrapper/gradle-wrapper.properties index 62dbe3c1..477dc87d 100644 --- a/lib/third_party/connectivity_plus/connectivity_plus/android/gradle/wrapper/gradle-wrapper.properties +++ b/lib/third_party/connectivity_plus/connectivity_plus/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/lib/third_party/connectivity_plus/connectivity_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/Connectivity.java b/lib/third_party/connectivity_plus/connectivity_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/Connectivity.java index 02a316bc..7ae7d009 100644 --- a/lib/third_party/connectivity_plus/connectivity_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/Connectivity.java +++ b/lib/third_party/connectivity_plus/connectivity_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/Connectivity.java @@ -12,11 +12,7 @@ import android.os.Build; /** Reports connectivity related information such as connectivity type and wifi information. */ public class Connectivity { static final String CONNECTIVITY_NONE = "none"; - static final String CONNECTIVITY_WIFI = "wifi"; static final String CONNECTIVITY_MOBILE = "mobile"; - static final String CONNECTIVITY_ETHERNET = "ethernet"; - static final String CONNECTIVITY_BLUETOOTH = "bluetooth"; - static final String CONNECTIVITY_VPN = "vpn"; private final ConnectivityManager connectivityManager; public Connectivity(ConnectivityManager connectivityManager) { @@ -30,21 +26,8 @@ public class Connectivity { if (capabilities == null) { return CONNECTIVITY_NONE; } - if (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)) { - return CONNECTIVITY_WIFI; - } - if (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET)) { - return CONNECTIVITY_ETHERNET; - } - if (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_VPN)) { - return CONNECTIVITY_VPN; - } - if (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)) { - return CONNECTIVITY_MOBILE; - } - if (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_BLUETOOTH)) { - return CONNECTIVITY_BLUETOOTH; - } + // Cwtch UI only needs to know if online or offline, not type + return CONNECTIVITY_MOBILE; } return getNetworkTypeLegacy(); @@ -60,14 +43,10 @@ public class Connectivity { int type = info.getType(); switch (type) { case ConnectivityManager.TYPE_BLUETOOTH: - return CONNECTIVITY_BLUETOOTH; case ConnectivityManager.TYPE_ETHERNET: - return CONNECTIVITY_ETHERNET; case ConnectivityManager.TYPE_WIFI: case ConnectivityManager.TYPE_WIMAX: - return CONNECTIVITY_WIFI; case ConnectivityManager.TYPE_VPN: - return CONNECTIVITY_VPN; case ConnectivityManager.TYPE_MOBILE: case ConnectivityManager.TYPE_MOBILE_DUN: case ConnectivityManager.TYPE_MOBILE_HIPRI: diff --git a/lib/third_party/connectivity_plus/connectivity_plus/lib/src/connectivity_plus_linux.dart b/lib/third_party/connectivity_plus/connectivity_plus/lib/src/connectivity_plus_linux.dart index bca6cdfe..e2625137 100644 --- a/lib/third_party/connectivity_plus/connectivity_plus/lib/src/connectivity_plus_linux.dart +++ b/lib/third_party/connectivity_plus/connectivity_plus/lib/src/connectivity_plus_linux.dart @@ -44,18 +44,7 @@ class ConnectivityPlusLinuxPlugin extends ConnectivityPlatform { if (client.connectivity != NetworkManagerConnectivityState.full) { return ConnectivityResult.none; } - if (client.primaryConnectionType.contains('wireless')) { - return ConnectivityResult.wifi; - } - if (client.primaryConnectionType.contains('ethernet')) { - return ConnectivityResult.ethernet; - } - if (client.primaryConnectionType.contains('vpn')) { - return ConnectivityResult.vpn; - } - if (client.primaryConnectionType.contains('bluetooth')) { - return ConnectivityResult.bluetooth; - } + // Open privacy update: we only need online/offline, so deleting type specificity return ConnectivityResult.mobile; } diff --git a/lib/third_party/connectivity_plus/connectivity_plus/lib/src/web/utils/connectivity_result.dart b/lib/third_party/connectivity_plus/connectivity_plus/lib/src/web/utils/connectivity_result.dart index 004cba81..1b64b69c 100644 --- a/lib/third_party/connectivity_plus/connectivity_plus/lib/src/web/utils/connectivity_result.dart +++ b/lib/third_party/connectivity_plus/connectivity_plus/lib/src/web/utils/connectivity_result.dart @@ -39,15 +39,12 @@ ConnectivityResult _typeToConnectivityResult(String type) { case 'none': return ConnectivityResult.none; case 'bluetooth': - return ConnectivityResult.bluetooth; case 'cellular': case 'mixed': case 'other': case 'unknown': - return ConnectivityResult.mobile; case 'ethernet': - return ConnectivityResult.ethernet; default: - return ConnectivityResult.wifi; + return ConnectivityResult.mobile; } } diff --git a/lib/third_party/connectivity_plus/connectivity_plus_platform_interface/CHANGELOG.md b/lib/third_party/connectivity_plus/connectivity_plus_platform_interface/CHANGELOG.md deleted file mode 100644 index c4ae2750..00000000 --- a/lib/third_party/connectivity_plus/connectivity_plus_platform_interface/CHANGELOG.md +++ /dev/null @@ -1,94 +0,0 @@ -## 1.2.4 - - - **FIX**: Do not return ConnectivityResult.none on iOS and MacOS with VPN (#1335). - -## 1.2.3 - - - **FIX**: Increase min Flutter version to fix dartPluginClass registration (#1275). - -## 1.2.2 - -- Add missing VPN enum - -## 1.2.1 - -- Update flutter_lints to 2.0.1 -- Update plugin_platform_interface to 2.1.2 -- Fix analyzer issues - -## 1.2.0 - -- Add bluetooth as connectivity result - -## 1.1.1 - -- Dependencies update - -## 1.1.0 - -- Add ethernet as connectivity result - -## 1.0.2 - -- Update connectivity plus - -## 1.0.1 - -- Improve documentation - -## 1.0.0 - -- Migrated to null safety - -## 0.4.1 - -- Address pub score - -## 0.4.0 - -- Removed members that were moved to network_info_plus - -## 0.3.0 - -- Renamed method channel - -## 0.2.0 - -- Transfer to plus-plugins monorepo - -## 0.1.7 - -- Transfer package to Flutter Community under new name `connectivity_plus_platform_interface`. - -## 0.1.6 - -- Update lower bound of dart dependency to 2.1.0. - -## 0.1.5 - -- Remove dart:io Platform checks from the MethodChannel implementation. This is - tripping the analysis of other versions of the plugin. - -## 0.1.4 - -- Bump the minimum Flutter version to 1.12.13+hotfix.5. - -## 0.1.3 - -- Make the pedantic dev_dependency explicit. - -## 0.1.2 - -- Bring ConnectivityResult and LocationAuthorizationStatus enums from the core package. -- Use the above Enums as return values for ConnectivityPlatformInterface methods. -- Modify the MethodChannel implementation so it returns the right types. -- Bring all utility methods, asserts and other logic that is only needed on the MethodChannel implementation from the core package. -- Bring MethodChannel unit tests from core package. - -## 0.1.1 - -- Fix README.md link. - -## 0.1.0 - -- Initial release. diff --git a/lib/third_party/connectivity_plus/connectivity_plus_platform_interface/lib/src/enums.dart b/lib/third_party/connectivity_plus/connectivity_plus_platform_interface/lib/src/enums.dart index 7f586995..53410c07 100644 --- a/lib/third_party/connectivity_plus/connectivity_plus_platform_interface/lib/src/enums.dart +++ b/lib/third_party/connectivity_plus/connectivity_plus_platform_interface/lib/src/enums.dart @@ -1,7 +1,5 @@ /// Connection status check result. enum ConnectivityResult { - /// Bluetooth: Device connected via bluetooth - bluetooth, /// WiFi: Device connected via Wi-Fi wifi, @@ -15,13 +13,6 @@ enum ConnectivityResult { /// None: Device not connected to any network none, - /// VPN: Device connected to a VPN - /// - /// Note for iOS and macOS: - /// There is no separate network interface type for [vpn]. - /// It returns [other] on any device (also simulator). - vpn, - /// Other: Device is connected to an unknown network other } diff --git a/lib/third_party/connectivity_plus/connectivity_plus_platform_interface/lib/src/utils.dart b/lib/third_party/connectivity_plus/connectivity_plus_platform_interface/lib/src/utils.dart index 4032537d..ecb11d23 100644 --- a/lib/third_party/connectivity_plus/connectivity_plus_platform_interface/lib/src/utils.dart +++ b/lib/third_party/connectivity_plus/connectivity_plus_platform_interface/lib/src/utils.dart @@ -4,17 +4,12 @@ import 'package:connectivity_plus_platform_interface/connectivity_plus_platform_ ConnectivityResult parseConnectivityResult(String state) { switch (state) { case 'bluetooth': - return ConnectivityResult.bluetooth; case 'wifi': - return ConnectivityResult.wifi; case 'ethernet': - return ConnectivityResult.ethernet; case 'mobile': - return ConnectivityResult.mobile; case 'vpn': - return ConnectivityResult.vpn; case 'other': - return ConnectivityResult.other; + return ConnectivityResult.mobile; case 'none': default: return ConnectivityResult.none; diff --git a/pubspec.lock b/pubspec.lock index 7eb708ce..fd020d1b 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,18 +5,18 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: "4826f97faae3af9761f26c52e56b2aa5ffd18d2c1721d984ad85137721c25f43" + sha256: "4897882604d919befd350648c7f91926a9d5de99e67b455bf0917cc2362f4bb8" url: "https://pub.dev" source: hosted - version: "31.0.0" + version: "47.0.0" analyzer: dependency: transitive description: name: analyzer - sha256: "7337610c3f9cd13e6b7c6bb0f410644091cf63c9a1436e73352a70f3286abb03" + sha256: "690e335554a8385bc9d787117d9eb52c0c03ee207a607e593de3c9d71b1cfe80" url: "https://pub.dev" source: hosted - version: "2.8.0" + version: "4.7.0" archive: dependency: transitive description: @@ -77,10 +77,10 @@ packages: dependency: transitive description: name: build_resolvers - sha256: "4666aef1d045c5ca15ebba63e400bd4e4fbd9f0dd06e791b51ab210da78a27f7" + sha256: "687cf90a3951affac1bd5f9ecb5e3e90b60487f3d9cdc359bb310f8876bb02a6" url: "https://pub.dev" source: hosted - version: "2.0.6" + version: "2.0.10" build_runner: dependency: "direct dev" description: @@ -171,10 +171,9 @@ packages: connectivity_plus_platform_interface: dependency: transitive description: - name: connectivity_plus_platform_interface - sha256: cf1d1c28f4416f8c654d7dc3cd638ec586076255d407cef3ddbdaf178272a71a - url: "https://pub.dev" - source: hosted + path: "lib/third_party/connectivity_plus/connectivity_plus_platform_interface" + relative: true + source: path version: "1.2.4" console: dependency: transitive @@ -212,10 +211,10 @@ packages: dependency: transitive description: name: dart_style - sha256: "6e8086e1d3c2f6bc15056ee248c4ddc48c2bc71287c0961bf801a08633ed4333" + sha256: "7a03456c3490394c8e7665890333e91ae8a49be43542b616e414449ac358acd4" url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.2.4" dbus: dependency: "direct main" description: @@ -516,14 +515,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.0" - nm: - dependency: transitive - description: - name: nm - sha256: "2c9aae4127bdc8993206464fcc063611e0e36e72018696cd9631023a31b24254" - url: "https://pub.dev" - source: hosted - version: "0.5.0" package_config: dependency: transitive description: @@ -757,10 +748,10 @@ packages: dependency: transitive description: name: source_gen - sha256: "00f8b6b586f724a8c769c96f1d517511a41661c0aede644544d8d86a1ab11142" + sha256: "2d79738b6bbf38a43920e2b8d189e9a3ce6cc201f4b8fc76be5e4fe377b1c38d" url: "https://pub.dev" source: hosted - version: "1.2.2" + version: "1.2.6" source_span: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 71cca820..aa609ea0 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -47,7 +47,8 @@ dependencies: flutter_local_notifications: ^9.6.1 desktop_notifications: ^0.6.3 # network management plugins - dbus: ^0.7.0 + # dbus >=0.7.5 depends on ffi ^2.0.0 and cwtch depends on ffi ^1.2.1, dbus >=0.7.5 is forbidden. + dbus: 0.7.4 connectivity_plus: path: lib/third_party/connectivity_plus/connectivity_plus # misc plugins