Add details of Google Certificate lookup API

play-services-appinvite/core/src/main/kotlin/org/microg/gms/appinivite/AppInviteActivity.kt

@@ -7,14 +7,13 @@ package org.microg.gms.appinivite
 
 import android.content.Intent
 import android.net.Uri
-import android.os.Build
+import android.os.Build.VERSION.SDK_INT
 import android.os.Bundle
 import android.os.LocaleList
 import android.util.Log
 import android.view.ViewGroup
 import android.view.Window
 import android.widget.ProgressBar
-import android.widget.RelativeLayout
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.pm.PackageInfoCompat
 import androidx.core.os.bundleOf
@@ -146,7 +145,7 @@ class ProtobufPostRequest<I : Message<I, *>, O>(url: String, private val i: I, p
 
     override fun getHeaders(): Map<String, String> {
         val headers = HashMap(super.getHeaders())
-        headers["Accept-Language"] = if (Build.VERSION.SDK_INT >= 24) LocaleList.getDefault().toLanguageTags() else Locale.getDefault().language
+        headers["Accept-Language"] = if (SDK_INT >= 24) LocaleList.getDefault().toLanguageTags() else Locale.getDefault().language
         headers["X-Android-Package"] = Constants.GMS_PACKAGE_NAME
         headers["X-Android-Cert"] = Constants.GMS_PACKAGE_SIGNATURE_SHA1
         return headers

play-services-base/core/src/main/java/org/microg/gms/common/PackageUtils.java

@@ -76,6 +76,7 @@ public class PackageUtils {
         KNOWN_GOOGLE_PACKAGES.put("com.google.android.apps.walletnfcrel", "82759e2db43f9ccbafce313bc674f35748fabd7a");
         KNOWN_GOOGLE_PACKAGES.put("com.google.android.apps.recorder", "394d84cd2cf89d3453702c663f98ec6554afc3cd");
         KNOWN_GOOGLE_PACKAGES.put("com.google.android.apps.messaging", "0980a12be993528c19107bc21ad811478c63cefc");
+        KNOWN_GOOGLE_PACKAGES.put("com.google.android.apps.tachyon", "a0bc09af527b6397c7a9ef171d6cf76f757becc3");
     }
 
     public static boolean isGooglePackage(Context context, String packageName) {

play-services-basement/build.gradle

@@ -23,6 +23,8 @@ dependencies {
     api "androidx.collection:collection:1.0.0"
     api "androidx.core:core:1.2.0"
     api "androidx.fragment:fragment:1.0.0"
+
+    annotationProcessor project(':safe-parcel-processor')
 }
 
 android {

play-services-basement/src/main/aidl/com/google/android/gms/common/GoogleCertificatesLookupQuery.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.common;
+
+parcelable GoogleCertificatesLookupQuery;

play-services-basement/src/main/aidl/com/google/android/gms/common/GoogleCertificatesLookupResponse.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.common;
+
+parcelable GoogleCertificatesLookupResponse;

play-services-basement/src/main/aidl/com/google/android/gms/common/GoogleCertificatesQuery.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.common;
+
+parcelable GoogleCertificatesQuery;

play-services-basement/src/main/aidl/com/google/android/gms/common/internal/IGoogleCertificatesApi.aidl

@@ -1,12 +1,18 @@
 package com.google.android.gms.common.internal;
 
-import com.google.android.gms.common.internal.GoogleCertificatesQuery;
+import com.google.android.gms.common.GoogleCertificatesLookupQuery;
+import com.google.android.gms.common.GoogleCertificatesLookupResponse;
+import com.google.android.gms.common.GoogleCertificatesQuery;
 import com.google.android.gms.dynamic.IObjectWrapper;
 
 interface IGoogleCertificatesApi {
-    IObjectWrapper getGoogleCertificates();
-    IObjectWrapper getGoogleReleaseCertificates();
-    boolean isGoogleReleaseSigned(String packageName, IObjectWrapper certData);
-    boolean isGoogleSigned(String packageName, IObjectWrapper certData);
-    boolean isGoogleOrPlatformSigned(in GoogleCertificatesQuery query, IObjectWrapper packageManager);
+    IObjectWrapper getGoogleCertificates() = 0;
+    IObjectWrapper getGoogleReleaseCertificates() = 1;
+    boolean isGoogleReleaseSigned(String packageName, IObjectWrapper certData) = 2;
+    boolean isGoogleSigned(String packageName, IObjectWrapper certData) = 3;
+    boolean isGoogleOrPlatformSigned(in GoogleCertificatesQuery query, IObjectWrapper packageManager) = 4;
+    GoogleCertificatesLookupResponse isPackageGoogleOrPlatformSigned(in GoogleCertificatesLookupQuery query) = 5;
+    boolean isPackageGoogleOrPlatformSignedAvailable() = 6;
+    GoogleCertificatesLookupResponse queryPackageSigned(in GoogleCertificatesLookupQuery query) = 7;
+    boolean isFineGrainedPackageVerificationAvailable() = 8;
 }

play-services-basement/src/main/java/com/google/android/gms/common/GoogleCertificatesLookupQuery.java

@@ -0,0 +1,41 @@
+/*
+ * SPDX-FileCopyrightText: 2023 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.common;
+
+import android.content.Context;
+import android.os.IBinder;
+import com.google.android.gms.dynamic.IObjectWrapper;
+import com.google.android.gms.dynamic.ObjectWrapper;
+import org.microg.safeparcel.AutoSafeParcelable;
+
+public class GoogleCertificatesLookupQuery extends AutoSafeParcelable {
+    @Field(1)
+    private String callingPackage;
+    @Field(2)
+    private boolean allowTestKeys;
+    @Field(3)
+    private boolean ignoreTestKeysOverride;
+    @Field(4)
+    private IObjectWrapper contextWrapper;
+    private Context context;
+    @Field(5)
+    private boolean isChimeraPackage;
+    @Field(6)
+    private boolean includeHashesInErrorMessage;
+
+    public String getCallingPackage() {
+        return callingPackage;
+    }
+
+    public Context getContext() {
+        if (context == null && contextWrapper != null) {
+            context = ObjectWrapper.unwrapTyped(contextWrapper, Context.class);
+        }
+        return context;
+    }
+
+    public static final Creator<GoogleCertificatesLookupQuery> CREATOR = findCreator(GoogleCertificatesLookupQuery.class);
+}

play-services-basement/src/main/java/com/google/android/gms/common/GoogleCertificatesLookupResponse.java

@@ -0,0 +1,38 @@
+/*
+ * SPDX-FileCopyrightText: 2023 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.common;
+
+import android.os.Parcel;
+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 GoogleCertificatesLookupResponse extends AbstractSafeParcelable {
+    @Field(1)
+    public final boolean result;
+    @Field(2)
+    public final String errorMessage;
+    @Field(3)
+    public final int statusValue;
+    @Field(4)
+    public final int firstPartyStatusValue;
+
+    @Constructor
+    public GoogleCertificatesLookupResponse(@Param(1) boolean result, @Param(2) String errorMessage, @Param(3) int statusValue, @Param(4) int firstPartyStatusValue) {
+        this.result = result;
+        this.errorMessage = errorMessage;
+        this.statusValue = statusValue;
+        this.firstPartyStatusValue = firstPartyStatusValue;
+    }
+
+    @Override
+    public void writeToParcel(Parcel out, int flags) {
+        CREATOR.writeToParcel(this, out, flags);
+    }
+
+    public static final SafeParcelableCreatorAndWriter<GoogleCertificatesLookupResponse> CREATOR = findCreator(GoogleCertificatesLookupResponse.class);
+}

play-services-basement/src/main/java/com/google/android/gms/common/internal/GoogleCertificatesQuery.java → play-services-basement/src/main/java/com/google/android/gms/common/GoogleCertificatesQuery.java

@@ -1,43 +1,35 @@
 /*
- * Copyright (C) 2019 microG Project Team
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * SPDX-FileCopyrightText: 2023 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.google.android.gms.common.internal;
+package com.google.android.gms.common;
 
 import android.os.IBinder;
 import android.os.RemoteException;
 
+import com.google.android.gms.common.internal.CertData;
+import com.google.android.gms.common.internal.ICertData;
 import com.google.android.gms.dynamic.IObjectWrapper;
 import com.google.android.gms.dynamic.ObjectWrapper;
 
+import org.microg.gms.common.Hide;
 import org.microg.safeparcel.AutoSafeParcelable;
-import org.microg.safeparcel.SafeParceled;
 
+@Hide
 public class GoogleCertificatesQuery extends AutoSafeParcelable {
     @Field(1)
-    private String packageName;
+    private String callingPackage;
     @Field(2)
     private IBinder certDataBinder;
     private CertData certData;
     @Field(3)
-    private boolean allowNonRelease;
-    @Field(4)
     private boolean allowTestKeys;
+    @Field(4)
+    private boolean ignoreTestKeysOverride;
 
-    public String getPackageName() {
-        return packageName;
+    public String getCallingPackage() {
+        return callingPackage;
     }
 
     public CertData getCertData() {

play-services-basement/src/main/java/com/google/android/gms/dynamite/DynamiteModule.java

@@ -52,10 +52,8 @@ public class DynamiteModule {
 
     public interface VersionPolicy {
         interface IVersions {
-            /* renamed from: zza */
             int getLocalVersion(@NonNull Context context, @NonNull String moduleId);
 
-            /* renamed from: zzb */
             int getRemoteVersion(@NonNull Context context, @NonNull String moduleId, boolean forceStaging) throws LoadingException;
 
             IVersions Default = new IVersions() {

play-services-core/src/main/AndroidManifest.xml

@@ -493,6 +493,7 @@
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.APPLICATION_PREFERENCES" />

play-services-core/src/main/java/com/google/android/gms/chimera/DynamiteModuleInitializer.java

@@ -0,0 +1,25 @@
+/*
+ * SPDX-FileCopyrightText: 2023 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.chimera;
+
+import android.annotation.SuppressLint;
+import android.util.Log;
+import androidx.annotation.Keep;
+
+import android.content.Context;
+
+@Keep
+public class DynamiteModuleInitializer {
+    private static final String TAG = "DynamiteModule";
+
+    public static void initializeModuleV1(Context context) {
+        initializeModuleV2(context, "com.google.android.gms".equals(context.getPackageName()));
+    }
+
+    public static void initializeModuleV2(Context context, boolean withGmsPackage) {
+        Log.d(TAG, "initializeModuleV2 context: " + context + ", withGmsPackage: " + withGmsPackage);
+    }
+}