Prepare for F-Droid

mobile/android/build.gradle

@@ -18,10 +18,7 @@ allprojects {
         google()
         jcenter()
         mavenCentral()
-        // mavenLocal() // for FDroid
-        maven {
-            url "${project(':background_fetch').projectDir}/libs"
-        }
+        mavenLocal() // for FDroid
     }
 }
 

mobile/lib/main.dart

@@ -4,7 +4,6 @@ import 'dart:io';
 import "package:adaptive_theme/adaptive_theme.dart";
 import 'package:background_fetch/background_fetch.dart';
 import "package:computer/computer.dart";
-import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import "package:flutter/rendering.dart";
@@ -34,7 +33,6 @@ import "package:photos/services/location_service.dart";
 import "package:photos/services/machine_learning/machine_learning_controller.dart";
 import 'package:photos/services/machine_learning/semantic_search/semantic_search_service.dart';
 import 'package:photos/services/memories_service.dart';
-import 'package:photos/services/push_service.dart';
 import 'package:photos/services/remote_sync_service.dart';
 import 'package:photos/services/search_service.dart';
 import "package:photos/services/storage_bonus_service.dart";
@@ -216,14 +214,6 @@ Future<void> _init(bool isBackground, {String via = ''}) async {
     unawaited(HomeWidgetService.instance.initHomeWidget());
   }
 
-  if (Platform.isIOS) {
-    // ignore: unawaited_futures
-    PushService.instance.init().then((_) {
-      FirebaseMessaging.onBackgroundMessage(
-        _firebaseMessagingBackgroundHandler,
-      );
-    });
-  }
   unawaited(FeatureFlagService.instance.init());
   unawaited(SemanticSearchService.instance.init());
   MachineLearningController.instance.init();
@@ -334,35 +324,6 @@ Future<void> _killBGTask([String? taskId]) async {
   }
 }
 
-Future<void> _firebaseMessagingBackgroundHandler(RemoteMessage message) async {
-  final bool isRunningInFG = await _isRunningInForeground(); // hb
-  final bool isInForeground = AppLifecycleService.instance.isForeground;
-  if (_isProcessRunning) {
-    _logger.info(
-      "Background push received when app is alive and runningInFS: $isRunningInFG inForeground: $isInForeground",
-    );
-    if (PushService.shouldSync(message)) {
-      await _sync('firebaseBgSyncActiveProcess');
-    }
-  } else {
-    // App is dead
-    // ignore: unawaited_futures
-    _runWithLogs(
-      () async {
-        _logger.info("Background push received");
-        if (Platform.isIOS) {
-          _scheduleSuicide(kBGPushTimeout); // To prevent OS from punishing us
-        }
-        await _init(true, via: 'firebasePush');
-        if (PushService.shouldSync(message)) {
-          await _sync('firebaseBgSyncNoActiveProcess');
-        }
-      },
-      prefix: "[fbg]",
-    );
-  }
-}
-
 Future<void> _logFGHeartBeatInfo() async {
   final bool isRunningInFG = await _isRunningInForeground();
   final prefs = await SharedPreferences.getInstance();

mobile/lib/services/billing_service.dart

@@ -4,7 +4,6 @@ import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
 // import 'package:flutter/foundation.dart';
 // import 'package:flutter_inapp_purchase/flutter_inapp_purchase.dart';
-import 'package:in_app_purchase/in_app_purchase.dart';
 import 'package:logging/logging.dart';
 import 'package:photos/core/errors.dart';
 import 'package:photos/core/network/network.dart';
@@ -35,6 +34,7 @@ class BillingService {
   final _logger = Logger("BillingService");
   final _enteDio = NetworkClient.instance.enteDio;
 
+  // ignore: unused_field
   bool _isOnSubscriptionPage = false;
 
   Future<BillingPlans>? _future;
@@ -44,23 +44,6 @@ class BillingService {
     //   await FlutterInappPurchase.instance.initConnection;
     //   FlutterInappPurchase.instance.clearTransactionIOS();
     // }
-    InAppPurchase.instance.purchaseStream.listen((purchases) {
-      if (_isOnSubscriptionPage) {
-        return;
-      }
-      for (final purchase in purchases) {
-        if (purchase.status == PurchaseStatus.purchased) {
-          verifySubscription(
-            purchase.productID,
-            purchase.verificationData.serverVerificationData,
-          ).then((response) {
-            InAppPurchase.instance.completePurchase(purchase);
-          });
-        } else if (Platform.isIOS && purchase.pendingCompletePurchase) {
-          InAppPurchase.instance.completePurchase(purchase);
-        }
-      }
-    });
   }
 
   void clearCache() {

mobile/lib/ui/payment/subscription.dart

@@ -6,7 +6,8 @@ import "package:photos/ui/payment/store_subscription_page.dart";
 import 'package:photos/ui/payment/stripe_subscription_page.dart';
 
 StatefulWidget getSubscriptionPage({bool isOnBoarding = false}) {
-  if (UpdateService.instance.isIndependentFlavor()) {
+  if (UpdateService.instance.isIndependentFlavor() ||
+      UpdateService.instance.isFdroidFlavor()) {
     return StripeSubscriptionPage(isOnboarding: isOnBoarding);
   }
   if (FeatureFlagService.instance.enableStripe() &&

mobile/pubspec.yaml

@@ -64,8 +64,6 @@ dependencies:
   file_saver:
     # Use forked version till this PR is merged: https://github.com/incrediblezayed/file_saver/pull/87
     git: https://github.com/jesims/file_saver.git
-  firebase_core: ^2.13.1
-  firebase_messaging: ^14.6.2
   fk_user_agent: ^2.0.1
   flutter:
     sdk: flutter
@@ -99,7 +97,6 @@ dependencies:
   http: ^1.1.0
   image: ^4.0.17
   image_editor: ^1.3.0
-  in_app_purchase: ^3.0.7
   intl: ^0.18.0
   isar: ^3.1.0+1
   isar_flutter_libs: ^3.1.0+1
@@ -207,7 +204,7 @@ flutter_icons:
   android: "launcher_icon"
   adaptive_icon_foreground: "assets/launcher_icon/ente-icon-foreground.png"
   adaptive_icon_background: "#ffffff"
-  ios: true
+  ios: false # F-Droid
   image_path: "assets/icon-light.png"
 
 flutter_native_splash:

mobile/scripts/build_isar.sh

@@ -1,7 +1,3 @@
-# TODO: add `rustup@1.25.2` to `srclibs`
-# TODO: verify if `gcc-multilib` or `libc-dev` is needed
-$$rustup$$/rustup-init.sh -y
-source $HOME/.cargo/env
 cd thirdparty/isar/
 bash tool/build_android.sh x86
 bash tool/build_android.sh x64
@@ -15,3 +11,4 @@ mv libisar_android_x64.so libisar.so
 mv libisar.so $PUB_CACHE/hosted/pub.dev/isar_flutter_libs-*/android/src/main/jniLibs/x86_64/
 mv libisar_android_x86.so libisar.so
 mv libisar.so $PUB_CACHE/hosted/pub.dev/isar_flutter_libs-*/android/src/main/jniLibs/x86/
+cd ../../