diff --git a/lib/iap.dart b/lib/iap.dart
index 40ca4bc2..22bfe73d 100644
--- a/lib/iap.dart
+++ b/lib/iap.dart
@@ -1,9 +1,10 @@
+import 'dart:io' show Platform;
+
 import 'package:gitjournal/app.dart';
 import 'package:gitjournal/utils/logger.dart';
-import 'package:purchases_flutter/purchases_flutter.dart';
+import 'package:in_app_purchase/in_app_purchase.dart';
 
 import 'package:gitjournal/settings.dart';
-import 'package:gitjournal/.env.dart';
 
 class InAppPurchases {
   static void confirmProPurchase() async {
@@ -15,17 +16,12 @@ class InAppPurchases {
     }
 
     if (JournalApp.isInDebugMode) {
+      Log.d("Ignoring IAP pro check - debug mode");
       return;
     }
 
-    await Purchases.setup(
-      environment['revenueCat'],
-      appUserId: Settings.instance.pseudoId,
-    );
-
-    PurchaserInfo purchaserInfo = await Purchases.getPurchaserInfo();
-    Log.i("Got PurchaserInfo $purchaserInfo");
-    var isPro = purchaserInfo.entitlements.active.containsKey("pro");
+    var sub = await _subscriptionStatus();
+    var isPro = sub == null ? false : sub.isPro;
     Log.i("IsPro $isPro");
 
     if (Settings.instance.proMode != isPro) {
@@ -33,8 +29,53 @@ class InAppPurchases {
       Settings.instance.proMode = isPro;
       Settings.instance.save();
     } else {
-      Settings.instance.proExpirationDate = purchaserInfo.latestExpirationDate;
+      Settings.instance.proExpirationDate = sub.expiryDate.toIso8601String();
       Settings.instance.save();
     }
   }
+
+  static Future<SubscriptionStatus> _subscriptionStatus() async {
+    InAppPurchaseConnection.enablePendingPurchases();
+    var iapConn = InAppPurchaseConnection.instance;
+
+    if (Platform.isIOS) {
+      //var history = await iapConn.refreshPurchaseVerificationData();
+    } else if (Platform.isAndroid) {
+      var response = await iapConn.queryPastPurchases();
+      if (response.pastPurchases.isEmpty) {
+        return null;
+      }
+
+      for (var purchase in response.pastPurchases) {
+        var dt = DateTime.fromMillisecondsSinceEpoch(
+            int.parse(purchase.transactionDate));
+        return SubscriptionStatus(true, dt.add(const Duration(days: 31)));
+      }
+    }
+
+    return null;
+    /*
+    for (var purchase in response.pastPurchases) {
+      var difference =
+        DateTime.now().difference(purchase.transactionDate);
+      print(purchase);
+      print(purchase.productID);
+      print(purchase.purchaseID);
+      print(purchase.transactionDate);
+      print(purchase.verificationData);
+      print(purchase.verificationData.localVerificationData);
+      print(purchase.verificationData.serverVerificationData);
+      print(purchase.verificationData.source);
+
+      InAppPurchaseConnection.instance.
+    }
+    */
+  }
+}
+
+class SubscriptionStatus {
+  final bool isPro;
+  final DateTime expiryDate;
+
+  SubscriptionStatus(this.isPro, this.expiryDate);
 }
diff --git a/pubspec.lock b/pubspec.lock
index 66f426f4..07397933 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -411,6 +411,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.0"
+  in_app_purchase:
+    dependency: "direct main"
+    description:
+      name: in_app_purchase
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.3.4+1"
   intl:
     dependency: "direct main"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 353345e7..74283451 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -56,6 +56,7 @@ dependencies:
   easy_localization_loader: ^0.0.2
   quick_actions: ^0.4.0+5
   receive_sharing_intent: ^1.4.0+2
+  in_app_purchase: ^0.3.4+1
   flutter_plugin_android_lifecycle: ^1.0.8 # for fixing the build
 
 dev_dependencies: