Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions in_app_purchases/complete/app/lib/logic/dash_purchases.dart
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class DashPurchases extends ChangeNotifier {
final iapConnection = IAPConnection.instance;

DashPurchases(this.counter, this.firebaseNotifier, this.iapRepo) {
final purchaseUpdated = iapConnection.purchaseUpdatedStream;
final purchaseUpdated = iapConnection.purchaseStream;
_subscription = purchaseUpdated.listen(
_onPurchaseUpdate,
onDone: _updateStreamOnDone,
Expand Down Expand Up @@ -126,8 +126,7 @@ class DashPurchases extends ChangeNotifier {
var functions = await firebaseNotifier.functions;
final callable = functions.httpsCallable('verifyPurchase');
final results = await callable({
'source':
purchaseDetails.verificationData.source.toString().split('.')[1],
'source': purchaseDetails.verificationData.source,
'verificationData':
purchaseDetails.verificationData.serverVerificationData,
'productId': purchaseDetails.productID,
Expand Down
11 changes: 6 additions & 5 deletions in_app_purchases/complete/app/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import 'package:dashclicker/logic/firebase_notifier.dart';
import 'package:dashclicker/repo/iap_repo.dart';
import 'package:provider/provider.dart';
import 'package:in_app_purchase/in_app_purchase.dart';
import 'package:in_app_purchase_android/in_app_purchase_android.dart';

import 'logic/dash_upgrades.dart';
import 'logic/dash_counter.dart';
Expand All @@ -12,19 +13,19 @@ import 'pages/purchase_page.dart';

// Gives the option to override in tests.
class IAPConnection {
static InAppPurchaseConnection? _instance;
static set instance(InAppPurchaseConnection value) {
static InAppPurchase? _instance;
static set instance(InAppPurchase value) {
_instance = value;
}

static InAppPurchaseConnection get instance {
_instance ??= InAppPurchaseConnection.instance;
static InAppPurchase get instance {
_instance ??= InAppPurchase.instance;
return _instance!;
}
}

void main() {
InAppPurchaseConnection.enablePendingPurchases();
InAppPurchaseAndroidPlatformAddition.enablePendingPurchases();
runApp(MyApp());
}

Expand Down
4 changes: 2 additions & 2 deletions in_app_purchases/complete/app/lib/model/past_purchase.dart
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ PurchaseType _typeFromString(String type) {

Store _storeFromString(String store) {
switch (store) {
case 'GooglePlay':
case 'google_play':
return Store.googlePlay;
case 'AppStore':
case 'app_store':
return Store.appStore;
default:
throw ArgumentError.value(store, '$store is not a supported store');
Expand Down
Loading