* Decompile and recreate Soul Browser v1.4.85 with APK CI builds Co-authored-by: KaKi87 <KaKi87@pm.me> * Fix CI build: include bundled google.jks and remove PR trigger The apktool build failed in CI because app/unknown/.../google.jks was excluded by the *.jks gitignore rule. Whitelist app-bundled JKS files and commit the missing resource. Also remove the redundant pull_request workflow trigger. Co-authored-by: KaKi87 <KaKi87@pm.me> * Change package ID to com.github.kaki87.soulbrowser Rename the application ID so the rebuilt APK can be installed alongside the original Soul Browser from Google Play. - Update AndroidManifest package, permissions, providers, and actions - Update R class references in smali (com/github/kaki87/soulbrowser/R) - Update shortcuts.xml targetPackage - Rename app label to "Soul Rebuild" for easy identification Co-authored-by: KaKi87 <KaKi87@pm.me> * Fix install compatibility: remove split APK metadata and bundle native libs The rebuilt APK still declared requiredSplitTypes and Play Store split metadata, causing Android to reject standalone installs as incompatible. - Remove requiredSplitTypes and split-related manifest meta-data - Merge native libs from all ABI splits with uncompressed storage - Page-align before signing for extractNativeLibs=false - Add .so to apktool doNotCompress list Co-authored-by: KaKi87 <KaKi87@pm.me> * Fix install failure: use apksigner v2/v3 and bundle arm64 native libs Target SDK 36 requires APK Signature Scheme v2+, but jarsigner only produces v1 signatures, causing Android to reject the install. - Sign with apksigner (v1+v2+v3) instead of jarsigner - Add arm64-v8a native libraries from universal Soul Browser 1.4.79 - Set extractNativeLibs=true for reliable sideload installs - Commit stable debug keystore for consistent signatures across builds Co-authored-by: KaKi87 <KaKi87@pm.me> * Add committed debug keystore for consistent APK signatures Co-authored-by: KaKi87 <KaKi87@pm.me> * Fix startup crash: use original classes2.dex desugar libraries Apktool recompiles smali_classes2 into a broken classes2.dex, causing ClassNotFoundException for j$.com.android.tools.r8.a at ML Kit init. Inject the original classes2.dex (Java 8+ desugar libs) after apktool build instead of using the recompiled version. Co-authored-by: KaKi87 <KaKi87@pm.me> * Fix missing drawable resources from density split APKs The base APK is an app bundle module; density-specific drawables like seek_thumb_nor_b live in config.xhdpi.apk and were missing after rebuild, causing Resources$NotFoundException at runtime. - Merge non-9-patch resources from split APKs before apktool build - Sync public.xml IDs from R smali only when backing files exist - Add 713 density-specific resource IDs to public.xml Co-authored-by: KaKi87 <KaKi87@pm.me> --------- Co-authored-by: Cursor Agent <cursoragent@cursor.com>
132 lines
5.3 KiB
Java
132 lines
5.3 KiB
Java
package com.google.android.gms.common.internal;
|
|
|
|
import android.accounts.Account;
|
|
import android.content.Context;
|
|
import android.os.Handler;
|
|
import android.os.IInterface;
|
|
import android.os.Looper;
|
|
import androidx.annotation.NonNull;
|
|
import androidx.annotation.Nullable;
|
|
import androidx.annotation.VisibleForTesting;
|
|
import com.google.android.gms.common.Feature;
|
|
import com.google.android.gms.common.GoogleApiAvailability;
|
|
import com.google.android.gms.common.annotation.KeepForSdk;
|
|
import com.google.android.gms.common.api.Api;
|
|
import com.google.android.gms.common.api.GoogleApiClient;
|
|
import com.google.android.gms.common.api.Scope;
|
|
import com.google.android.gms.common.api.internal.ConnectionCallbacks;
|
|
import com.google.android.gms.common.api.internal.OnConnectionFailedListener;
|
|
import java.util.Collections;
|
|
import java.util.Iterator;
|
|
import java.util.Set;
|
|
import java.util.concurrent.Executor;
|
|
|
|
@KeepForSdk
|
|
/* loaded from: classes.dex */
|
|
public abstract class GmsClient<T extends IInterface> extends BaseGmsClient<T> implements Api.Client, zaj {
|
|
|
|
@Nullable
|
|
private static volatile Executor zaa;
|
|
private final ClientSettings zab;
|
|
private final Set zac;
|
|
|
|
@Nullable
|
|
private final Account zad;
|
|
|
|
@KeepForSdk
|
|
@VisibleForTesting
|
|
public GmsClient(@NonNull Context context, @NonNull Handler handler, int i, @NonNull ClientSettings clientSettings) {
|
|
super(context, handler, GmsClientSupervisor.getInstance(context), GoogleApiAvailability.getInstance(), i, null, null);
|
|
this.zab = (ClientSettings) Preconditions.checkNotNull(clientSettings);
|
|
this.zad = clientSettings.getAccount();
|
|
this.zac = zab(clientSettings.getAllRequestedScopes());
|
|
}
|
|
|
|
private final Set zab(@NonNull Set set) {
|
|
Set<Scope> validateScopes = validateScopes(set);
|
|
Iterator<Scope> it = validateScopes.iterator();
|
|
while (it.hasNext()) {
|
|
if (!set.contains(it.next())) {
|
|
throw new IllegalStateException("Expanding scopes is not permitted, use implied scopes instead");
|
|
}
|
|
}
|
|
return validateScopes;
|
|
}
|
|
|
|
public static void zag(@Nullable Executor executor) {
|
|
zaa = executor;
|
|
}
|
|
|
|
@Override // com.google.android.gms.common.internal.BaseGmsClient
|
|
@Nullable
|
|
public final Account getAccount() {
|
|
return this.zad;
|
|
}
|
|
|
|
@Override // com.google.android.gms.common.internal.BaseGmsClient
|
|
@Nullable
|
|
@KeepForSdk
|
|
public Executor getBindServiceExecutor() {
|
|
return zaa;
|
|
}
|
|
|
|
@NonNull
|
|
@KeepForSdk
|
|
public final ClientSettings getClientSettings() {
|
|
return this.zab;
|
|
}
|
|
|
|
@Override // com.google.android.gms.common.api.Api.Client
|
|
@NonNull
|
|
@KeepForSdk
|
|
public Feature[] getRequiredFeatures() {
|
|
return new Feature[0];
|
|
}
|
|
|
|
@Override // com.google.android.gms.common.internal.BaseGmsClient
|
|
@NonNull
|
|
@KeepForSdk
|
|
public final Set<Scope> getScopes() {
|
|
return this.zac;
|
|
}
|
|
|
|
@Override // com.google.android.gms.common.api.Api.Client
|
|
@NonNull
|
|
@KeepForSdk
|
|
public Set<Scope> getScopesForConnectionlessNonSignIn() {
|
|
if (requiresSignIn()) {
|
|
return this.zac;
|
|
}
|
|
return Collections.EMPTY_SET;
|
|
}
|
|
|
|
@NonNull
|
|
@KeepForSdk
|
|
public Set<Scope> validateScopes(@NonNull Set<Scope> set) {
|
|
return set;
|
|
}
|
|
|
|
@KeepForSdk
|
|
public GmsClient(@NonNull Context context, @NonNull Looper looper, int i, @NonNull ClientSettings clientSettings) {
|
|
this(context, looper, GmsClientSupervisor.getInstance(context), GoogleApiAvailability.getInstance(), i, clientSettings, null, null);
|
|
}
|
|
|
|
@KeepForSdk
|
|
@Deprecated
|
|
public GmsClient(@NonNull Context context, @NonNull Looper looper, int i, @NonNull ClientSettings clientSettings, @NonNull GoogleApiClient.ConnectionCallbacks connectionCallbacks, @NonNull GoogleApiClient.OnConnectionFailedListener onConnectionFailedListener) {
|
|
this(context, looper, i, clientSettings, (ConnectionCallbacks) connectionCallbacks, (OnConnectionFailedListener) onConnectionFailedListener);
|
|
}
|
|
|
|
@KeepForSdk
|
|
public GmsClient(@NonNull Context context, @NonNull Looper looper, int i, @NonNull ClientSettings clientSettings, @NonNull ConnectionCallbacks connectionCallbacks, @NonNull OnConnectionFailedListener onConnectionFailedListener) {
|
|
this(context, looper, GmsClientSupervisor.getInstance(context), GoogleApiAvailability.getInstance(), i, clientSettings, (ConnectionCallbacks) Preconditions.checkNotNull(connectionCallbacks), (OnConnectionFailedListener) Preconditions.checkNotNull(onConnectionFailedListener));
|
|
}
|
|
|
|
@VisibleForTesting
|
|
public GmsClient(@NonNull Context context, @NonNull Looper looper, @NonNull GmsClientSupervisor gmsClientSupervisor, @NonNull GoogleApiAvailability googleApiAvailability, int i, @NonNull ClientSettings clientSettings, @Nullable ConnectionCallbacks connectionCallbacks, @Nullable OnConnectionFailedListener onConnectionFailedListener) {
|
|
super(context, looper, gmsClientSupervisor, googleApiAvailability, i, connectionCallbacks == null ? null : new zah(connectionCallbacks), onConnectionFailedListener != null ? new zai(onConnectionFailedListener) : null, clientSettings.zab());
|
|
this.zab = clientSettings;
|
|
this.zad = clientSettings.getAccount();
|
|
this.zac = zab(clientSettings.getAllRequestedScopes());
|
|
}
|
|
}
|