soul-browser/app/smali/com/google/android/gms/common/internal/ClientSettings.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

590 lines
16 KiB
Smali

.class public final Lcom/google/android/gms/common/internal/ClientSettings;
.super Ljava/lang/Object;
.source "SourceFile"
# annotations
.annotation build Lcom/google/android/gms/common/annotation/KeepForSdk;
.end annotation
.annotation system Ldalvik/annotation/MemberClasses;
value = {
Lcom/google/android/gms/common/internal/ClientSettings$Builder;
}
.end annotation
# instance fields
.field private final zaa:Landroid/accounts/Account;
.annotation runtime Ljavax/annotation/Nullable;
.end annotation
.end field
.field private final zab:Ljava/util/Set;
.field private final zac:Ljava/util/Set;
.field private final zad:Ljava/util/Map;
.field private final zae:I
.field private final zaf:Landroid/view/View;
.annotation runtime Ljavax/annotation/Nullable;
.end annotation
.end field
.field private final zag:Ljava/lang/String;
.field private final zah:Ljava/lang/String;
.field private final zai:Lcom/google/android/gms/signin/SignInOptions;
.field private zaj:Ljava/lang/Integer;
# direct methods
.method public constructor <init>(Landroid/accounts/Account;Ljava/util/Set;Ljava/util/Map;ILandroid/view/View;Ljava/lang/String;Ljava/lang/String;Lcom/google/android/gms/signin/SignInOptions;)V
.locals 10
.param p1 # Landroid/accounts/Account;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
.param p2 # Ljava/util/Set;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
.param p3 # Ljava/util/Map;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
.param p5 # Landroid/view/View;
.annotation runtime Ljavax/annotation/Nullable;
.end annotation
.end param
.param p6 # Ljava/lang/String;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
.param p7 # Ljava/lang/String;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
.param p8 # Lcom/google/android/gms/signin/SignInOptions;
.annotation runtime Ljavax/annotation/Nullable;
.end annotation
.end param
.annotation build Lcom/google/android/gms/common/annotation/KeepForSdk;
.end annotation
.annotation system Ldalvik/annotation/Signature;
value = {
"(",
"Landroid/accounts/Account;",
"Ljava/util/Set<",
"Lcom/google/android/gms/common/api/Scope;",
">;",
"Ljava/util/Map<",
"Lcom/google/android/gms/common/api/Api<",
"*>;",
"Lcom/google/android/gms/common/internal/zab;",
">;I",
"Landroid/view/View;",
"Ljava/lang/String;",
"Ljava/lang/String;",
"Lcom/google/android/gms/signin/SignInOptions;",
")V"
}
.end annotation
const/4 v9, 0x0
move-object v0, p0
move-object v1, p1
move-object v2, p2
move-object v3, p3
move v4, p4
move-object v5, p5
move-object/from16 v6, p6
move-object/from16 v7, p7
move-object/from16 v8, p8
.line 1
invoke-direct/range {v0 .. v9}, Lcom/google/android/gms/common/internal/ClientSettings;-><init>(Landroid/accounts/Account;Ljava/util/Set;Ljava/util/Map;ILandroid/view/View;Ljava/lang/String;Ljava/lang/String;Lcom/google/android/gms/signin/SignInOptions;Z)V
return-void
.end method
.method public constructor <init>(Landroid/accounts/Account;Ljava/util/Set;Ljava/util/Map;ILandroid/view/View;Ljava/lang/String;Ljava/lang/String;Lcom/google/android/gms/signin/SignInOptions;Z)V
.locals 0
.param p1 # Landroid/accounts/Account;
.annotation runtime Ljavax/annotation/Nullable;
.end annotation
.end param
.param p2 # Ljava/util/Set;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
.param p3 # Ljava/util/Map;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
.param p5 # Landroid/view/View;
.annotation runtime Ljavax/annotation/Nullable;
.end annotation
.end param
.param p6 # Ljava/lang/String;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
.param p7 # Ljava/lang/String;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
.param p8 # Lcom/google/android/gms/signin/SignInOptions;
.annotation runtime Ljavax/annotation/Nullable;
.end annotation
.end param
.line 2
invoke-direct {p0}, Ljava/lang/Object;-><init>()V
iput-object p1, p0, Lcom/google/android/gms/common/internal/ClientSettings;->zaa:Landroid/accounts/Account;
if-nez p2, :cond_0
sget-object p1, Ljava/util/Collections;->EMPTY_SET:Ljava/util/Set;
goto :goto_0
:cond_0
invoke-static {p2}, Lj$/util/DesugarCollections;->unmodifiableSet(Ljava/util/Set;)Ljava/util/Set;
move-result-object p1
:goto_0
iput-object p1, p0, Lcom/google/android/gms/common/internal/ClientSettings;->zab:Ljava/util/Set;
if-nez p3, :cond_1
.line 3
sget-object p3, Ljava/util/Collections;->EMPTY_MAP:Ljava/util/Map;
:cond_1
iput-object p3, p0, Lcom/google/android/gms/common/internal/ClientSettings;->zad:Ljava/util/Map;
iput-object p5, p0, Lcom/google/android/gms/common/internal/ClientSettings;->zaf:Landroid/view/View;
iput p4, p0, Lcom/google/android/gms/common/internal/ClientSettings;->zae:I
iput-object p6, p0, Lcom/google/android/gms/common/internal/ClientSettings;->zag:Ljava/lang/String;
iput-object p7, p0, Lcom/google/android/gms/common/internal/ClientSettings;->zah:Ljava/lang/String;
if-nez p8, :cond_2
sget-object p8, Lcom/google/android/gms/signin/SignInOptions;->c:Lcom/google/android/gms/signin/SignInOptions;
:cond_2
iput-object p8, p0, Lcom/google/android/gms/common/internal/ClientSettings;->zai:Lcom/google/android/gms/signin/SignInOptions;
new-instance p2, Ljava/util/HashSet;
.line 4
invoke-direct {p2, p1}, Ljava/util/HashSet;-><init>(Ljava/util/Collection;)V
.line 5
invoke-interface {p3}, Ljava/util/Map;->values()Ljava/util/Collection;
move-result-object p1
invoke-interface {p1}, Ljava/util/Collection;->iterator()Ljava/util/Iterator;
move-result-object p1
:goto_1
invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
move-result p3
if-eqz p3, :cond_3
invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
move-result-object p3
check-cast p3, Lcom/google/android/gms/common/internal/zab;
.line 6
iget-object p3, p3, Lcom/google/android/gms/common/internal/zab;->zaa:Ljava/util/Set;
invoke-interface {p2, p3}, Ljava/util/Set;->addAll(Ljava/util/Collection;)Z
goto :goto_1
.line 7
:cond_3
invoke-static {p2}, Lj$/util/DesugarCollections;->unmodifiableSet(Ljava/util/Set;)Ljava/util/Set;
move-result-object p1
iput-object p1, p0, Lcom/google/android/gms/common/internal/ClientSettings;->zac:Ljava/util/Set;
return-void
.end method
.method public static createDefault(Landroid/content/Context;)Lcom/google/android/gms/common/internal/ClientSettings;
.locals 1
.param p0 # Landroid/content/Context;
.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
.line 1
new-instance v0, Lcom/google/android/gms/common/api/GoogleApiClient$Builder;
.line 2
.line 3
invoke-direct {v0, p0}, Lcom/google/android/gms/common/api/GoogleApiClient$Builder;-><init>(Landroid/content/Context;)V
.line 4
.line 5
.line 6
invoke-virtual {v0}, Lcom/google/android/gms/common/api/GoogleApiClient$Builder;->zaa()Lcom/google/android/gms/common/internal/ClientSettings;
.line 7
.line 8
.line 9
move-result-object p0
.line 10
return-object p0
.end method
# virtual methods
.method public getAccount()Landroid/accounts/Account;
.locals 1
.annotation build Landroidx/annotation/Nullable;
.end annotation
.annotation build Lcom/google/android/gms/common/annotation/KeepForSdk;
.end annotation
iget-object v0, p0, Lcom/google/android/gms/common/internal/ClientSettings;->zaa:Landroid/accounts/Account;
return-object v0
.end method
.method public getAccountName()Ljava/lang/String;
.locals 1
.annotation build Landroidx/annotation/Nullable;
.end annotation
.annotation build Lcom/google/android/gms/common/annotation/KeepForSdk;
.end annotation
.annotation runtime Ljava/lang/Deprecated;
.end annotation
.line 1
iget-object v0, p0, Lcom/google/android/gms/common/internal/ClientSettings;->zaa:Landroid/accounts/Account;
.line 2
.line 3
if-eqz v0, :cond_0
.line 4
.line 5
iget-object v0, v0, Landroid/accounts/Account;->name:Ljava/lang/String;
.line 6
.line 7
return-object v0
.line 8
:cond_0
const/4 v0, 0x0
.line 9
return-object v0
.end method
.method public getAccountOrDefault()Landroid/accounts/Account;
.locals 3
.annotation build Landroidx/annotation/NonNull;
.end annotation
.annotation build Lcom/google/android/gms/common/annotation/KeepForSdk;
.end annotation
.line 1
iget-object v0, p0, Lcom/google/android/gms/common/internal/ClientSettings;->zaa:Landroid/accounts/Account;
.line 2
.line 3
if-eqz v0, :cond_0
.line 4
.line 5
return-object v0
.line 6
:cond_0
new-instance v0, Landroid/accounts/Account;
.line 7
.line 8
const-string v1, "<<default account>>"
.line 9
.line 10
const-string v2, "com.google"
.line 11
.line 12
invoke-direct {v0, v1, v2}, Landroid/accounts/Account;-><init>(Ljava/lang/String;Ljava/lang/String;)V
.line 13
.line 14
.line 15
return-object v0
.end method
.method public getAllRequestedScopes()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/ClientSettings;->zac:Ljava/util/Set;
return-object v0
.end method
.method public getApplicableScopes(Lcom/google/android/gms/common/api/Api;)Ljava/util/Set;
.locals 2
.param p1 # Lcom/google/android/gms/common/api/Api;
.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 = {
"(",
"Lcom/google/android/gms/common/api/Api<",
"*>;)",
"Ljava/util/Set<",
"Lcom/google/android/gms/common/api/Scope;",
">;"
}
.end annotation
.line 1
iget-object v0, p0, Lcom/google/android/gms/common/internal/ClientSettings;->zad:Ljava/util/Map;
.line 2
.line 3
invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
.line 4
.line 5
.line 6
move-result-object p1
.line 7
check-cast p1, Lcom/google/android/gms/common/internal/zab;
.line 8
.line 9
if-eqz p1, :cond_1
.line 10
.line 11
iget-object p1, p1, Lcom/google/android/gms/common/internal/zab;->zaa:Ljava/util/Set;
.line 12
.line 13
invoke-interface {p1}, Ljava/util/Set;->isEmpty()Z
.line 14
.line 15
.line 16
move-result v0
.line 17
if-eqz v0, :cond_0
.line 18
.line 19
goto :goto_0
.line 20
:cond_0
iget-object v0, p0, Lcom/google/android/gms/common/internal/ClientSettings;->zab:Ljava/util/Set;
.line 21
.line 22
new-instance v1, Ljava/util/HashSet;
.line 23
.line 24
invoke-direct {v1, v0}, Ljava/util/HashSet;-><init>(Ljava/util/Collection;)V
.line 25
.line 26
.line 27
invoke-interface {v1, p1}, Ljava/util/Set;->addAll(Ljava/util/Collection;)Z
.line 28
.line 29
.line 30
return-object v1
.line 31
:cond_1
:goto_0
iget-object p1, p0, Lcom/google/android/gms/common/internal/ClientSettings;->zab:Ljava/util/Set;
.line 32
.line 33
return-object p1
.end method
.method public getGravityForPopups()I
.locals 1
.annotation build Lcom/google/android/gms/common/annotation/KeepForSdk;
.end annotation
iget v0, p0, Lcom/google/android/gms/common/internal/ClientSettings;->zae:I
return v0
.end method
.method public getRealClientPackageName()Ljava/lang/String;
.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/ClientSettings;->zag:Ljava/lang/String;
return-object v0
.end method
.method public getRequiredScopes()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/ClientSettings;->zab:Ljava/util/Set;
return-object v0
.end method
.method public getViewForPopups()Landroid/view/View;
.locals 1
.annotation build Landroidx/annotation/Nullable;
.end annotation
.annotation build Lcom/google/android/gms/common/annotation/KeepForSdk;
.end annotation
iget-object v0, p0, Lcom/google/android/gms/common/internal/ClientSettings;->zaf:Landroid/view/View;
return-object v0
.end method
.method public final zaa()Ljava/util/Map;
.locals 1
.annotation build Landroidx/annotation/NonNull;
.end annotation
iget-object v0, p0, Lcom/google/android/gms/common/internal/ClientSettings;->zad:Ljava/util/Map;
return-object v0
.end method
.method public final zab()Ljava/lang/String;
.locals 1
.annotation build Landroidx/annotation/Nullable;
.end annotation
iget-object v0, p0, Lcom/google/android/gms/common/internal/ClientSettings;->zah:Ljava/lang/String;
return-object v0
.end method
.method public final zac()Lcom/google/android/gms/signin/SignInOptions;
.locals 1
.annotation build Landroidx/annotation/NonNull;
.end annotation
iget-object v0, p0, Lcom/google/android/gms/common/internal/ClientSettings;->zai:Lcom/google/android/gms/signin/SignInOptions;
return-object v0
.end method
.method public final zad()Ljava/lang/Integer;
.locals 1
.annotation build Landroidx/annotation/Nullable;
.end annotation
iget-object v0, p0, Lcom/google/android/gms/common/internal/ClientSettings;->zaj:Ljava/lang/Integer;
return-object v0
.end method
.method public final zae(Ljava/lang/Integer;)V
.locals 0
.param p1 # Ljava/lang/Integer;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
iput-object p1, p0, Lcom/google/android/gms/common/internal/ClientSettings;->zaj:Ljava/lang/Integer;
return-void
.end method