wip - Android 36, IAP library update

Author: luckyrat

android/app/build.gradle

@@ -82,7 +82,7 @@ kotlin {
 }
 
 android {
-    compileSdk 35
+    compileSdk 36
 
     compileOptions {
         sourceCompatibility = 17

android/build.gradle

@@ -9,7 +9,7 @@ rootProject.buildDir = '../build'
 subprojects {
     afterEvaluate {
         android {
-            compileSdkVersion 35
+            compileSdkVersion 36
         }
     }
 

lib/cubit/account_cubit.dart

@@ -95,26 +95,22 @@ class AccountCubit extends Cubit<AccountState> {
   }
 
   Future<bool> subscriptionSuccess(
-    PurchasedItem purchasedItem,
+    Purchase purchasedItem,
     bool isAndroid,
     Future<void> Function() ensureRemoteCreated,
     Future<void> Function() finishTransaction,
   ) async {
     try {
-      if (purchasedItem.purchaseToken == null && purchasedItem.transactionReceipt == null) {
+      if (purchasedItem.purchaseToken == null) {
         emit(
           AccountSubscribeError(
             currentUser,
-            'Unexpected error associating your subscription - we found no purchaseToken and no transactionReceipt',
+            'Unexpected error associating your subscription - we found no purchaseToken',
           ),
         );
         return false;
       }
-      final success = await _userRepo.associate(
-        currentUser,
-        isAndroid ? 2 : 3,
-        purchasedItem.purchaseToken ?? purchasedItem.transactionReceipt!,
-      );
+      final success = await _userRepo.associate(currentUser, isAndroid ? 2 : 3, purchasedItem.purchaseToken!);
       if (success) {
         // Our association request was successful but we rely on the subscription
         // provider to respond too. Ideally we'd set up a websocket to receive an
@@ -301,25 +297,6 @@ class AccountCubit extends Cubit<AccountState> {
     await _userRepo.setQuickUnlockUser(user);
     emitAuthenticatedOrExpiredOrUnvalidated(user);
 
-    final psi = PaymentService.instance;
-    await psi.ensureReady();
-    if (KeeVaultPlatform.isIOS &&
-        user.subscriptionStatus == AccountSubscriptionStatus.current &&
-        psi.activePurchaseItem != null &&
-        (user.subscriptionId?.startsWith('ap_') ?? false)) {
-      // It's impossible to know what the expected subscriptionId is because apple don't
-      // give us the originaltransactionid unless it is a pointless restoration operation
-      // to a new phone. So all subscription renewals would sit in the queue forever while
-      // we have no way to know that we have dealt with them. Thus we just accept that
-      // everything is probably fine as long as the user has a subscription from the App Store.
-      // Maybe a problem for subscription restarts after an expiry. User's subscription ID
-      // is going to stay the same even after expiry but then a new one should come along
-      // with a whole new original transaction id... or not, if there is some reuse during
-      // grace periods, etc. But surely in all other cases, any valid app store subscription
-      // id associated with a user that has a non-expired set of authentication tokens is
-      // going to be just a renewal operation that we can ignore because we handle it server-side.
-      await psi.finishTransaction(psi.activePurchaseItem!);
-    }
     l.d('sign in complete');
     return user;
   }

lib/extension_methods.dart

@@ -166,13 +166,57 @@ T? enumFromString<T>(Iterable<T> values, String value) {
   return values.firstWhereOrNull((type) => type.toString().split('.').last == value);
 }
 
-extension KVPurchasedItem on PurchasedItem {
+extension KVPurchasedItem on Purchase {
   String get keeVaultSubscriptionId {
-    final prefix = purchaseStateAndroid != null ? 'gp_' : 'ap_';
+    final prefix = this is PurchaseAndroid ? 'gp_' : 'ap_';
     if (KeeVaultPlatform.isIOS) {
       // Apple does not give us the information needed to derive this information
+      //TODO:f: maybe now available in purchaseToken with StoreKit2 but we already
+      // have implemented support for the ID to be changed upon receiving the real
+      // ID from the server so not likely to be worth changing this.
       return prefix;
     }
     return prefix + (purchaseToken ?? '');
   }
 }
+
+ActiveSubscription purchaseAsActiveSubscription(Purchase purchase) {
+  // Map platform-specific fields
+  final bool? autoRenewing = purchase is PurchaseAndroid ? purchase.autoRenewingAndroid : null;
+  final String? basePlanId = purchase is PurchaseAndroid ? purchase.currentPlanId : null;
+  final String? environmentIOS = purchase is PurchaseIOS ? purchase.environmentIOS : null;
+  final double? expirationDateIOS = purchase is PurchaseIOS ? purchase.expirationDateIOS : null;
+  final RenewalInfoIOS? renewalInfoIOS = purchase is PurchaseIOS ? purchase.renewalInfoIOS : null;
+
+  // Calculate daysUntilExpirationIOS and willExpireSoon for iOS
+  double? daysUntilExpirationIOS;
+  bool? willExpireSoon;
+  if (expirationDateIOS != null) {
+    final expirationDate = DateTime.fromMillisecondsSinceEpoch(expirationDateIOS.toInt());
+    final now = DateTime.now();
+    final daysUntilExpiration = expirationDate.difference(now).inDays;
+    daysUntilExpirationIOS = daysUntilExpiration.toDouble();
+    // Consider subscription expiring soon if < 7 days remaining
+    willExpireSoon = daysUntilExpiration > 0 && daysUntilExpiration < 7;
+  }
+
+  // Create ActiveSubscription from Purchase
+  return ActiveSubscription(
+    productId: purchase.productId,
+    transactionId: purchase.transactionIdFor ?? purchase.purchaseToken ?? '',
+    purchaseToken: purchase.purchaseToken,
+    transactionDate: purchase.transactionDate is String
+        ? double.tryParse(purchase.transactionDate as String) ?? 0.0
+        : (purchase.transactionDate as num?)?.toDouble() ?? 0.0,
+    isActive: purchase.purchaseState == PurchaseState.Purchased,
+    autoRenewingAndroid: autoRenewing,
+    basePlanIdAndroid: basePlanId,
+    currentPlanId: purchase.currentPlanId,
+    daysUntilExpirationIOS: daysUntilExpirationIOS,
+    environmentIOS: environmentIOS,
+    expirationDateIOS: expirationDateIOS,
+    renewalInfoIOS: renewalInfoIOS,
+    purchaseTokenAndroid: purchase is PurchaseAndroid ? purchase.purchaseToken : null,
+    willExpireSoon: willExpireSoon,
+  );
+}