soul-browser/app/smali/com/google/android/gms/common/internal/GmsClient.smali
KaKi87 550ddb0413
Decompile and recreate Soul Browser v1.4.85 with APK CI builds (#1)
* 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>
2026-08-10 16:07:14 +02:00

626 lines
20 KiB
Smali

.class public abstract Lcom/google/android/gms/common/internal/GmsClient;
.super Lcom/google/android/gms/common/internal/BaseGmsClient;
.source "SourceFile"
# interfaces
.implements Lcom/google/android/gms/common/api/Api$Client;
.implements Lcom/google/android/gms/common/internal/zaj;
# annotations
.annotation build Lcom/google/android/gms/common/annotation/KeepForSdk;
.end annotation
.annotation system Ldalvik/annotation/Signature;
value = {
"<T::",
"Landroid/os/IInterface;",
">",
"Lcom/google/android/gms/common/internal/BaseGmsClient<",
"TT;>;",
"Lcom/google/android/gms/common/api/Api$Client;",
"Lcom/google/android/gms/common/internal/zaj;"
}
.end annotation
# static fields
.field private static volatile zaa:Ljava/util/concurrent/Executor;
.annotation build Landroidx/annotation/Nullable;
.end annotation
.end field
# instance fields
.field private final zab:Lcom/google/android/gms/common/internal/ClientSettings;
.field private final zac:Ljava/util/Set;
.field private final zad:Landroid/accounts/Account;
.annotation build Landroidx/annotation/Nullable;
.end annotation
.end field
# direct methods
.method public constructor <init>(Landroid/content/Context;Landroid/os/Handler;ILcom/google/android/gms/common/internal/ClientSettings;)V
.locals 8
.param p1 # Landroid/content/Context;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
.param p2 # Landroid/os/Handler;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
.param p4 # Lcom/google/android/gms/common/internal/ClientSettings;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
.annotation build Landroidx/annotation/VisibleForTesting;
.end annotation
.annotation build Lcom/google/android/gms/common/annotation/KeepForSdk;
.end annotation
.line 1
invoke-static {p1}, Lcom/google/android/gms/common/internal/GmsClientSupervisor;->getInstance(Landroid/content/Context;)Lcom/google/android/gms/common/internal/GmsClientSupervisor;
move-result-object v3
.line 2
invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->getInstance()Lcom/google/android/gms/common/GoogleApiAvailability;
move-result-object v4
const/4 v6, 0x0
const/4 v7, 0x0
move-object v0, p0
move-object v1, p1
move-object v2, p2
move v5, p3
.line 3
invoke-direct/range {v0 .. v7}, Lcom/google/android/gms/common/internal/BaseGmsClient;-><init>(Landroid/content/Context;Landroid/os/Handler;Lcom/google/android/gms/common/internal/GmsClientSupervisor;Lcom/google/android/gms/common/GoogleApiAvailabilityLight;ILcom/google/android/gms/common/internal/BaseGmsClient$BaseConnectionCallbacks;Lcom/google/android/gms/common/internal/BaseGmsClient$BaseOnConnectionFailedListener;)V
.line 4
invoke-static {p4}, Lcom/google/android/gms/common/internal/Preconditions;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
move-result-object p1
check-cast p1, Lcom/google/android/gms/common/internal/ClientSettings;
iput-object p1, v0, Lcom/google/android/gms/common/internal/GmsClient;->zab:Lcom/google/android/gms/common/internal/ClientSettings;
.line 5
invoke-virtual {p4}, Lcom/google/android/gms/common/internal/ClientSettings;->getAccount()Landroid/accounts/Account;
move-result-object p1
iput-object p1, v0, Lcom/google/android/gms/common/internal/GmsClient;->zad:Landroid/accounts/Account;
.line 6
invoke-virtual {p4}, Lcom/google/android/gms/common/internal/ClientSettings;->getAllRequestedScopes()Ljava/util/Set;
move-result-object p1
invoke-direct {p0, p1}, Lcom/google/android/gms/common/internal/GmsClient;->zab(Ljava/util/Set;)Ljava/util/Set;
move-result-object p1
iput-object p1, v0, Lcom/google/android/gms/common/internal/GmsClient;->zac:Ljava/util/Set;
return-void
.end method
.method public constructor <init>(Landroid/content/Context;Landroid/os/Looper;ILcom/google/android/gms/common/internal/ClientSettings;)V
.locals 9
.param p1 # Landroid/content/Context;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
.param p2 # Landroid/os/Looper;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
.param p4 # Lcom/google/android/gms/common/internal/ClientSettings;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
.annotation build Lcom/google/android/gms/common/annotation/KeepForSdk;
.end annotation
.line 7
invoke-static {p1}, Lcom/google/android/gms/common/internal/GmsClientSupervisor;->getInstance(Landroid/content/Context;)Lcom/google/android/gms/common/internal/GmsClientSupervisor;
move-result-object v3
.line 8
invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->getInstance()Lcom/google/android/gms/common/GoogleApiAvailability;
move-result-object v4
const/4 v7, 0x0
const/4 v8, 0x0
move-object v0, p0
move-object v1, p1
move-object v2, p2
move v5, p3
move-object v6, p4
.line 9
invoke-direct/range {v0 .. v8}, Lcom/google/android/gms/common/internal/GmsClient;-><init>(Landroid/content/Context;Landroid/os/Looper;Lcom/google/android/gms/common/internal/GmsClientSupervisor;Lcom/google/android/gms/common/GoogleApiAvailability;ILcom/google/android/gms/common/internal/ClientSettings;Lcom/google/android/gms/common/api/internal/ConnectionCallbacks;Lcom/google/android/gms/common/api/internal/OnConnectionFailedListener;)V
return-void
.end method
.method public constructor <init>(Landroid/content/Context;Landroid/os/Looper;ILcom/google/android/gms/common/internal/ClientSettings;Lcom/google/android/gms/common/api/GoogleApiClient$ConnectionCallbacks;Lcom/google/android/gms/common/api/GoogleApiClient$OnConnectionFailedListener;)V
.locals 0
.param p1 # Landroid/content/Context;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
.param p2 # Landroid/os/Looper;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
.param p4 # Lcom/google/android/gms/common/internal/ClientSettings;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
.param p5 # Lcom/google/android/gms/common/api/GoogleApiClient$ConnectionCallbacks;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
.param p6 # Lcom/google/android/gms/common/api/GoogleApiClient$OnConnectionFailedListener;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
.annotation build Lcom/google/android/gms/common/annotation/KeepForSdk;
.end annotation
.annotation runtime Ljava/lang/Deprecated;
.end annotation
.line 10
invoke-direct/range {p0 .. p6}, Lcom/google/android/gms/common/internal/GmsClient;-><init>(Landroid/content/Context;Landroid/os/Looper;ILcom/google/android/gms/common/internal/ClientSettings;Lcom/google/android/gms/common/api/internal/ConnectionCallbacks;Lcom/google/android/gms/common/api/internal/OnConnectionFailedListener;)V
return-void
.end method
.method public constructor <init>(Landroid/content/Context;Landroid/os/Looper;ILcom/google/android/gms/common/internal/ClientSettings;Lcom/google/android/gms/common/api/internal/ConnectionCallbacks;Lcom/google/android/gms/common/api/internal/OnConnectionFailedListener;)V
.locals 9
.param p1 # Landroid/content/Context;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
.param p2 # Landroid/os/Looper;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
.param p4 # Lcom/google/android/gms/common/internal/ClientSettings;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
.param p5 # Lcom/google/android/gms/common/api/internal/ConnectionCallbacks;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
.param p6 # Lcom/google/android/gms/common/api/internal/OnConnectionFailedListener;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
.annotation build Lcom/google/android/gms/common/annotation/KeepForSdk;
.end annotation
.line 11
invoke-static {p1}, Lcom/google/android/gms/common/internal/GmsClientSupervisor;->getInstance(Landroid/content/Context;)Lcom/google/android/gms/common/internal/GmsClientSupervisor;
move-result-object v3
.line 12
invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->getInstance()Lcom/google/android/gms/common/GoogleApiAvailability;
move-result-object v4
.line 13
invoke-static {p5}, Lcom/google/android/gms/common/internal/Preconditions;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
move-result-object p5
move-object v7, p5
check-cast v7, Lcom/google/android/gms/common/api/internal/ConnectionCallbacks;
.line 14
invoke-static {p6}, Lcom/google/android/gms/common/internal/Preconditions;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
move-result-object p5
move-object v8, p5
check-cast v8, Lcom/google/android/gms/common/api/internal/OnConnectionFailedListener;
move-object v0, p0
move-object v1, p1
move-object v2, p2
move v5, p3
move-object v6, p4
.line 15
invoke-direct/range {v0 .. v8}, Lcom/google/android/gms/common/internal/GmsClient;-><init>(Landroid/content/Context;Landroid/os/Looper;Lcom/google/android/gms/common/internal/GmsClientSupervisor;Lcom/google/android/gms/common/GoogleApiAvailability;ILcom/google/android/gms/common/internal/ClientSettings;Lcom/google/android/gms/common/api/internal/ConnectionCallbacks;Lcom/google/android/gms/common/api/internal/OnConnectionFailedListener;)V
return-void
.end method
.method public constructor <init>(Landroid/content/Context;Landroid/os/Looper;Lcom/google/android/gms/common/internal/GmsClientSupervisor;Lcom/google/android/gms/common/GoogleApiAvailability;ILcom/google/android/gms/common/internal/ClientSettings;Lcom/google/android/gms/common/api/internal/ConnectionCallbacks;Lcom/google/android/gms/common/api/internal/OnConnectionFailedListener;)V
.locals 9
.param p1 # Landroid/content/Context;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
.param p2 # Landroid/os/Looper;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
.param p3 # Lcom/google/android/gms/common/internal/GmsClientSupervisor;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
.param p4 # Lcom/google/android/gms/common/GoogleApiAvailability;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
.param p6 # Lcom/google/android/gms/common/internal/ClientSettings;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
.param p7 # Lcom/google/android/gms/common/api/internal/ConnectionCallbacks;
.annotation build Landroidx/annotation/Nullable;
.end annotation
.end param
.param p8 # Lcom/google/android/gms/common/api/internal/OnConnectionFailedListener;
.annotation build Landroidx/annotation/Nullable;
.end annotation
.end param
.annotation build Landroidx/annotation/VisibleForTesting;
.end annotation
move-object/from16 v0, p7
move-object/from16 v1, p8
const/4 v2, 0x0
if-nez v0, :cond_0
move-object v6, v2
goto :goto_0
.line 16
:cond_0
new-instance v3, Lcom/google/android/gms/common/internal/zah;
invoke-direct {v3, v0}, Lcom/google/android/gms/common/internal/zah;-><init>(Lcom/google/android/gms/common/api/internal/ConnectionCallbacks;)V
move-object v6, v3
:goto_0
if-nez v1, :cond_1
:goto_1
move-object v7, v2
goto :goto_2
.line 17
:cond_1
new-instance v2, Lcom/google/android/gms/common/internal/zai;
invoke-direct {v2, v1}, Lcom/google/android/gms/common/internal/zai;-><init>(Lcom/google/android/gms/common/api/internal/OnConnectionFailedListener;)V
goto :goto_1
.line 18
:goto_2
invoke-virtual {p6}, Lcom/google/android/gms/common/internal/ClientSettings;->zab()Ljava/lang/String;
move-result-object v8
move-object v0, p0
move-object v1, p1
move-object v2, p2
move-object v3, p3
move-object v4, p4
move v5, p5
.line 19
invoke-direct/range {v0 .. v8}, Lcom/google/android/gms/common/internal/BaseGmsClient;-><init>(Landroid/content/Context;Landroid/os/Looper;Lcom/google/android/gms/common/internal/GmsClientSupervisor;Lcom/google/android/gms/common/GoogleApiAvailabilityLight;ILcom/google/android/gms/common/internal/BaseGmsClient$BaseConnectionCallbacks;Lcom/google/android/gms/common/internal/BaseGmsClient$BaseOnConnectionFailedListener;Ljava/lang/String;)V
iput-object p6, p0, Lcom/google/android/gms/common/internal/GmsClient;->zab:Lcom/google/android/gms/common/internal/ClientSettings;
.line 20
invoke-virtual {p6}, Lcom/google/android/gms/common/internal/ClientSettings;->getAccount()Landroid/accounts/Account;
move-result-object v2
iput-object v2, p0, Lcom/google/android/gms/common/internal/GmsClient;->zad:Landroid/accounts/Account;
.line 21
invoke-virtual {p6}, Lcom/google/android/gms/common/internal/ClientSettings;->getAllRequestedScopes()Ljava/util/Set;
move-result-object v1
invoke-direct {p0, v1}, Lcom/google/android/gms/common/internal/GmsClient;->zab(Ljava/util/Set;)Ljava/util/Set;
move-result-object v1
iput-object v1, p0, Lcom/google/android/gms/common/internal/GmsClient;->zac:Ljava/util/Set;
return-void
.end method
.method private final zab(Ljava/util/Set;)Ljava/util/Set;
.locals 3
.param p1 # Ljava/util/Set;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
.line 1
invoke-virtual {p0, p1}, Lcom/google/android/gms/common/internal/GmsClient;->validateScopes(Ljava/util/Set;)Ljava/util/Set;
.line 2
.line 3
.line 4
move-result-object v0
.line 5
invoke-interface {v0}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
.line 6
.line 7
.line 8
move-result-object v1
.line 9
:goto_0
invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
.line 10
.line 11
.line 12
move-result v2
.line 13
if-eqz v2, :cond_1
.line 14
.line 15
invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
.line 16
.line 17
.line 18
move-result-object v2
.line 19
check-cast v2, Lcom/google/android/gms/common/api/Scope;
.line 20
.line 21
invoke-interface {p1, v2}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
.line 22
.line 23
.line 24
move-result v2
.line 25
if-eqz v2, :cond_0
.line 26
.line 27
goto :goto_0
.line 28
:cond_0
new-instance p1, Ljava/lang/IllegalStateException;
.line 29
.line 30
const-string v0, "Expanding scopes is not permitted, use implied scopes instead"
.line 31
.line 32
invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
.line 33
.line 34
.line 35
throw p1
.line 36
:cond_1
return-object v0
.end method
.method public static zag(Ljava/util/concurrent/Executor;)V
.locals 0
.param p0 # Ljava/util/concurrent/Executor;
.annotation build Landroidx/annotation/Nullable;
.end annotation
.end param
sput-object p0, Lcom/google/android/gms/common/internal/GmsClient;->zaa:Ljava/util/concurrent/Executor;
return-void
.end method
# virtual methods
.method public final getAccount()Landroid/accounts/Account;
.locals 1
.annotation build Landroidx/annotation/Nullable;
.end annotation
iget-object v0, p0, Lcom/google/android/gms/common/internal/GmsClient;->zad:Landroid/accounts/Account;
return-object v0
.end method
.method public getBindServiceExecutor()Ljava/util/concurrent/Executor;
.locals 1
.annotation build Landroidx/annotation/Nullable;
.end annotation
.annotation build Lcom/google/android/gms/common/annotation/KeepForSdk;
.end annotation
sget-object v0, Lcom/google/android/gms/common/internal/GmsClient;->zaa:Ljava/util/concurrent/Executor;
return-object v0
.end method
.method public final getClientSettings()Lcom/google/android/gms/common/internal/ClientSettings;
.locals 1
.annotation build Landroidx/annotation/NonNull;
.end annotation
.annotation build Lcom/google/android/gms/common/annotation/KeepForSdk;
.end annotation
iget-object v0, p0, Lcom/google/android/gms/common/internal/GmsClient;->zab:Lcom/google/android/gms/common/internal/ClientSettings;
return-object v0
.end method
.method public getRequiredFeatures()[Lcom/google/android/gms/common/Feature;
.locals 1
.annotation build Landroidx/annotation/NonNull;
.end annotation
.annotation build Lcom/google/android/gms/common/annotation/KeepForSdk;
.end annotation
const/4 v0, 0x0
new-array v0, v0, [Lcom/google/android/gms/common/Feature;
return-object v0
.end method
.method public final getScopes()Ljava/util/Set;
.locals 1
.annotation build Landroidx/annotation/NonNull;
.end annotation
.annotation build Lcom/google/android/gms/common/annotation/KeepForSdk;
.end annotation
.annotation system Ldalvik/annotation/Signature;
value = {
"()",
"Ljava/util/Set<",
"Lcom/google/android/gms/common/api/Scope;",
">;"
}
.end annotation
iget-object v0, p0, Lcom/google/android/gms/common/internal/GmsClient;->zac:Ljava/util/Set;
return-object v0
.end method
.method public getScopesForConnectionlessNonSignIn()Ljava/util/Set;
.locals 1
.annotation build Landroidx/annotation/NonNull;
.end annotation
.annotation build Lcom/google/android/gms/common/annotation/KeepForSdk;
.end annotation
.annotation system Ldalvik/annotation/Signature;
value = {
"()",
"Ljava/util/Set<",
"Lcom/google/android/gms/common/api/Scope;",
">;"
}
.end annotation
.line 1
invoke-virtual {p0}, Lcom/google/android/gms/common/internal/BaseGmsClient;->requiresSignIn()Z
.line 2
.line 3
.line 4
move-result v0
.line 5
if-eqz v0, :cond_0
.line 6
.line 7
iget-object v0, p0, Lcom/google/android/gms/common/internal/GmsClient;->zac:Ljava/util/Set;
.line 8
.line 9
return-object v0
.line 10
:cond_0
sget-object v0, Ljava/util/Collections;->EMPTY_SET:Ljava/util/Set;
.line 11
.line 12
return-object v0
.end method
.method public validateScopes(Ljava/util/Set;)Ljava/util/Set;
.locals 0
.param p1 # Ljava/util/Set;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
.annotation build Landroidx/annotation/NonNull;
.end annotation
.annotation build Lcom/google/android/gms/common/annotation/KeepForSdk;
.end annotation
.annotation system Ldalvik/annotation/Signature;
value = {
"(",
"Ljava/util/Set<",
"Lcom/google/android/gms/common/api/Scope;",
">;)",
"Ljava/util/Set<",
"Lcom/google/android/gms/common/api/Scope;",
">;"
}
.end annotation
return-object p1
.end method