Merge pull request #114 from android/feature/reward-update

Update reward rate card flow and BillingClient logic

Author: jsyjbaba

trivialkart/trivialkart_unreal/Content/Blueprints/Game/BP_GameInstance.uasset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2dd643244fe507e5e7b58d4d6d6754a43df1b8fd9ee09fa6549ca697578431ca
-size 6232
+oid sha256:6cd514997ea43a57197cb88bfe9e8c813e565b0c1e0fb3f7e8f70ce24568f1ab
+size 6249

trivialkart/trivialkart_unreal/Content/Blueprints/Widgets/WBP_Store.uasset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9a3649d582676e91ab81ec283d13b03d7677c15ad088946dd7124866fb8292f5
-size 260559
+oid sha256:23f18ee2816b929883fa17ea67c97380b13981df62f594cd5fd21097c9ad2038
+size 265608

trivialkart/trivialkart_unreal/Source/TrivialKart_Unreal/Private/GameInstances/TrivialKartGameInstance.cpp

@@ -47,6 +47,8 @@ void UTrivialKartGameInstance::Init()
 			FOnReadUserFileCompleteDelegate::CreateUObject(this, &UTrivialKartGameInstance::OnCloudWriteComplete));
 	}
 	InitiateAutoLogin();
+	// Check unacknowledged purchases on start or foreground
+	FCoreDelegates::ApplicationHasEnteredForegroundDelegate.AddUObject(this, &UTrivialKartGameInstance::CheckPendingPurchases);
 }
 
 void UTrivialKartGameInstance::Shutdown()
@@ -60,6 +62,8 @@ void UTrivialKartGameInstance::Shutdown()
 		CloudInterface->ClearOnReadUserFileCompleteDelegate_Handle(ReadSaveHandle);
 		CloudInterface->ClearOnWriteUserFileCompleteDelegate_Handle(WriteSaveHandle);
 	}
+	FCoreDelegates::ApplicationHasEnteredForegroundDelegate.RemoveAll(this);
+	Super::Shutdown();
 }
 
 void UTrivialKartGameInstance::InitiateAutoLogin()
@@ -161,6 +165,45 @@ void UTrivialKartGameInstance::StartPurchasing(const FUniqueOfferId& OfferID, co
 	}
 }
 
+void UTrivialKartGameInstance::CheckPendingPurchases()
+{
+	if (const IOnlineSubsystem* Subsystem = Online::GetSubsystem(GetWorld()))
+	{
+		if (const IOnlineIdentityPtr IdentityInterface = Online::GetIdentityInterface(GetWorld()))
+		{
+			if (const TSharedPtr<const FUniqueNetId> UserId = IdentityInterface->GetUniquePlayerId(0); UserId.IsValid())
+			{
+				if (const IOnlinePurchasePtr PurchaseInterface = Online::GetPurchaseInterface(GetWorld()); PurchaseInterface.IsValid())
+				{
+					PurchaseInterface->QueryReceipts(*UserId, true,
+						FOnQueryReceiptsComplete::CreateWeakLambda(this,
+							[this, PurchaseInterface, UserId](const FOnlineError& OnlineError)
+							{
+								if (!OnlineError.WasSuccessful())
+									return;
+
+								TArray<FPurchaseReceipt> Receipts;
+								PurchaseInterface->GetReceipts(*UserId, Receipts);
+
+								for (const FPurchaseReceipt& Receipt : Receipts)
+								{
+									for (const FPurchaseReceipt::FReceiptOfferEntry& Offer : Receipt.ReceiptOffers)
+									{
+										if (OnPurchaseReceived.IsBound())
+										{
+											OnPurchaseReceived.Broadcast(Offer.OfferId, 1);
+											FPlatformMisc::LowLevelOutputDebugStringf(TEXT(" Pending purchase restored - Offer ID:: %s"), *Offer.OfferId);
+										}
+										// The Purchase Token is passed as the ReceiptId to tell the platform which purchase to finalize (consume/acknowledge).
+										PurchaseInterface->FinalizePurchase(*UserId, Receipt.TransactionId);
+									}
+								}
+							}));
+				}
+			}
+		}
+	}
+}
 UTrivialKartSaveGame* UTrivialKartGameInstance::LoadGame()
 {
 #if WITH_EDITOR
@@ -230,6 +273,8 @@ void UTrivialKartGameInstance::OnLoginCompleted(int32 LocalUserNum, bool bWasSuc
 				CloudInterface->ReadUserFile(*IdentityInterface->GetUniquePlayerId(0), "TrivialKartCloudSave");
 			}
 		}
+		// Check unacknowledged purchases on start or foreground
+		CheckPendingPurchases();
 	}
 }
 

trivialkart/trivialkart_unreal/Source/TrivialKart_Unreal/Public/GameInstances/TrivialKartGameInstance.h

@@ -54,7 +54,7 @@ class TRIVIALKART_UNREAL_API UTrivialKartGameInstance : public UPlatformGameInst
 
 	void AddAchievementProgress(const float Progress, const FString& AchievementName);
 	void StartPurchasing(const FUniqueOfferId& OfferID, const int32 Quantity, bool bIsConsumable);
-	
+	void CheckPendingPurchases();
 	UTrivialKartSaveGame* LoadGame();
 	void SaveGame(UTrivialKartSaveGame* SaveData);
 

trivialkart/trivialkart_unreal/Source/TrivialKart_Unreal/TrivialKart_Unreal.Build.cs

@@ -37,13 +37,14 @@ public TrivialKart_Unreal(ReadOnlyTargetRules Target) : base(Target)
 
 		PrivateDependencyModuleNames.AddRange(new string[] { 
 			"OnlineSubsystem", 
-			"OnlineSubsystemUtils" 
-		});
+			"OnlineSubsystemUtils",
+            "Json",
+            "JsonUtilities"
+        });
 
 		if (Target.Platform == UnrealTargetPlatform.Android)
 		{
 			DynamicallyLoadedModuleNames.Add("OnlineSubsystemGooglePlay");
-			DynamicallyLoadedModuleNames.Add("OnlineSubsystemGooglePlayExtension");
 		}
 	}
 }