π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Merge branch 'main' into wakelock
AmanRajSinghMouryad30e9af9d9cb
diff --cc mobile/apps/photos/ios/Podfile.lockindex 6aba84b0d9,3719e402cb..a463a44e1c--- a/mobile/apps/photos/ios/Podfile.lock+++ b/mobile/apps/photos/ios/Podfile.lock@@@ -26,11 -28,9 +28,11 @@@ PODS- Flutter- ente_rust (0.0.1):- Flutter+ - ente_screen_brightness (0.0.1):+ - Flutter- ente_screen_cover (0.0.1):- Flutter- - EnteOnnxRuntime (1.28.0-r1)+ - EnteOnnxRuntime (1.28.0-r3)- ffmpeg_kit_custom (6.0.3)- ffmpeg_kit_flutter (6.0.3):- ffmpeg_kit_custom@@@ -485,9 -455,8 +460,9 @@@ SPEC CHECKSUMSente_photos_rust: 2db1f31cbe3f13ef0f52909a52b1f885b880a6ecente_qr: 86beaf5d2644705db9b565b32dd8b82c05fb36afente_rust: d0197ebd5460e8f67576579452b073d698404abe+ ente_screen_brightness: 7dd13c361508ee6098a2578908ebf35e9f567e28ente_screen_cover: 6792566774f1c83939f9c1d03ed0a1f1ded45ae4- EnteOnnxRuntime: 2417796182a546cbd5e3261e21be269054af2043+ EnteOnnxRuntime: c994300f7ef809dd318664cfd85868ca69b3cd1affmpeg_kit_custom: 682b4f2f1ff1f8abae5a92f6c3540f2441d5be99ffmpeg_kit_flutter: 915b345acc97d4142e8a9a8549d177ff10f043f5file_saver: 6cdbcddd690cb02b0c1a0c225b37cd805c2bf8b6diff --cc mobile/apps/photos/ios/Runner.xcodeproj/project.pbxprojindex 7f8edea923,ea2f91a6ba..3bc9891bfa--- a/mobile/apps/photos/ios/Runner.xcodeproj/project.pbxproj+++ b/mobile/apps/photos/ios/Runner.xcodeproj/project.pbxproj@@@ -641,10 -642,8 +642,9 @@@"${BUILT_PRODUCTS_DIR}/ente_photos_rust/ente_photos_rust.framework","${BUILT_PRODUCTS_DIR}/ente_qr/ente_qr.framework","${BUILT_PRODUCTS_DIR}/ente_rust/ente_rust.framework",+ "${BUILT_PRODUCTS_DIR}/ente_screen_brightness/ente_screen_brightness.framework","${BUILT_PRODUCTS_DIR}/ente_screen_cover/ente_screen_cover.framework","${BUILT_PRODUCTS_DIR}/file_saver/file_saver.framework",- "${BUILT_PRODUCTS_DIR}/flutter_email_sender/flutter_email_sender.framework","${BUILT_PRODUCTS_DIR}/flutter_image_compress_common/flutter_image_compress_common.framework","${BUILT_PRODUCTS_DIR}/flutter_inappwebview_ios/flutter_inappwebview_ios.framework","${BUILT_PRODUCTS_DIR}/flutter_local_notifications/flutter_local_notifications.framework",@@@ -743,10 -738,8 +739,9 @@@"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ente_photos_rust.framework","${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ente_qr.framework","${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ente_rust.framework",+ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ente_screen_brightness.framework","${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ente_screen_cover.framework","${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/file_saver.framework",- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_email_sender.framework","${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_image_compress_common.framework","${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_inappwebview_ios.framework","${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_local_notifications.framework",diff --cc mobile/apps/photos/lib/ui/settings/backup/backup_settings_screen.dartindex 28fa17ed51,6377ffac11..89b66f3291--- a/mobile/apps/photos/lib/ui/settings/backup/backup_settings_screen.dart+++ b/mobile/apps/photos/lib/ui/settings/backup/backup_settings_screen.dart@@@ -3,18 -3,14 +3,16 @@@ import "dart:io"import "package:ente_components/ente_components.dart";import "package:ente_pure_utils/ente_pure_utils.dart";import "package:ente_strings/ente_strings.dart";++import "package:ente_ui/utils/dialog_util.dart";import "package:flutter/material.dart";+import "package:hugeicons/hugeicons.dart";import "package:photo_manager/photo_manager.dart";import "package:photos/service_locator.dart";import "package:photos/services/sync/local_sync_service.dart";import "package:photos/services/sync/sync_service.dart";import "package:photos/services/wake_lock_service.dart";import "package:photos/ui/common/backup_flow_helper.dart";-import "package:photos/utils/dialog_util.dart";+import "package:photos/ui/home/large_backup_screen.dart";- import "package:photos/ui/settings/components/settings_item.dart";- import "package:photos/ui/settings/components/settings_page_scaffold.dart";- import "package:photos/utils/dialog_util.dart";class BackupSettingsScreen extends StatelessWidget {const BackupSettingsScreen({super.key});