[mob][photos] Upgrade connectivity_plus pkg

2024-04-15 15:00:59 +05:30 · 2024-04-15 15:00:59 +05:30 · 223a4ffcfd
commit 223a4ffcfd
parent d8c798e5a2
6 changed files with 13 additions and 80 deletions
--- a/mobile/ios/Podfile.lock
+++ b/mobile/ios/Podfile.lock
@ -3,12 +3,9 @@ PODS:
    - Flutter
  - battery_info (0.0.1):
    - Flutter
-  - bonsoir_darwin (3.0.0):
-    - Flutter
-    - FlutterMacOS
  - connectivity_plus (0.0.1):
    - Flutter
-    - ReachabilitySwift
+    - FlutterMacOS
  - device_info_plus (0.0.1):
    - Flutter
  - file_saver (0.0.1):
@ -171,7 +168,6 @@ PODS:
    - Flutter
    - FlutterMacOS
  - PromisesObjC (2.4.0)
-  - ReachabilitySwift (5.2.1)
  - receive_sharing_intent (1.6.8):
    - Flutter
  - screen_brightness_ios (0.1.0):
@ -231,8 +227,7 @@ PODS:
 DEPENDENCIES:
  - background_fetch (from `.symlinks/plugins/background_fetch/ios`)
  - battery_info (from `.symlinks/plugins/battery_info/ios`)
-  - bonsoir_darwin (from `.symlinks/plugins/bonsoir_darwin/darwin`)
-  - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
+  - connectivity_plus (from `.symlinks/plugins/connectivity_plus/darwin`)
  - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
  - file_saver (from `.symlinks/plugins/file_saver/ios`)
  - firebase_core (from `.symlinks/plugins/firebase_core/ios`)
@ -296,7 +291,6 @@ SPEC REPOS:
    - onnxruntime-objc
    - OrderedSet
    - PromisesObjC
-    - ReachabilitySwift
    - SDWebImage
    - SDWebImageWebPCoder
    - Sentry
@ -309,10 +303,8 @@ EXTERNAL SOURCES:
    :path: ".symlinks/plugins/background_fetch/ios"
  battery_info:
    :path: ".symlinks/plugins/battery_info/ios"
-  bonsoir_darwin:
-    :path: ".symlinks/plugins/bonsoir_darwin/darwin"
  connectivity_plus:
-    :path: ".symlinks/plugins/connectivity_plus/ios"
+    :path: ".symlinks/plugins/connectivity_plus/darwin"
  device_info_plus:
    :path: ".symlinks/plugins/device_info_plus/ios"
  file_saver:
@ -409,8 +401,7 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
  background_fetch: 2319bf7e18237b4b269430b7f14d177c0df09c5a
  battery_info: 09f5c9ee65394f2291c8c6227bedff345b8a730c
-  bonsoir_darwin: 127bdc632fdc154ae2f277a4d5c86a6212bc75be
-  connectivity_plus: 07c49e96d7fc92bc9920617b83238c4d178b446a
+  connectivity_plus: ddd7f30999e1faaef5967c23d5b6d503d10434db
  device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6
  file_saver: 503e386464dbe118f630e17b4c2e1190fa0cf808
  Firebase: 797fd7297b7e1be954432743a0b3f90038e45a71
@ -458,7 +449,6 @@ SPEC CHECKSUMS:
  permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
  photo_manager: 4f6810b7dfc4feb03b461ac1a70dacf91fba7604
  PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
-  ReachabilitySwift: 5ae15e16814b5f9ef568963fb2c87aeb49158c66
  receive_sharing_intent: 6837b01768e567fe8562182397bf43d63d8c6437
  screen_brightness_ios: 715ca807df953bf676d339f11464e438143ee625
  SDWebImage: 40b0b4053e36c660a764958bff99eed16610acbb
--- a/mobile/ios/Runner.xcodeproj/project.pbxproj
+++ b/mobile/ios/Runner.xcodeproj/project.pbxproj
@ -285,7 +285,6 @@
 				"${BUILT_PRODUCTS_DIR}/Mantle/Mantle.framework",
 				"${BUILT_PRODUCTS_DIR}/OrderedSet/OrderedSet.framework",
 				"${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework",
-				"${BUILT_PRODUCTS_DIR}/ReachabilitySwift/Reachability.framework",
 				"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
 				"${BUILT_PRODUCTS_DIR}/SDWebImageWebPCoder/SDWebImageWebPCoder.framework",
 				"${BUILT_PRODUCTS_DIR}/Sentry/Sentry.framework",
@ -293,7 +292,6 @@
 				"${BUILT_PRODUCTS_DIR}/Toast/Toast.framework",
 				"${BUILT_PRODUCTS_DIR}/background_fetch/background_fetch.framework",
 				"${BUILT_PRODUCTS_DIR}/battery_info/battery_info.framework",
-				"${BUILT_PRODUCTS_DIR}/bonsoir_darwin/bonsoir_darwin.framework",
 				"${BUILT_PRODUCTS_DIR}/connectivity_plus/connectivity_plus.framework",
 				"${BUILT_PRODUCTS_DIR}/device_info_plus/device_info_plus.framework",
 				"${BUILT_PRODUCTS_DIR}/file_saver/file_saver.framework",
@ -369,7 +367,6 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Mantle.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OrderedSet.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reachability.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImageWebPCoder.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Sentry.framework",
@ -377,7 +374,6 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Toast.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/background_fetch.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/battery_info.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/bonsoir_darwin.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/connectivity_plus.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/device_info_plus.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/file_saver.framework",
--- a/mobile/lib/services/machine_learning/semantic_search/frameworks/ml_framework.dart
+++ b/mobile/lib/services/machine_learning/semantic_search/frameworks/ml_framework.dart
@ -4,7 +4,6 @@ import "dart:io";
 import "package:connectivity_plus/connectivity_plus.dart";
 import "package:logging/logging.dart";
 import "package:photos/core/errors.dart";
-
 import "package:photos/core/event_bus.dart";
 import "package:photos/events/event.dart";
 import "package:photos/services/remote_assets_service.dart";
@ -23,7 +22,7 @@ abstract class MLFramework {
  MLFramework(this.shouldDownloadOverMobileData) {
    Connectivity()
        .onConnectivityChanged
-        .listen((ConnectivityResult result) async {
+        .listen((List<ConnectivityResult> result) async {
      _logger.info("Connectivity changed to $result");
      if (_state == InitializationState.waitingForNetwork &&
          await _canDownload()) {
--- a/mobile/lib/services/sync_service.dart
+++ b/mobile/lib/services/sync_service.dart
@ -45,7 +45,9 @@ class SyncService {
      sync();
    });

-    Connectivity().onConnectivityChanged.listen((ConnectivityResult result) {
+    Connectivity()
+        .onConnectivityChanged
+        .listen((List<ConnectivityResult> result) {
      _logger.info("Connectivity change detected " + result.toString());
      if (Configuration.instance.hasConfiguredAccount()) {
        sync();
--- a/mobile/pubspec.lock
+++ b/mobile/pubspec.lock
@ -113,38 +113,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.0.6"
-  bonsoir:
-    dependency: transitive
-    description:
-      name: bonsoir
-      sha256: "800d77c0581fff06cc43ef2b7723dfe5ee9b899ab0fdf80fb1c7b8829a5deb5c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.0+1"
-  bonsoir_android:
-    dependency: transitive
-    description:
-      name: bonsoir_android
-      sha256: "7207c36fd7e0f3c7c2d8cf353f02bd640d96e2387d575837f8ac051c9cbf4aa7"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.0+1"
-  bonsoir_darwin:
-    dependency: transitive
-    description:
-      name: bonsoir_darwin
-      sha256: "7211042c85da2d6efa80c0976bbd9568f2b63624097779847548ed4530675ade"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.0"
-  bonsoir_platform_interface:
-    dependency: transitive
-    description:
-      name: bonsoir_platform_interface
-      sha256: "64d57cd52bd477b4891e9b9d419e6408da171ed9e0efc8aa716e7e343d5d93ad"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.0"
  boolean_selector:
    dependency: transitive
    description:
@ -241,14 +209,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.1.1"
-  cast:
-    dependency: "direct main"
-    description:
-      name: cast
-      sha256: b70f6be547a53481dffec93ad3cc4974fae5ed707f0b677d4a50c329d7299b98
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.0"
  characters:
    dependency: transitive
    description:
@ -326,18 +286,18 @@ packages:
    dependency: "direct main"
    description:
      name: connectivity_plus
-      sha256: "77a180d6938f78ca7d2382d2240eb626c0f6a735d0bfdce227d8ffb80f95c48b"
+      sha256: ebe15d94de9dd7c31dc2ac54e42780acdf3384b1497c69290c9f3c5b0279fc57
      url: "https://pub.dev"
    source: hosted
-    version: "4.0.2"
+    version: "6.0.2"
  connectivity_plus_platform_interface:
    dependency: transitive
    description:
      name: connectivity_plus_platform_interface
-      sha256: cf1d1c28f4416f8c654d7dc3cd638ec586076255d407cef3ddbdaf178272a71a
+      sha256: b6a56efe1e6675be240de39107281d4034b64ac23438026355b4234042a35adb
      url: "https://pub.dev"
    source: hosted
-    version: "1.2.4"
+    version: "2.0.0"
  convert:
    dependency: transitive
    description:
@ -1769,14 +1729,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "2.1.0"
-  protobuf:
-    dependency: transitive
-    description:
-      name: protobuf
-      sha256: "68645b24e0716782e58948f8467fd42a880f255096a821f9e7d0ec625b00c84d"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.0"
  provider:
    dependency: "direct main"
    description:
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@ -27,7 +27,6 @@ dependencies:
  battery_info: ^1.1.1
  bip39: ^1.0.6
  cached_network_image: ^3.0.0
-  cast: ^2.0.0
  chewie:
    git:
      url: https://github.com/ente-io/chewie.git
@ -37,11 +36,7 @@ dependencies:
  collection: # dart
  computer:
    git: "https://github.com/ente-io/computer.git"
-  connectivity_plus:
-    git:
-      url: https://github.com/ente-io/plus_plugins.git
-      ref: check_mobile_first
-      path: packages/connectivity_plus/connectivity_plus/
+  connectivity_plus: ^6.0.2
  cross_file: ^0.3.3
  crypto: ^3.0.2
  cupertino_icons: ^1.0.0
@ -175,7 +170,6 @@ dependencies:
  xml: ^6.3.0

 dependency_overrides:
-  connectivity_plus: ^4.0.0
  # Remove this after removing dependency from flutter_sodium.
  # Newer flutter packages depends on ffi > 2.0.0 while flutter_sodium depends on ffi < 2.0.0
  ffi: 2.1.0