Skip to content

armgit / ente

Public Imported from GitHub
0

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

[mobile] Isolate native HTTP teardown fix to Apple platforms

ashilkn948acdbcc13f
diff --git a/mobile/apps/auth/pubspec.yaml b/mobile/apps/auth/pubspec.yaml
index 0716938e24..688974261e 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.6.0
+ native_dio_adapter: 1.5.1
otp: 3.2.0
package_info_plus: 8.3.1
password_strength: 0.2.0
diff --git a/mobile/apps/photos/changes/apple-http-teardown.md b/mobile/apps/photos/changes/apple-http-teardown.md
new file mode 100644
index 0000000000..28f5a4d129
--- /dev/null
+++ b/mobile/apps/photos/changes/apple-http-teardown.md
@@ -0,0 +1 @@
+- Fixed a crash when background network activity finishes on iOS.
diff --git a/mobile/apps/photos/pubspec.yaml b/mobile/apps/photos/pubspec.yaml
index 2262a33e62..c84f02e3c6 100644
--- a/mobile/apps/photos/pubspec.yaml
+++ b/mobile/apps/photos/pubspec.yaml
@@ -26,7 +26,6 @@ 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
@@ -163,7 +162,7 @@ dependencies:
url: https://github.com/ente/move_to_background.git
ref: 0cdfeed654d79636eff0c57110f3f6ad5801ba2f
nanoid: 1.0.0
- native_dio_adapter: 1.6.0
+ native_dio_adapter: 1.5.1
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 2ec2faa29b..cbda4c61d2 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.6.0
+ native_dio_adapter: 1.5.1
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 cffc14bee9..2f026e6fbf 100644
--- a/mobile/pubspec.lock
+++ b/mobile/pubspec.lock
@@ -443,7 +443,7 @@ packages:
source: hosted
version: "1.0.2"
cupertino_http:
- dependency: transitive
+ dependency: "direct overridden"
description:
name: cupertino_http
sha256: d57188b07349a373bec9a78997a80c00e1de08dab0fe454b3f86c84661ac457c
@@ -1783,10 +1783,10 @@ packages:
dependency: transitive
description:
name: native_dio_adapter
- sha256: "89a84d8936a108c206e481b8da090422abb1351febac4956cd4a8113627ebb5e"
+ sha256: "9bbfa5221fd287eb063962bbe6534290e5f87933e576fac210149fb80253b89a"
url: "https://pub.dev"
source: hosted
- version: "1.6.0"
+ version: "1.5.1"
native_toolchain_c:
dependency: transitive
description:
diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index 0e507063f7..c014c3382f 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -61,6 +61,9 @@ dev_dependencies:
flutter_lints: 6.0.0
dependency_overrides:
+ # Keep the Apple isolate-teardown fix without native_dio_adapter 1.6.0's
+ # shared request-cleanup changes. Adapter 1.5.1 declares Cupertino ^2.3.0.
+ cupertino_http: 3.1.0
# Hosted 3.4.1 drops DB rows but fails to delete cache files; use the
# upstream delete fix until a fixed release ships.
flutter_cache_manager: