Skip to content

Fix IAP payment card switching issue #3649

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
DaVinci9196 wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −3
Open

Fix IAP payment card switching issue #3649

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
11 changes: 8 additions & 3 deletions vending-app/src/main/java/org/microg/vending/billing/core/ui/UIParser.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,10 @@ private fun parseAction(action: Action?, result: BAction): Boolean {
}
action.viewClickAction?.let { viewClickAction ->
if (viewClickAction.uiInfo != null) {
result.uiInfo = parseUIInfo(viewClickAction.uiInfo!!)
val parsedUiInfo = parseUIInfo(viewClickAction.uiInfo!!)
if (parsedUiInfo.uiType != UIType.UNKNOWN) {
result.uiInfo = parsedUiInfo
}
}
return parseAction(viewClickAction.action, result)
}
Expand Down Expand Up @@ -488,7 +491,8 @@ private fun parseViewInfo(viewInfo: ViewInfo): BViewInfo {
private fun parseContentComponent(contentComponent: ContentComponent): BComponent {
val tag = contentComponent.tag
val viewInfo = contentComponent.viewInfo?.let { parseViewInfo(it) }
val uiInfo = contentComponent.uiInfo?.let { parseUIInfo(it) }
val uiInfo = contentComponent.uiInfo?.let {
parseUIInfo(it) }
val cc = contentComponent
return when {
cc.iconTextCombinationView != null -> BComponent(tag, uiInfo, viewInfo, ViewType.ICONTEXTCOMBINATIONVIEW, iconTextCombinationView = parseIconTextCombinationView(cc.iconTextCombinationView!!))
Expand Down Expand Up @@ -528,7 +532,8 @@ private fun parseButtonGroupView(buttonGroupView: ButtonGroupView): BButtonGroup
private fun parseFooterComponent(footerComponent: FooterComponent): BComponent {
val tag = footerComponent.tag
val viewInfo = footerComponent.viewInfo?.let { parseViewInfo(it) }
val uiInfo = footerComponent.uiInfo?.let { parseUIInfo(it) }
val uiInfo = footerComponent.uiInfo?.let {
parseUIInfo(it) }
val fc = footerComponent
return when {
fc.buttonGroupView != null -> BComponent(tag, uiInfo, viewInfo, ViewType.BUTTONGROUPVIEW, buttonGroupView = parseButtonGroupView(fc.buttonGroupView!!))
Expand Down