Skip to content

armgit / ente

Public Imported from GitHub
0

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

Upgrade iOS camera plugin to fix iPhone 17 crashes

Neeraj Gupta3ed65e0e465d
diff --git a/mobile/apps/locker/changes/ios-scanner-camera.md b/mobile/apps/locker/changes/ios-scanner-camera.md
new file mode 100644
index 0000000000..e215a2187e
--- /dev/null
+++ b/mobile/apps/locker/changes/ios-scanner-camera.md
@@ -0,0 +1 @@
+- Fix document scanner crashes on iPhone 17
diff --git a/mobile/apps/locker/ios/Podfile.lock b/mobile/apps/locker/ios/Podfile.lock
index d1b345c135..527d947326 100644
--- a/mobile/apps/locker/ios/Podfile.lock
+++ b/mobile/apps/locker/ios/Podfile.lock
@@ -118,7 +118,7 @@ PODS:
DEPENDENCIES:
- app_links (from `.symlinks/plugins/app_links/ios`)
- - camera_avfoundation (from `.symlinks/plugins/camera_avfoundation/ios`)
+ - camera_avfoundation (from `.symlinks/plugins/camera_avfoundation/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`)
@@ -157,7 +157,7 @@ EXTERNAL SOURCES:
app_links:
:path: ".symlinks/plugins/app_links/ios"
camera_avfoundation:
- :path: ".symlinks/plugins/camera_avfoundation/ios"
+ :path: ".symlinks/plugins/camera_avfoundation/darwin"
device_info_plus:
:path: ".symlinks/plugins/device_info_plus/ios"
ente_locker_frb:
@@ -209,7 +209,7 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
app_links: 3dbc685f76b1693c66a6d9dd1e9ab6f73d97dc0a
- camera_avfoundation: 5675ca25298b6f81fa0a325188e7df62cc217741
+ camera_avfoundation: 968a9a5323c79a99c166ad9d7866bfd2047b5a9b
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 4e3f50db78..9537d3a100 100644
--- a/mobile/apps/photos/ios/Podfile.lock
+++ b/mobile/apps/photos/ios/Podfile.lock
@@ -245,7 +245,7 @@ DEPENDENCIES:
- app_links (from `.symlinks/plugins/app_links/ios`)
- audio_session (from `.symlinks/plugins/audio_session/ios`)
- backup_exclusion (from `.symlinks/plugins/backup_exclusion/ios`)
- - camera_avfoundation (from `.symlinks/plugins/camera_avfoundation/ios`)
+ - camera_avfoundation (from `.symlinks/plugins/camera_avfoundation/darwin`)
- connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
- device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
- ente_background_manager (from `.symlinks/plugins/ente_background_manager/ios`)
@@ -330,7 +330,7 @@ EXTERNAL SOURCES:
backup_exclusion:
:path: ".symlinks/plugins/backup_exclusion/ios"
camera_avfoundation:
- :path: ".symlinks/plugins/camera_avfoundation/ios"
+ :path: ".symlinks/plugins/camera_avfoundation/darwin"
connectivity_plus:
:path: ".symlinks/plugins/connectivity_plus/ios"
device_info_plus:
@@ -444,7 +444,7 @@ SPEC CHECKSUMS:
app_links: 3dbc685f76b1693c66a6d9dd1e9ab6f73d97dc0a
audio_session: 9bb7f6c970f21241b19f5a3658097ae459681ba0
backup_exclusion: 4d22d4efd0f5bc0190c41502ed47ffa84eca0edb
- camera_avfoundation: 5675ca25298b6f81fa0a325188e7df62cc217741
+ camera_avfoundation: 968a9a5323c79a99c166ad9d7866bfd2047b5a9b
connectivity_plus: cb623214f4e1f6ef8fe7403d580fdad517d2f7dd
device_info_plus: 21fcca2080fbcd348be798aa36c3e5ed849eefbe
ente_background_manager: f10e3bd64ccd32a3232f0fbacabdd5545af8d81e
diff --git a/mobile/pubspec.lock b/mobile/pubspec.lock
index ddec208552..e2ff2d667a 100644
--- a/mobile/pubspec.lock
+++ b/mobile/pubspec.lock
@@ -250,21 +250,21 @@ packages:
source: hosted
version: "0.6.30"
camera_avfoundation:
- dependency: transitive
+ dependency: "direct overridden"
description:
name: camera_avfoundation
- sha256: "11b4aee2f5e5e038982e152b4a342c749b414aa27857899d20f4323e94cb5f0b"
+ sha256: "9c028ae8aeef80caa9284888917a4479f776e5724557cb7c72291d13d6666d9f"
url: "https://pub.dev"
source: hosted
- version: "0.9.23+2"
+ version: "0.11.0"
camera_platform_interface:
dependency: transitive
description:
name: camera_platform_interface
- sha256: "7ac852d77699acee79f0d438b793feee26721841e50973576419ff5c6d95e9b7"
+ sha256: "9365babc7488a9e93d0ed6dcccd917619fb12ea6f9e601519e1191d4890ee2fe"
url: "https://pub.dev"
source: hosted
- version: "2.13.0"
+ version: "2.14.0"
camera_web:
dependency: transitive
description:
diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index d39d1cc5ce..180bd31d13 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -61,6 +61,9 @@ dev_dependencies:
flutter_lints: 6.0.0
dependency_overrides:
+ # Fixes iPhone 17 camera crashes with ResolutionPreset.max.
+ # https://github.com/flutter/flutter/issues/175828
+ camera_avfoundation: 0.11.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: