Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

fix(photos): upgrade native HTTP callback handling on iOS

laurensprieme9ecaf00f7b2
diff --git a/mobile/apps/auth/ios/Podfile.lock b/mobile/apps/auth/ios/Podfile.lock
index c709687da1..22c2da0422 100644
--- a/mobile/apps/auth/ios/Podfile.lock
+++ b/mobile/apps/auth/ios/Podfile.lock
@@ -5,9 +5,6 @@ PODS:
- Flutter
- connectivity_plus (0.0.1):
- Flutter
- - cupertino_http (0.0.1):
- - Flutter
- - FlutterMacOS
- device_info_plus (0.0.1):
- Flutter
- DKImagePickerController/Core (4.3.9):
@@ -128,7 +125,6 @@ DEPENDENCIES:
- app_links (from `.symlinks/plugins/app_links/ios`)
- backup_exclusion (from `.symlinks/plugins/backup_exclusion/ios`)
- connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
- - cupertino_http (from `.symlinks/plugins/cupertino_http/darwin`)
- device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
- ente_mail (from `.symlinks/plugins/ente_mail/ios`)
- ente_qr (from `.symlinks/plugins/ente_qr/ios`)
@@ -171,8 +167,6 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/backup_exclusion/ios"
connectivity_plus:
:path: ".symlinks/plugins/connectivity_plus/ios"
- cupertino_http:
- :path: ".symlinks/plugins/cupertino_http/darwin"
device_info_plus:
:path: ".symlinks/plugins/device_info_plus/ios"
ente_mail:
@@ -228,7 +222,6 @@ SPEC CHECKSUMS:
app_links: 3dbc685f76b1693c66a6d9dd1e9ab6f73d97dc0a
backup_exclusion: 7aa8535339e746fb217cfdfe8fb8f8a718e4cb0b
connectivity_plus: cb623214f4e1f6ef8fe7403d580fdad517d2f7dd
- cupertino_http: 94ac07f5ff090b8effa6c5e2c47871d48ab7c86c
device_info_plus: 21fcca2080fbcd348be798aa36c3e5ed849eefbe
DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
diff --git a/mobile/apps/auth/macos/Podfile.lock b/mobile/apps/auth/macos/Podfile.lock
index 0dede27c3e..57683cb323 100644
--- a/mobile/apps/auth/macos/Podfile.lock
+++ b/mobile/apps/auth/macos/Podfile.lock
@@ -3,9 +3,6 @@ PODS:
- FlutterMacOS
- connectivity_plus (0.0.1):
- FlutterMacOS
- - cupertino_http (0.0.1):
- - Flutter
- - FlutterMacOS
- device_info_plus (0.0.1):
- FlutterMacOS
- ente_qr (0.0.1):
@@ -79,7 +76,6 @@ PODS:
DEPENDENCIES:
- app_links (from `Flutter/ephemeral/.symlinks/plugins/app_links/macos`)
- connectivity_plus (from `Flutter/ephemeral/.symlinks/plugins/connectivity_plus/macos`)
- - cupertino_http (from `Flutter/ephemeral/.symlinks/plugins/cupertino_http/darwin`)
- device_info_plus (from `Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos`)
- ente_qr (from `Flutter/ephemeral/.symlinks/plugins/ente_qr/macos`)
- file_picker (from `Flutter/ephemeral/.symlinks/plugins/file_picker/macos`)
@@ -111,8 +107,6 @@ EXTERNAL SOURCES:
:path: Flutter/ephemeral/.symlinks/plugins/app_links/macos
connectivity_plus:
:path: Flutter/ephemeral/.symlinks/plugins/connectivity_plus/macos
- cupertino_http:
- :path: Flutter/ephemeral/.symlinks/plugins/cupertino_http/darwin
device_info_plus:
:path: Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos
ente_qr:
@@ -157,7 +151,6 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
app_links: 05a6ec2341985eb05e9f97dc63f5837c39895c3f
connectivity_plus: 4adf20a405e25b42b9c9f87feff8f4b6fde18a4e
- cupertino_http: 94ac07f5ff090b8effa6c5e2c47871d48ab7c86c
device_info_plus: 4fb280989f669696856f8b129e4a5e3cd6c48f76
ente_qr: 679dcacb6a07788ee2e79d29485b07064cdec78d
file_picker: 7584aae6fa07a041af2b36a2655122d42f578c1a
diff --git a/mobile/apps/auth/pubspec.yaml b/mobile/apps/auth/pubspec.yaml
index 688974261e..0716938e24 100644
--- a/mobile/apps/auth/pubspec.yaml
+++ b/mobile/apps/auth/pubspec.yaml
@@ -103,7 +103,7 @@ dependencies:
git:
url: https://github.com/ente/move_to_background.git
ref: 0cdfeed654d79636eff0c57110f3f6ad5801ba2f
- native_dio_adapter: 1.5.1
+ native_dio_adapter: 1.6.0
otp: 3.2.0
package_info_plus: 8.3.1
password_strength: 0.2.0
diff --git a/mobile/apps/locker/ios/Podfile.lock b/mobile/apps/locker/ios/Podfile.lock
index 5cda16d1d1..de3f12be15 100644
--- a/mobile/apps/locker/ios/Podfile.lock
+++ b/mobile/apps/locker/ios/Podfile.lock
@@ -3,9 +3,6 @@ PODS:
- Flutter
- camera_avfoundation (0.0.1):
- Flutter
- - cupertino_http (0.0.1):
- - Flutter
- - FlutterMacOS
- device_info_plus (0.0.1):
- Flutter
- DKImagePickerController/Core (4.3.9):
@@ -122,7 +119,6 @@ PODS:
DEPENDENCIES:
- app_links (from `.symlinks/plugins/app_links/ios`)
- camera_avfoundation (from `.symlinks/plugins/camera_avfoundation/ios`)
- - cupertino_http (from `.symlinks/plugins/cupertino_http/darwin`)
- device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
- ente_locker_frb (from `.symlinks/plugins/ente_locker_frb/ios`)
- ente_mail (from `.symlinks/plugins/ente_mail/ios`)
@@ -162,8 +158,6 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/app_links/ios"
camera_avfoundation:
:path: ".symlinks/plugins/camera_avfoundation/ios"
- cupertino_http:
- :path: ".symlinks/plugins/cupertino_http/darwin"
device_info_plus:
:path: ".symlinks/plugins/device_info_plus/ios"
ente_locker_frb:
@@ -216,7 +210,6 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
app_links: 3dbc685f76b1693c66a6d9dd1e9ab6f73d97dc0a
camera_avfoundation: 5675ca25298b6f81fa0a325188e7df62cc217741
- cupertino_http: 94ac07f5ff090b8effa6c5e2c47871d48ab7c86c
device_info_plus: 21fcca2080fbcd348be798aa36c3e5ed849eefbe
DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
diff --git a/mobile/apps/photos/ios/Podfile.lock b/mobile/apps/photos/ios/Podfile.lock
index 51c5b4f063..ca5396d02b 100644
--- a/mobile/apps/photos/ios/Podfile.lock
+++ b/mobile/apps/photos/ios/Podfile.lock
@@ -9,9 +9,6 @@ PODS:
- Flutter
- connectivity_plus (0.0.1):
- Flutter
- - cupertino_http (0.0.1):
- - Flutter
- - FlutterMacOS
- device_info_plus (0.0.1):
- Flutter
- ente_background_manager (0.0.1):
@@ -249,7 +246,6 @@ DEPENDENCIES:
- backup_exclusion (from `.symlinks/plugins/backup_exclusion/ios`)
- camera_avfoundation (from `.symlinks/plugins/camera_avfoundation/ios`)
- connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
- - cupertino_http (from `.symlinks/plugins/cupertino_http/darwin`)
- device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
- ente_background_manager (from `.symlinks/plugins/ente_background_manager/ios`)
- ente_cast (from `.symlinks/plugins/ente_cast/ios`)
@@ -336,8 +332,6 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/camera_avfoundation/ios"
connectivity_plus:
:path: ".symlinks/plugins/connectivity_plus/ios"
- cupertino_http:
- :path: ".symlinks/plugins/cupertino_http/darwin"
device_info_plus:
:path: ".symlinks/plugins/device_info_plus/ios"
ente_background_manager:
@@ -451,7 +445,6 @@ SPEC CHECKSUMS:
backup_exclusion: 7aa8535339e746fb217cfdfe8fb8f8a718e4cb0b
camera_avfoundation: 5675ca25298b6f81fa0a325188e7df62cc217741
connectivity_plus: cb623214f4e1f6ef8fe7403d580fdad517d2f7dd
- cupertino_http: 94ac07f5ff090b8effa6c5e2c47871d48ab7c86c
device_info_plus: 21fcca2080fbcd348be798aa36c3e5ed849eefbe
ente_background_manager: f10e3bd64ccd32a3232f0fbacabdd5545af8d81e
ente_cast: a25feb3127397e5fc6aff03a12120916707757d4
diff --git a/mobile/apps/photos/ios/Runner.xcodeproj/project.pbxproj b/mobile/apps/photos/ios/Runner.xcodeproj/project.pbxproj
index bc5e0263ac..c57ea907f9 100644
--- a/mobile/apps/photos/ios/Runner.xcodeproj/project.pbxproj
+++ b/mobile/apps/photos/ios/Runner.xcodeproj/project.pbxproj
@@ -635,7 +635,6 @@
"${BUILT_PRODUCTS_DIR}/backup_exclusion/backup_exclusion.framework",
"${BUILT_PRODUCTS_DIR}/camera_avfoundation/camera_avfoundation.framework",
"${BUILT_PRODUCTS_DIR}/connectivity_plus/connectivity_plus.framework",
- "${BUILT_PRODUCTS_DIR}/cupertino_http/cupertino_http.framework",
"${BUILT_PRODUCTS_DIR}/device_info_plus/device_info_plus.framework",
"${BUILT_PRODUCTS_DIR}/ente_background_manager/ente_background_manager.framework",
"${BUILT_PRODUCTS_DIR}/ente_cast/ente_cast.framework",
@@ -732,7 +731,6 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/backup_exclusion.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/camera_avfoundation.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/connectivity_plus.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/cupertino_http.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/device_info_plus.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ente_background_manager.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ente_cast.framework",
diff --git a/mobile/apps/photos/pubspec.yaml b/mobile/apps/photos/pubspec.yaml
index c84f02e3c6..2262a33e62 100644
--- a/mobile/apps/photos/pubspec.yaml
+++ b/mobile/apps/photos/pubspec.yaml
@@ -26,6 +26,7 @@ dependencies:
ref: 82e365fed8a1a76f6eea0220de98389eed7b0445
connectivity_plus: 6.1.4
crypto: 3.0.7
+ cupertino_http: 3.1.0
cupertino_icons: 1.0.8
defer_pointer: 0.0.2
device_info_plus: 11.5.0
@@ -162,7 +163,7 @@ dependencies:
url: https://github.com/ente/move_to_background.git
ref: 0cdfeed654d79636eff0c57110f3f6ad5801ba2f
nanoid: 1.0.0
- native_dio_adapter: 1.5.1
+ native_dio_adapter: 1.6.0
native_video_editor:
path: ../../packages/native_video_editor
native_video_player: 4.0.1
diff --git a/mobile/packages/network/pubspec.yaml b/mobile/packages/network/pubspec.yaml
index cbda4c61d2..2ec2faa29b 100644
--- a/mobile/packages/network/pubspec.yaml
+++ b/mobile/packages/network/pubspec.yaml
@@ -15,7 +15,7 @@ dependencies:
path: ../../packages/events
flutter:
sdk: flutter
- native_dio_adapter: 1.5.1
+ native_dio_adapter: 1.6.0
package_info_plus: 8.3.1
ua_client_hints: 1.4.1
uuid: 4.5.3
diff --git a/mobile/pubspec.lock b/mobile/pubspec.lock
index fa30a66486..cffc14bee9 100644
--- a/mobile/pubspec.lock
+++ b/mobile/pubspec.lock
@@ -446,10 +446,10 @@ packages:
dependency: transitive
description:
name: cupertino_http
- sha256: "82cbec60c90bf785a047a9525688b6dacac444e177e1d5a5876963d3c50369e8"
+ sha256: d57188b07349a373bec9a78997a80c00e1de08dab0fe454b3f86c84661ac457c
url: "https://pub.dev"
source: hosted
- version: "2.4.0"
+ version: "3.1.0"
cupertino_icons:
dependency: transitive
description:
@@ -1783,10 +1783,18 @@ packages:
dependency: transitive
description:
name: native_dio_adapter
- sha256: "9bbfa5221fd287eb063962bbe6534290e5f87933e576fac210149fb80253b89a"
+ sha256: "89a84d8936a108c206e481b8da090422abb1351febac4956cd4a8113627ebb5e"
url: "https://pub.dev"
source: hosted
- version: "1.5.1"
+ version: "1.6.0"
+ native_toolchain_c:
+ dependency: transitive
+ description:
+ name: native_toolchain_c
+ sha256: f9c168717100ae6d9fee9ffb0be379bf1f8b26b0f6bcbd4fdddcd931993a6a72
+ url: "https://pub.dev"
+ source: hosted
+ version: "0.19.2"
native_video_player:
dependency: transitive
description:
@@ -1823,10 +1831,10 @@ packages:
dependency: transitive
description:
name: objective_c
- sha256: "6cb691c686fa2838c6deb34980d426145c2a5d537491cb83d463c33cdbc726ed"
+ sha256: b7fb95a6d9a4f009edd63dc5ac69f07420b23a16161c6dd8660290b59c602e8e
url: "https://pub.dev"
source: hosted
- version: "9.4.1"
+ version: "9.5.0"
open_file:
dependency: transitive
description: