TapAndPay: Add Dummy

mar-v-in · mar-v-in · commit 602a34ff4b6d · 2021-06-27T20:18:40.000+02:00
diff --git a/play-services-api/src/main/aidl/com/google/android/gms/tapandpay/internal/ITapAndPayService.aidl b/play-services-api/src/main/aidl/com/google/android/gms/tapandpay/internal/ITapAndPayService.aidl
diff --git a/play-services-api/src/main/java/com/google/android/gms/wallet/IsReadyToPayRequest.java b/play-services-api/src/main/java/com/google/android/gms/wallet/IsReadyToPayRequest.java
@@ -19,13 +19,13 @@
  */
 @PublicApi
 public class IsReadyToPayRequest extends AutoSafeParcelable {
-    @Field(2)
+    @Field(value = 2, useDirectList = true)
     private ArrayList<Integer> allowedCardNetworks;
     @Field(4)
     private String unknown4;
     @Field(5)
     private String unknown5;
-    @Field(6)
+    @Field(value = 6, useDirectList = true)
     private ArrayList<Integer> allowedPaymentMethods;
     @Field(7)
     private boolean existingPaymentMethodRequired;
diff --git a/play-services-base-core/build.gradle b/play-services-base-core/build.gradle
@@ -9,9 +9,9 @@ apply plugin: 'signing'
 
 dependencies {
     api project(':play-services-basement')
+    api "androidx.lifecycle:lifecycle-service:$lifecycleVersion"
 
     implementation "androidx.annotation:annotation:$annotationVersion"
-    implementation "androidx.lifecycle:lifecycle-service:$lifecycleVersion"
 }
 
 android {
diff --git a/play-services-core/build.gradle b/play-services-core/build.gradle
@@ -45,9 +45,11 @@ dependencies {
     implementation project(':play-services-conscrypt-provider-core')
     implementation project(':play-services-cronet-core')
     implementation project(':play-services-location-core')
-    implementation project(':play-services-vision-core')
     withNearbyImplementation project(':play-services-nearby-core')
     withNearbyImplementation project(':play-services-nearby-core-ui')
+    implementation project(':play-services-tapandpay-core')
+    implementation project(':play-services-vision-core')
+
     implementation project(':play-services-core-proto')
     implementation project(':play-services-core:microg-ui-tools') // deprecated
     implementation project(':play-services-api')
diff --git a/play-services-core/src/main/AndroidManifest.xml b/play-services-core/src/main/AndroidManifest.xml
@@ -688,11 +688,6 @@
                 <action android:name="com.google.android.gms.wallet.service.BIND" />
             </intent-filter>
         </service>
-        <service android:name="org.microg.gms.tapandpay.TapAndPayService">
-            <intent-filter>
-                <action android:name="com.google.android.gms.tapandpay.service.BIND" />
-            </intent-filter>
-        </service>
 
         <service android:name="org.microg.gms.cast.CastDeviceControllerService">
             <intent-filter>
diff --git a/play-services-core/src/main/java/org/microg/gms/tapandpay/TapAndPayImpl.java b/play-services-core/src/main/java/org/microg/gms/tapandpay/TapAndPayImpl.java
diff --git a/play-services-core/src/main/java/org/microg/gms/tapandpay/TapAndPayService.java b/play-services-core/src/main/java/org/microg/gms/tapandpay/TapAndPayService.java
diff --git a/play-services-tapandpay-api/build.gradle b/play-services-tapandpay-api/build.gradle
@@ -0,0 +1,36 @@
+/*
+ * SPDX-FileCopyrightText: 2021, microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+apply plugin: 'com.android.library'
+apply plugin: 'maven-publish'
+apply plugin: 'signing'
+
+android {
+    compileSdkVersion androidCompileSdk
+    buildToolsVersion "$androidBuildVersionTools"
+
+    defaultConfig {
+        versionName version
+        minSdkVersion androidMinSdk
+        targetSdkVersion androidTargetSdk
+    }
+
+    compileOptions {
+        sourceCompatibility = 1.8
+        targetCompatibility = 1.8
+    }
+}
+
+// Nothing to publish yet
+//apply from: '../gradle/publish-android.gradle'
+
+description = 'microG API for play-services-tapandpay'
+
+dependencies {
+    api project(':play-services-basement')
+    api project(':play-services-base-api')
+
+    implementation "androidx.annotation:annotation:$annotationVersion"
+}
diff --git a/play-services-tapandpay-api/src/main/AndroidManifest.xml b/play-services-tapandpay-api/src/main/AndroidManifest.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ SPDX-FileCopyrightText: 2021, microG Project Team
+  ~ SPDX-License-Identifier: Apache-2.0
+  -->
+<manifest package="org.microg.gms.tapandpay.api"/>
diff --git a/play-services-tapandpay-api/src/main/aidl/com/google/android/gms/tapandpay/firstparty/TokenStatus.aidl b/play-services-tapandpay-api/src/main/aidl/com/google/android/gms/tapandpay/firstparty/TokenStatus.aidl
@@ -0,0 +1,3 @@
+package com.google.android.gms.tapandpay.firstparty;
+
+parcelable TokenStatus;
diff --git a/play-services-tapandpay-api/src/main/aidl/com/google/android/gms/tapandpay/internal/ITapAndPayService.aidl b/play-services-tapandpay-api/src/main/aidl/com/google/android/gms/tapandpay/internal/ITapAndPayService.aidl
@@ -0,0 +1,39 @@
+package com.google.android.gms.tapandpay.internal;
+
+import com.google.android.gms.tapandpay.internal.ITapAndPayServiceCallbacks;
+
+interface ITapAndPayService {
+//    void setSelectedToken(in SetSelectedTokenRequest request, ITapAndPayServiceCallbacks callbacks) = 0;
+//    void getAllCards(in GetAllCardsRequest request, ITapAndPayServiceCallbacks callbacks) = 1;
+//    void deleteToken(in DeleteTokenRequest request, ITapAndPayServiceCallbacks callbacks) = 2;
+//    void firstPartyTokenizePan(in FirstPartyTokenizePanRequest request, ITapAndPayServiceCallbacks callbacks) = 3;
+//    void setActiveAccount(in SetActiveAccountRequest request, ITapAndPayServiceCallbacks callbacks) = 4;
+//    void showSecurityPrompt(in ShowSecurityPromptRequest request, ITapAndPayServiceCallbacks callbacks) = 7;
+//    void getActiveAccount(in GetActiveAccountRequest request, ITapAndPayServiceCallbacks callbacks) = 8;
+    void registerDataChangedListener(ITapAndPayServiceCallbacks callbacks) = 9;
+//    void isDeviceUnlockedForPayment(in IsDeviceUnlockedForPaymentRequest request, ITapAndPayServiceCallbacks callbacks) = 10;
+//    void promptDeviceUnlockForPayment(in PromptDeviceUnlockForPaymentRequest request, ITapAndPayServiceCallbacks callbacks) = 11;
+//    void sendTapEvent(in SendTapEventRequest request, ITapAndPayServiceCallbacks callbacks) = 12;
+//    void getReceivesTransactionNotification(in GetReceivesTransactionNotificationsRequest request, ITapAndPayServiceCallbacks callbacks) = 13;
+//    void setReceivesTransactionNotification(in SetReceivesTransactionNotificationsRequest request, ITapAndPayServiceCallbacks callbacks) = 14;
+//    void retrieveInAppPaymentCredential(in RetrieveInAppPaymentCredentialRequest request, ITapAndPayServiceCallbacks callbacks) = 15;
+//    void getActiveCardsForAccount(in GetActiveCardsForAccountRequest request, ITapAndPayServiceCallbacks callbacks) = 17;
+//    void getAnalyticsContext(ITapAndPayServiceCallbacks callbacks) = 19;
+//    void getActiveWalletId(ITapAndPayServiceCallbacks callbacks) = 20;
+    void getTokenStatus(int tokenProvider, String issuerTokenId, ITapAndPayServiceCallbacks callbacks) = 21;
+//    void issuerTokenize(int tokenProvider, String issuerTokenId, String s2, ITapAndPayServiceCallbacks callbacks) = 22;
+//    void requestSelectToken(int tokenProvider, String issuerTokenId, ITapAndPayServiceCallbacks callbacks) = 23;
+//    void requestDeleteToken(int tokenProvider, String issuerTokenId, ITapAndPayServiceCallbacks callbacks) = 24;
+//    void isDeviceUnlockedForInAppPayment(in IsDeviceUnlockedForInAppPaymentRequest request, ITapAndPayServiceCallbacks callbacks) = 25;
+//    void reportInAppTransactionCompleted(in ReportInAppTransactionCompletedRequest request, ITapAndPayServiceCallbacks callbacks) = 26;
+//    void pushTokenize(in PushTokenizeRequest request, ITapAndPayServiceCallbacks callbacks) = 27;
+//    void createWallet(ITapAndPayServiceCallbacks callbacks) = 28;
+    void getStableHardwareId(ITapAndPayServiceCallbacks callbacks) = 29;
+//    void getEnvironment(ITapAndPayServiceCallbacks callbacks) = 30;
+//    void enablePayOnWear(in EnablePayOnWearRequest request, ITapAndPayServiceCallbacks callbacks) = 31;
+//    void isPayPalAvailable(ITapAndPayServiceCallbacks callbacks) = 32;
+//    void unknown34(ITapAndPayServiceCallbacks callbacks) = 33;
+//    void getSecurityParams(ITapAndPayServiceCallbacks callbacks) = 34;
+//    void getNotificationSettings(in GetNotificationSettingsRequest request, ITapAndPayServiceCallbacks callbacks) = 36;
+//    void setNotificationSettings(in SetNotificationSettingsRequest request, ITapAndPayServiceCallbacks callbacks) = 37;
+}
diff --git a/play-services-tapandpay-api/src/main/aidl/com/google/android/gms/tapandpay/internal/ITapAndPayServiceCallbacks.aidl b/play-services-tapandpay-api/src/main/aidl/com/google/android/gms/tapandpay/internal/ITapAndPayServiceCallbacks.aidl
@@ -0,0 +1,47 @@
+package com.google.android.gms.tapandpay.internal;
+
+import com.google.android.gms.common.api.Status;
+import com.google.android.gms.tapandpay.issuer.TokenStatus;
+
+interface ITapAndPayServiceCallbacks {
+    void onSetSelectedTokenResponse(in Status status) = 1;
+    void onStatus3(in Status status, in Bundle data) = 2;
+//    void onGetAllCardsResponse(in Status status, in GetAllCardsResponse response) = 3;
+    void onDeleteTokenResponse(in Status status) = 4;
+    void onSetActiveAccountResponse(in Status status) = 5;
+//    void onGetActiveAccountResponse(in Status status, in GetActiveAccountResponse response) = 7;
+    void onStatus9(in Status status) = 8;
+    void onReturn10() = 9;
+    void onIsDeviceUnlockedForPaymentResponse(in Status status, boolean isDeviceUnlockedForPayment) = 10;
+    void onStatus12(in Status status) = 11;
+    void onGetReceivesTransactionNotificationsResponse(in Status status, boolean receivesTransactionNotifications) = 12;
+    void onSetReceivesTransactionNotificationsResponse(in Status status) = 13;
+//    void onGetActiveCardsForAccountResponse(in Status status, in GetActiveCardsForAccountResponse response) = 14;
+//    void onRetrieveInAppPaymentCredentialResponse(in Status status, in RetrieveInAppPaymentCredentialResponse response) = 16;
+    void onGetAnalyticsContextResponse(in Status status, String analyticsContext) = 17;
+    void onTokenStatus(in Status status, in TokenStatus tokenStatus) = 19;
+    void onIsDeviceUnlockedForInAppPaymentResponse(in Status status, boolean isDeviceUnlockedForInAppPayment) = 20;
+    void onReportInAppTransactionCompletedResponse(in Status status) = 21;
+    void onGetStableHardwareIdResponse(in Status status, String stableHardwareId) = 22;
+    void onGetEnvironmentResponse(in Status status, String env) = 23;
+    void onEnablePayOnWearResponse(in Status status) = 24;
+    void onIsPayPalAvailableResponse(in Status status, boolean IsPayPalAvailable) = 25;
+//    void onGetSecurityParamsResponse(in Status status, in GetSecurityParamsResponse response) = 26;
+//    void onGetNotificationSettingsResponse(in Status status, in GetNotificationSettingsResponse response) = 27;
+    void onSetNotificationSettingsResponse(in Status status) = 28;
+//    void onGetAvailableOtherPaymentMethodsResponse(in Status status, in GetAvailableOtherPaymentMethodsResponse response) = 29;
+//    void onGetActiveTokensForAccountResponse(in Status status, in GetActiveTokensForAccountResponse response) = 30;
+//    void onGetSeChipTransactionsResponse(in Status status, in GetSeChipTransactionsResponse response) = 34;
+//    void onReserveResourceResponse(in Status status, in ReserveResourceResponse response) = 35;
+    void onReleaseResourceResponse(in Status status) = 36;
+    void onDisableSelectedTokenResponse(in Status status) = 37;
+//    void onGetFelicaTosAcceptanceResponse(in Status status, in GetFelicaTosAcceptanceResponse response) = 38;
+    void onSetFelicaTosAcceptanceResponse(in Status status) = 39;
+//    void onRefreshSeCardsResponse(in Status status, in RefreshSeCardsResponse response) = 40;
+//    void onGetGlobalActionCardsResponse(in Status status, in GetGlobalActionCardsResponse response) = 41;
+    void onGetLinkingTokenResponse(in Status status, String linkingToken) = 42;
+    void onBlockPaymentCardsResponse(in Status status) = 43;
+    void onUnblockPaymentCardsResponse(in Status status) = 44;
+//    void onGetLastAttestationResultResponse(in Status status, in GetLastAttestationResultResponse response) = 45;
+//    void onQuickAccessWalletConfig(in Status status, in QuickAccessWalletConfig config) = 46;
+}
diff --git a/play-services-tapandpay-api/src/main/aidl/com/google/android/gms/tapandpay/issuer/TokenStatus.aidl b/play-services-tapandpay-api/src/main/aidl/com/google/android/gms/tapandpay/issuer/TokenStatus.aidl
@@ -0,0 +1,3 @@
+package com.google.android.gms.tapandpay.issuer;
+
+parcelable TokenStatus;
diff --git a/play-services-tapandpay-api/src/main/java/com/google/android/gms/tapandpay/TapAndPayStatusCodes.java b/play-services-tapandpay-api/src/main/java/com/google/android/gms/tapandpay/TapAndPayStatusCodes.java
@@ -0,0 +1,19 @@
+/*
+ * SPDX-FileCopyrightText: 2021, microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.tapandpay;
+
+import com.google.android.gms.common.api.CommonStatusCodes;
+
+import org.microg.gms.common.PublicApi;
+
+@PublicApi
+public class TapAndPayStatusCodes extends CommonStatusCodes {
+    public static final int TAP_AND_PAY_NO_ACTIVE_WALLET = 15002;
+    public static final int TAP_AND_PAY_TOKEN_NOT_FOUND = 15003;
+    public static final int TAP_AND_PAY_INVALID_TOKEN_STATE = 15004;
+    public static final int TAP_AND_PAY_ATTESTATION_ERROR = 15005;
+    public static final int TAP_AND_PAY_UNAVAILABLE = 15009;
+}
diff --git a/play-services-tapandpay-api/src/main/java/com/google/android/gms/tapandpay/firstparty/TokenReference.java b/play-services-tapandpay-api/src/main/java/com/google/android/gms/tapandpay/firstparty/TokenReference.java
@@ -0,0 +1,17 @@
+/*
+ * SPDX-FileCopyrightText: 2021, microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.tapandpay.firstparty;
+
+import org.microg.safeparcel.AutoSafeParcelable;
+
+public class TokenReference extends AutoSafeParcelable {
+    @Field(2)
+    public String tokenReferenceId;
+    @Field(3)
+    public int tokenProvider;
+
+    public static final Creator<TokenReference> CREATOR = new AutoCreator<>(TokenReference.class);
+}
diff --git a/play-services-tapandpay-api/src/main/java/com/google/android/gms/tapandpay/firstparty/TokenStatus.java b/play-services-tapandpay-api/src/main/java/com/google/android/gms/tapandpay/firstparty/TokenStatus.java
@@ -0,0 +1,19 @@
+/*
+ * SPDX-FileCopyrightText: 2021, microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.tapandpay.firstparty;
+
+import org.microg.safeparcel.AutoSafeParcelable;
+
+public class TokenStatus extends AutoSafeParcelable {
+    @Field(2)
+    public TokenReference tokenReference;
+    @Field(3)
+    public int tokenState;
+    @Field(4)
+    public boolean isSelected;
+
+    public static final Creator<TokenStatus> CREATOR = new AutoCreator<>(TokenStatus.class);
+}
diff --git a/play-services-tapandpay-api/src/main/java/com/google/android/gms/tapandpay/issuer/TokenStatus.java b/play-services-tapandpay-api/src/main/java/com/google/android/gms/tapandpay/issuer/TokenStatus.java
@@ -0,0 +1,32 @@
+/*
+ * SPDX-FileCopyrightText: 2021, microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.tapandpay.issuer;
+
+import org.microg.gms.common.PublicApi;
+import org.microg.safeparcel.AutoSafeParcelable;
+
+@PublicApi
+public class TokenStatus extends AutoSafeParcelable {
+    @Field(2)
+    @PublicApi(exclude = true)
+    public String issuerTokenId;
+    @Field(3)
+    @PublicApi(exclude = true)
+    private int tokenState;
+    @Field(4)
+    @PublicApi(exclude = true)
+    private boolean isSelected;
+
+    public int getTokenState() {
+        return tokenState;
+    }
+
+    public boolean isSelected() {
+        return isSelected;
+    }
+
+    public static final Creator<TokenStatus> CREATOR = new AutoCreator<>(TokenStatus.class);
+}
diff --git a/play-services-tapandpay-core/build.gradle b/play-services-tapandpay-core/build.gradle
diff --git a/play-services-tapandpay-core/src/main/AndroidManifest.xml b/play-services-tapandpay-core/src/main/AndroidManifest.xml
diff --git a/play-services-tapandpay-core/src/main/kotlin/org/microg/gms/tapandpay/TapAndPayService.kt b/play-services-tapandpay-core/src/main/kotlin/org/microg/gms/tapandpay/TapAndPayService.kt
diff --git a/settings.gradle b/settings.gradle

Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,9 @@ apply plugin: 'signing'`
`9`	`9`
`10`	`10`	`dependencies {`
`11`	`11`	`api project(':play-services-basement')`
	`12`	`+ api "androidx.lifecycle:lifecycle-service:$lifecycleVersion"`
`12`	`13`
`13`	`14`	`implementation "androidx.annotation:annotation:$annotationVersion"`
`14`		`- implementation "androidx.lifecycle:lifecycle-service:$lifecycleVersion"`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`android {`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+package com.google.android.gms.tapandpay.firstparty;`
	`2`	`+`
	`3`	`+parcelable TokenStatus;`