π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[mob][photos] Fix iOS push registration (#13988)
aman-pilot4a6c2010de75
diff --git a/mobile/apps/photos/changes/fix-ios-push-registration.md b/mobile/apps/photos/changes/fix-ios-push-registration.mdnew file mode 100644index 0000000000..d68fe30ca0--- /dev/null+++ b/mobile/apps/photos/changes/fix-ios-push-registration.md@@ -0,0 +1 @@+- Fixed push notification registration on iOS.diff --git a/mobile/apps/photos/ios/Podfile.lock b/mobile/apps/photos/ios/Podfile.lockindex 2339cc0f68..199adf831f 100644--- a/mobile/apps/photos/ios/Podfile.lock+++ b/mobile/apps/photos/ios/Podfile.lock@@ -34,33 +34,33 @@ PODS:- EnteOnnxRuntime (1.28.1-r1)- file_saver (0.0.1):- Flutter- - Firebase/CoreOnly (11.15.0):- - FirebaseCore (~> 11.15.0)- - Firebase/Messaging (11.15.0):+ - Firebase/CoreOnly (12.19.0):+ - FirebaseCore (~> 12.19.0)+ - Firebase/Messaging (12.19.0):- Firebase/CoreOnly- - FirebaseMessaging (~> 11.15.0)- - firebase_core (3.15.1):- - Firebase/CoreOnly (= 11.15.0)+ - FirebaseMessaging (~> 12.19.0)+ - firebase_core (5.0.0):+ - Firebase/CoreOnly (= 12.19.0)- Flutter- - firebase_messaging (15.2.9):- - Firebase/Messaging (= 11.15.0)+ - firebase_messaging (17.0.0):+ - Firebase/Messaging (= 12.19.0)- firebase_core- Flutter- - FirebaseCore (11.15.0):- - FirebaseCoreInternal (~> 11.15.0)+ - FirebaseCore (12.19.3):+ - FirebaseCoreInternal (~> 12.19.0)- GoogleUtilities/Environment (~> 8.1)- GoogleUtilities/Logger (~> 8.1)- - FirebaseCoreInternal (11.15.0):+ - FirebaseCoreInternal (12.19.0):- "GoogleUtilities/NSData+zlib (~> 8.1)"- - FirebaseInstallations (11.15.0):- - FirebaseCore (~> 11.15.0)+ - FirebaseInstallations (12.19.0):+ - FirebaseCore (~> 12.19.0)- GoogleUtilities/Environment (~> 8.1)- GoogleUtilities/UserDefaults (~> 8.1)- PromisesObjC (~> 2.4)- - FirebaseMessaging (11.15.0):- - FirebaseCore (~> 11.15.0)- - FirebaseInstallations (~> 11.0)- - GoogleDataTransport (~> 10.0)+ - FirebaseMessaging (12.19.0):+ - FirebaseCore (~> 12.19.0)+ - FirebaseInstallations (~> 12.19.0)+ - GoogleDataTransport (~> 10.1)- GoogleUtilities/AppDelegateSwizzler (~> 8.1)- GoogleUtilities/Environment (~> 8.1)- GoogleUtilities/Reachability (~> 8.1)@@ -91,31 +91,31 @@ PODS:- Flutter- fluttertoast (0.0.2):- Flutter- - GoogleDataTransport (10.1.0):+ - GoogleDataTransport (10.1.1):- nanopb (~> 3.30910.0)- PromisesObjC (~> 2.4)- - GoogleUtilities/AppDelegateSwizzler (8.1.0):+ - GoogleUtilities/AppDelegateSwizzler (8.1.5):- GoogleUtilities/Environment- GoogleUtilities/Logger- GoogleUtilities/Network- GoogleUtilities/Privacy- - GoogleUtilities/Environment (8.1.0):+ - GoogleUtilities/Environment (8.1.5):- GoogleUtilities/Privacy- - GoogleUtilities/Logger (8.1.0):+ - GoogleUtilities/Logger (8.1.5):- GoogleUtilities/Environment- GoogleUtilities/Privacy- - GoogleUtilities/Network (8.1.0):+ - GoogleUtilities/Network (8.1.5):- GoogleUtilities/Logger- "GoogleUtilities/NSData+zlib"- GoogleUtilities/Privacy- GoogleUtilities/Reachability- - "GoogleUtilities/NSData+zlib (8.1.0)":+ - "GoogleUtilities/NSData+zlib (8.1.5)":- GoogleUtilities/Privacy- - GoogleUtilities/Privacy (8.1.0)- - GoogleUtilities/Reachability (8.1.0):+ - GoogleUtilities/Privacy (8.1.5)+ - GoogleUtilities/Reachability (8.1.5):- GoogleUtilities/Logger- GoogleUtilities/Privacy- - GoogleUtilities/UserDefaults (8.1.0):+ - GoogleUtilities/UserDefaults (8.1.5):- GoogleUtilities/Logger- GoogleUtilities/Privacy- home_widget (0.0.1):@@ -176,7 +176,7 @@ PODS:- pro_image_editor (12.0.8):- Flutter- FlutterMacOS- - PromisesObjC (2.4.0)+ - PromisesObjC (2.4.1)- receive_sharing_intent (1.8.1):- Flutter- rive_native (0.0.1):@@ -450,13 +450,13 @@ SPEC CHECKSUMS:ente_vision: 260965fb4a3bda0c0cb72c5f15eb8748fef7c897EnteOnnxRuntime: 7baa83a95717a6c9c8d0d4599f9f2c90b72d2905file_saver: 6cdbcddd690cb02b0c1a0c225b37cd805c2bf8b6- Firebase: d99ac19b909cd2c548339c2241ecd0d1599ab02e- firebase_core: ece862f94b2bc72ee0edbeec7ab5c7cb09fe1ab5- firebase_messaging: e1a5fae495603115be1d0183bc849da748734e2b- FirebaseCore: efb3893e5b94f32b86e331e3bd6dadf18b66568e- FirebaseCoreInternal: 9afa45b1159304c963da48addb78275ef701c6b4- FirebaseInstallations: 317270fec08a5d418fdbc8429282238cab3ac843- FirebaseMessaging: 3b26e2cee503815e01c3701236b020aa9b576f09+ Firebase: 7ca191e43724142f79fae653547b3382c45413cc+ firebase_core: aa2923f301f5b09667356bb91e59308e6e2e38d3+ firebase_messaging: 01fe7740dac1005d38a2788b3f177a0497ce8564+ FirebaseCore: ab948de5d99e69aeed3cd6f5ace263ce795b2559+ FirebaseCoreInternal: 656b1c2fd5a1c5976183dc54b73deda78fb26ee3+ FirebaseInstallations: f70a49eed611f5602f373e40974b3b01556ac217+ FirebaseMessaging: c15f48126adbe8b4d3238a5e1fa24bab3ad3e472Flutter: 71a624a5bc0c04062bf19101d501e466baf2fb47flutter_image_compress_common: 1697a328fd72bfb335507c6bca1a65fa5ad87df1flutter_inappwebview_ios: b89ba3482b96fb25e00c967aae065701b66e9b99@@ -466,8 +466,8 @@ SPEC CHECKSUMS:flutter_sodium: e09c1b44d52949ffbd42afc22c023c13b4728223flutter_timezone: 7c838e17ffd4645d261e87037e5bebf6d38fe544fluttertoast: 2c67e14dce98bbdb200df9e1acf610d7a6264ea1- GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7- GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1+ GoogleDataTransport: a24e58982ab3ba2f64d79613e027fe7f57e88539+ GoogleUtilities: 7dc09b3fa9ecb5c2298b952313d14628b61b9da3home_widget: f169fc41fd807b4d46ab6615dc44d62adbf9f64fin_app_purchase_storekit: 22cca7d08eebca9babdf4d07d0baccb73325d3c8integration_test: 4a889634ef21a45d28d50d622cf412dc6d9f586e@@ -488,7 +488,7 @@ SPEC CHECKSUMS:permission_handler_apple: 92d754bbaa7361d436db2d6c3c1c2a0fdcec462ephoto_manager: 6ab48c2ce7ec21aa06d59e6cc049f0b6d9ba7f94pro_image_editor: e57a76b305fd8c2e06d57f92aec82b9c6a6e8d9f- PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47+ PromisesObjC: 752c3227f599e3467650e47ea36f433eeb10c273receive_sharing_intent: 222384f00ffe7e952bbfabaa9e3967cb87e5fe00rive_native: a57df296c558867395bfe82fafe857ec67640f58SDWebImage: e9c98383c7572d713c1a0d7dd2783b10599b9838diff --git a/mobile/apps/photos/lib/services/push_service.dart b/mobile/apps/photos/lib/services/push_service.dartindex 9b567fa8ca..cef52e1419 100644--- a/mobile/apps/photos/lib/services/push_service.dart+++ b/mobile/apps/photos/lib/services/push_service.dart@@ -59,6 +59,7 @@ class PushService {unawaited(_configurePushToken());});await _tokenRefreshSubscription?.cancel();+ // ignore: deprecated_member_use_tokenRefreshSubscription = FirebaseMessaging.instance.onTokenRefresh.listen((_) => unawaited(_configurePushToken()),@@ -73,6 +74,7 @@ class PushService {final sessionToken = Configuration.instance.getToken();if (sessionToken == null) return;try {+ // ignore: deprecated_member_usefinal String? fcmToken = await FirebaseMessaging.instance.getToken();final shouldForceRefreshServerToken =DateTime.now().microsecondsSinceEpoch -diff --git a/mobile/apps/photos/pubspec.yaml b/mobile/apps/photos/pubspec.yamlindex 6fcbc7a2ca..f9ed80dec0 100644--- a/mobile/apps/photos/pubspec.yaml+++ b/mobile/apps/photos/pubspec.yaml@@ -90,8 +90,8 @@ dependencies:path: plugins/ffmpegfigma_squircle: 0.6.3file_saver: 0.3.1- firebase_core: 3.15.1- firebase_messaging: 15.2.9+ firebase_core: 5.0.0+ firebase_messaging: 17.0.0flutter:sdk: flutterflutter_animate: 4.5.2diff --git a/mobile/pubspec.lock b/mobile/pubspec.lockindex 235db84dcf..b71e99c9b7 100644--- a/mobile/pubspec.lock+++ b/mobile/pubspec.lock@@ -13,10 +13,10 @@ packages:dependency: transitivedescription:name: _flutterfire_internals- sha256: a5788040810bd84400bc209913fbc40f388cded7cdf95ee2f5d2bff7e38d5241+ sha256: a954052ffb2829f1f2cd16900658724952f7f48d053941a5c78dd12c19d7b9b9url: "https://pub.dev"source: hosted- version: "1.3.58"+ version: "1.3.78"adaptive_theme:dependency: transitivedescription:@@ -709,50 +709,50 @@ packages:dependency: transitivedescription:name: firebase_core- sha256: c6e8a6bf883d8ddd0dec39be90872daca65beaa6f4cff0051ed3b16c56b82e9f+ sha256: "7d4306a9ac6eaed45df40c63f81275bf46dc65083947b8c1665c8d7c04a74743"url: "https://pub.dev"source: hosted- version: "3.15.1"+ version: "5.0.0"firebase_core_platform_interface:dependency: transitivedescription:name: firebase_core_platform_interface- sha256: "0ecda14c1bfc9ed8cac303dd0f8d04a320811b479362a9a4efb14fd331a473ce"+ sha256: "9bfbc85faca09346471ac56fbcee00757ebcfd85887c6f602764eff0001902d8"url: "https://pub.dev"source: hosted- version: "6.0.3"+ version: "8.1.1"firebase_core_web:dependency: transitivedescription:name: firebase_core_web- sha256: "0ed0dc292e8f9ac50992e2394e9d336a0275b6ae400d64163fdf0a8a8b556c37"+ sha256: d5bf0dcaae08e6aa34e95e416a69998b0570951d3619c5c898f435d6b83304b4url: "https://pub.dev"source: hosted- version: "2.24.1"+ version: "4.0.0"firebase_messaging:dependency: transitivedescription:name: firebase_messaging- sha256: "0f3363f97672eb9f65609fa00ed2f62cc8ec93e7e2d4def99726f9165d3d8a73"+ sha256: "0d58c6508c66a94370e7fac1cd3940ce2ad1728260c410fd67f92ca1fa1cca96"url: "https://pub.dev"source: hosted- version: "15.2.9"+ version: "17.0.0"firebase_messaging_platform_interface:dependency: transitivedescription:name: firebase_messaging_platform_interface- sha256: "7a05ef119a14c5f6a9440d1e0223bcba20c8daf555450e119c4c477bf2c3baa9"+ sha256: "9a79d553b26e973a2161b2a5a54907501e8ee7a43da71071cd4e90e2d45fa732"url: "https://pub.dev"source: hosted- version: "4.6.9"+ version: "4.11.0"firebase_messaging_web:dependency: transitivedescription:name: firebase_messaging_web- sha256: a4547f76da2a905190f899eb4d0150e1d0fd52206fce469d9f05ae15bb68b2c5+ sha256: "5fd41f7174eb47617c5820974e0db8b7b624e964e2dda620193345ae33e649a8"url: "https://pub.dev"source: hosted- version: "3.10.9"+ version: "4.3.0"fixnum:dependency: transitivedescription: