π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Keep StoreKit setup out of F-Droid sources
Neeraj Guptac87bada3e70c
diff --git a/mobile/apps/photos/fdroid/overlay/lib/services/account/purchase_update_listener.dart b/mobile/apps/photos/fdroid/overlay/lib/services/account/purchase_update_listener.dartindex 666f76f20d..686561790d 100644--- a/mobile/apps/photos/fdroid/overlay/lib/services/account/purchase_update_listener.dart+++ b/mobile/apps/photos/fdroid/overlay/lib/services/account/purchase_update_listener.dart@@ -1,3 +1,5 @@+Future<void> configureStoreKit() => Future<void>.value();+void listenForPurchaseUpdates({required bool Function() isOnSubscriptionPage,required Future<void> Function(String productID, String verificationData)diff --git a/mobile/apps/photos/lib/main.dart b/mobile/apps/photos/lib/main.dartindex 27ea496612..4f12df42eb 100644--- a/mobile/apps/photos/lib/main.dart+++ b/mobile/apps/photos/lib/main.dart@@ -20,7 +20,6 @@ import 'package:flutter/material.dart';import "package:flutter/rendering.dart";import "package:flutter/services.dart";import "package:flutter_displaymode/flutter_displaymode.dart";-import "package:in_app_purchase_storekit/in_app_purchase_storekit.dart";import "package:intl/date_symbol_data_local.dart";import 'package:logging/logging.dart';import "package:media_extension/media_extension_action_types.dart";@@ -40,6 +39,7 @@ import "package:photos/locale.dart";import 'package:photos/module/upload/service/file_uploader.dart';import 'package:photos/module/upload/service/local_file_update_service.dart';import "package:photos/service_locator.dart";+import "package:photos/services/account/purchase_update_listener.dart";import "package:photos/services/account/user_service.dart";import 'package:photos/services/app_lifecycle_service.dart';import 'package:photos/services/collections_service.dart';@@ -94,10 +94,7 @@ enum ForegroundStartupMode { normal, picker }void main() async {debugRepaintRainbowEnabled = false;WidgetsFlutterBinding.ensureInitialized();- if (Platform.isIOS) {- // ignore: deprecated_member_use- await InAppPurchaseStoreKitPlatform.enableStoreKit1();- }+ await configureStoreKit();ente_ui.AppThemeConfig.initialize(ente_ui.EnteApp.photos);await initIsIPad();if (isIPad) {diff --git a/mobile/apps/photos/lib/services/account/purchase_update_listener.dart b/mobile/apps/photos/lib/services/account/purchase_update_listener.dartindex ccdd18cd44..fb9f049335 100644--- a/mobile/apps/photos/lib/services/account/purchase_update_listener.dart+++ b/mobile/apps/photos/lib/services/account/purchase_update_listener.dart@@ -1,6 +1,14 @@import "dart:io";import "package:in_app_purchase/in_app_purchase.dart";+import "package:in_app_purchase_storekit/in_app_purchase_storekit.dart";++Future<void> configureStoreKit() async {+ if (Platform.isIOS) {+ // ignore: deprecated_member_use+ await InAppPurchaseStoreKitPlatform.enableStoreKit1();+ }+}void listenForPurchaseUpdates({required bool Function() isOnSubscriptionPage,diff --git a/mobile/apps/photos/scripts/prepare_fdroid_source.sh b/mobile/apps/photos/scripts/prepare_fdroid_source.shindex 6b27209a7b..965224a5a6 100755--- a/mobile/apps/photos/scripts/prepare_fdroid_source.sh+++ b/mobile/apps/photos/scripts/prepare_fdroid_source.sh@@ -10,9 +10,9 @@ fail() {remove_direct_dependencies() {local count- count=$(rg -c "^ (firebase_core|firebase_messaging|in_app_purchase):" pubspec.yaml || true)- [[ "$count" == "3" ]] || fail "expected three restricted dependencies in pubspec.yaml"- perl -0pi -e 's/^ (firebase_core|firebase_messaging|in_app_purchase):[^\n]*\n//mg' pubspec.yaml+ count=$(rg -c "^ (firebase_core|firebase_messaging|in_app_purchase|in_app_purchase_storekit):" pubspec.yaml || true)+ [[ "$count" == "4" ]] || fail "expected four restricted dependencies in pubspec.yaml"+ perl -0pi -e 's/^ (firebase_core|firebase_messaging|in_app_purchase|in_app_purchase_storekit):[^\n]*\n//mg' pubspec.yaml}remove_playstore_sources() {