Skip to content
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.

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

Fix pluxee click card always loading #2577

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
package org.microg.gms.tapandpay

import android.os.Parcel
import android.os.RemoteException
import android.util.Log
import android.util.SparseArray
import com.google.android.gms.common.Feature
Expand Down Expand Up @@ -36,20 +35,38 @@ class TapAndPayService : BaseService(TAG, GmsService.TAP_AND_PAY) {
features = arrayOf(
Feature("tapandpay", 1),
Feature("tapandpay_account_linking", 1),
Feature("tapandpay_add_service_listener", 1),
Feature("tapandpay_block_payment_cards", 1),
Feature("tapandpay_check_contactless_eligibility", 1),
Feature("tapandpay_dismiss_quick_access_wallet", 1),
Feature("tapandpay_enable_secure_keyguard", 1),
Feature("tapandpay_felica_tos", 1),
Feature("tapandpay_get_active_wallet_infos", 1L),
Feature("tapandpay_get_all_cards_for_account", 1),
Feature("tapandpay_get_contactless_setup_configuration", 1),
Feature("tapandpay_get_environment", 1L),
Feature("tapandpay_get_last_attestation_result", 1),
Feature("tapandpay_get_token_pan", 1),
Feature("tapandpay_get_stable_hardware_id", 1L),
Feature("tapandpay_get_token_details", 1L),
Feature("tapandpay_get_token_status", 1L),
Feature("tapandpay_global_actions", 1),
Feature("tapandpay_has_eligible_tokenization_target", 1L),
Feature("tapandpay_issuer_api", 2),
Feature("tapandpay_perform_tokenization_operation", 1),
Feature("tapandpay_push_tokenize", 1),
Feature("tapandpay_override_payment_network", 3L),
Feature("tapandpay_get_parental_consent_intent", 1L),
Feature("tapandpay_perform_secure_element_management_operation", 1L),
Feature("tapandpay_perform_tokenization_operation", 1L),
Feature("tapandpay_push_tokenize_session", 6),
Feature("tapandpay_push_tokenize", 1L),
Feature("tapandpay_quick_access_wallet", 1),
Feature("tapandpay_report_unlock", 1L),
Feature("tapandpay_request_delete_token", 1L),
Feature("tapandpay_request_select_token", 1L),
Feature("tapandpay_secureelement", 1),
Feature("tapandpay_settings", 2L),
Feature("tapandpay_token_listing_with_request", 1L),
Feature("tapandpay_show_wear_card_management_view", 1),
Feature("tapandpay_send_wear_request_to_phone", 1),
Feature("tapandpay_sync_device_info", 1),
Expand All @@ -58,6 +75,8 @@ class TapAndPayService : BaseService(TAG, GmsService.TAP_AND_PAY) {
Feature("tapandpay_tokenize_pan", 1),
Feature("tapandpay_transmission_event", 1),
Feature("tapandpay_token_listing", 3),
Feature("tapandpay_wallet_ui_shown_status", 1L),
Feature("tapandpay_wallet_set_tap_doodle_enabled", 1L),
Feature("tapandpay_wallet_feedback_psd", 1)
)
})
Expand Down Expand Up @@ -101,6 +120,11 @@ class TapAndPayImpl : ITapAndPayService.Stub() {
callbacks.onRefreshSeCardsResponse(Status.SUCCESS, RefreshSeCardsResponse())
}

override fun getListTokens(callbacks: ITapAndPayServiceCallbacks) {
Log.d(TAG, "getListTokensRequest: ")
callbacks.onListTokensRetrieved(Status.SUCCESS, emptyArray())
}

override fun onTransact(code: Int, data: Parcel, reply: Parcel?, flags: Int): Boolean =
warnOnTransactionIssues(code, reply, flags, TAG) { super.onTransact(code, data, reply, flags) }
}
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,5 @@ interface ITapAndPayService {
void refreshSeCards(in RefreshSeCardsRequest request, ITapAndPayServiceCallbacks callbacks) = 56;
// void tokenizeAccount(in TokenizeAccountRequest request, ITapAndPayServiceCallbacks callbacks) = 57;
// void syncDeviceInfo(in SyncDeviceInfoRequest request, ITapAndPayServiceCallbacks callbacks) = 64;
void getListTokens(ITapAndPayServiceCallbacks callbacks) = 73;
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import com.google.android.gms.tapandpay.firstparty.GetActiveAccountResponse;
import com.google.android.gms.tapandpay.firstparty.GetAllCardsResponse;
import com.google.android.gms.tapandpay.firstparty.RefreshSeCardsResponse;
import com.google.android.gms.tapandpay.issuer.TokenStatus;
import com.google.android.gms.tapandpay.issuer.TokenInfo;

interface ITapAndPayServiceCallbacks {
void onTokenSelected(in Status status) = 1;
Expand Down Expand Up @@ -50,7 +51,7 @@ interface ITapAndPayServiceCallbacks {
// void onQuickAccessWalletConfig(in Status status, in QuickAccessWalletConfig config) = 46;
// void onContactlessSetupStatusRetrieved(in Status status, in GetContactlessSetupStatusResponse response) = 47;
void onIsTokenizedRetrieved(in Status status, boolean isTokenized) = 48;
// void onListTokensRetrieved(in Status status, in TokenInfo[] tokens) = 49;
void onListTokensRetrieved(in Status status, in TokenInfo[] tokens) = 49;
// void onContactlessEligibilityRetrieved(in Status status, in CheckContactlessEligibilityResponse response) = 50;
void onProto(in Status status, in byte[] proto) = 51;
// void onPushProvisionSessionContextRetrieved(in Status status, in PushProvisionSessionContext context) = 52;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
package com.google.android.gms.tapandpay.issuer;

parcelable TokenInfo;
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/*
* SPDX-FileCopyrightText: 2024 microG Project Team
* SPDX-License-Identifier: Apache-2.0
*/
package com.google.android.gms.tapandpay.issuer;

import android.os.Parcel;

import androidx.annotation.NonNull;

import com.google.android.gms.common.internal.safeparcel.AbstractSafeParcelable;
import com.google.android.gms.common.internal.safeparcel.SafeParcelable;
import com.google.android.gms.common.internal.safeparcel.SafeParcelableCreatorAndWriter;

@SafeParcelable.Class
public class TokenInfo extends AbstractSafeParcelable {
public static final SafeParcelableCreatorAndWriter<TokenInfo> CREATOR = findCreator(TokenInfo.class);
@Override
public void writeToParcel(@NonNull Parcel dest, int flags) {
CREATOR.writeToParcel(this, dest, flags);
}
}