Skip to content

feat(vending): add opt-in purchase recovery #3768

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HtheB wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat(vending): add opt-in purchase recovery #3768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 14 additions & 0 deletions vending-app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,20 @@
</intent-filter>
</activity>

<activity
android:name="org.microg.vending.billing.ui.PurchaseRecoveryActivity"
android:enabled="@bool/purchase_recovery_enabled"
android:exported="true"
android:label="@string/purchase_recovery_title"
android:theme="@style/Theme.Material3.DayNight"
tools:targetApi="21">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>

<activity-alias
android:name="com.google.android.finsky.activities.MarketDeepLinkHandlerActivity"
android:exported="true"
Expand Down
2 changes: 1 addition & 1 deletion vending-app/src/main/java/org/microg/vending/billing/InAppBillingServiceImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ class InAppBillingServiceImpl(private val context: Context) : IInAppBillingServi
return runBlocking { deferred.await() }
}

private fun createIAPCore(context: Context, account: Account, pkgName: String): IAPCore {
internal fun createIAPCore(context: Context, account: Account, pkgName: String): IAPCore {
val key = "$pkgName:${account.name}"
val cacheEntry = iapCoreCacheMap[key]
if (cacheEntry != null) {
Expand Down
6 changes: 4 additions & 2 deletions vending-app/src/main/java/org/microg/vending/billing/core/IAPResult.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ open class IAPResult(val resultMap: Map<String, Any>) {
}

fun getMessage(): String {
return resultMap["RESPONSE_MESSAGE"] as String
return resultMap["RESPONSE_MESSAGE"] as? String
?: resultMap["DEBUG_MESSAGE"] as? String
?: ""
}
}
}
Loading