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

247 lines
4.8 KiB
Smali

.class final Lcom/google/android/gms/common/api/zaa;
.super Ljava/lang/Object;
.source "SourceFile"
# interfaces
.implements Lcom/google/android/gms/common/api/PendingResult$StatusListener;
# instance fields
.field final synthetic zaa:Lcom/google/android/gms/common/api/Batch;
# direct methods
.method public constructor <init>(Lcom/google/android/gms/common/api/Batch;)V
.locals 0
.line 1
invoke-static {p1}, Lj$/util/Objects;->requireNonNull(Ljava/lang/Object;)Ljava/lang/Object;
.line 2
.line 3
.line 4
iput-object p1, p0, Lcom/google/android/gms/common/api/zaa;->zaa:Lcom/google/android/gms/common/api/Batch;
.line 5
.line 6
invoke-direct {p0}, Ljava/lang/Object;-><init>()V
.line 7
.line 8
.line 9
return-void
.end method
# virtual methods
.method public final onComplete(Lcom/google/android/gms/common/api/Status;)V
.locals 4
.line 1
iget-object v0, p0, Lcom/google/android/gms/common/api/zaa;->zaa:Lcom/google/android/gms/common/api/Batch;
.line 2
.line 3
invoke-virtual {v0}, Lcom/google/android/gms/common/api/Batch;->zai()Ljava/lang/Object;
.line 4
.line 5
.line 6
move-result-object v1
.line 7
monitor-enter v1
.line 8
:try_start_0
invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/BasePendingResult;->isCanceled()Z
.line 9
.line 10
.line 11
move-result v2
.line 12
if-eqz v2, :cond_0
.line 13
.line 14
monitor-exit v1
.line 15
return-void
.line 16
:catchall_0
move-exception p1
.line 17
goto :goto_3
.line 18
:cond_0
invoke-virtual {p1}, Lcom/google/android/gms/common/api/Status;->isCanceled()Z
.line 19
.line 20
.line 21
move-result v2
.line 22
const/4 v3, 0x1
.line 23
if-eqz v2, :cond_1
.line 24
.line 25
invoke-virtual {v0, v3}, Lcom/google/android/gms/common/api/Batch;->zag(Z)V
.line 26
.line 27
.line 28
goto :goto_0
.line 29
:cond_1
invoke-virtual {p1}, Lcom/google/android/gms/common/api/Status;->isSuccess()Z
.line 30
.line 31
.line 32
move-result p1
.line 33
if-nez p1, :cond_2
.line 34
.line 35
invoke-virtual {v0, v3}, Lcom/google/android/gms/common/api/Batch;->zae(Z)V
.line 36
.line 37
.line 38
:cond_2
:goto_0
invoke-virtual {v0}, Lcom/google/android/gms/common/api/Batch;->zab()I
.line 39
.line 40
.line 41
move-result p1
.line 42
add-int/lit8 p1, p1, -0x1
.line 43
.line 44
invoke-virtual {v0, p1}, Lcom/google/android/gms/common/api/Batch;->zac(I)V
.line 45
.line 46
.line 47
invoke-virtual {v0}, Lcom/google/android/gms/common/api/Batch;->zab()I
.line 48
.line 49
.line 50
move-result p1
.line 51
if-nez p1, :cond_5
.line 52
.line 53
invoke-virtual {v0}, Lcom/google/android/gms/common/api/Batch;->zaf()Z
.line 54
.line 55
.line 56
move-result p1
.line 57
if-eqz p1, :cond_3
.line 58
.line 59
invoke-static {v0}, Lcom/google/android/gms/common/api/Batch;->zaa(Lcom/google/android/gms/common/api/Batch;)V
.line 60
.line 61
.line 62
goto :goto_2
.line 63
:cond_3
invoke-virtual {v0}, Lcom/google/android/gms/common/api/Batch;->zad()Z
.line 64
.line 65
.line 66
move-result p1
.line 67
if-eqz p1, :cond_4
.line 68
.line 69
new-instance p1, Lcom/google/android/gms/common/api/Status;
.line 70
.line 71
const/16 v2, 0xd
.line 72
.line 73
invoke-direct {p1, v2}, Lcom/google/android/gms/common/api/Status;-><init>(I)V
.line 74
.line 75
.line 76
goto :goto_1
.line 77
:cond_4
sget-object p1, Lcom/google/android/gms/common/api/Status;->RESULT_SUCCESS:Lcom/google/android/gms/common/api/Status;
.line 78
.line 79
:goto_1
new-instance v2, Lcom/google/android/gms/common/api/BatchResult;
.line 80
.line 81
invoke-virtual {v0}, Lcom/google/android/gms/common/api/Batch;->zah()[Lcom/google/android/gms/common/api/PendingResult;
.line 82
.line 83
.line 84
move-result-object v3
.line 85
invoke-direct {v2, p1, v3}, Lcom/google/android/gms/common/api/BatchResult;-><init>(Lcom/google/android/gms/common/api/Status;[Lcom/google/android/gms/common/api/PendingResult;)V
.line 86
.line 87
.line 88
invoke-virtual {v0, v2}, Lcom/google/android/gms/common/api/internal/BasePendingResult;->setResult(Lcom/google/android/gms/common/api/Result;)V
.line 89
.line 90
.line 91
:cond_5
:goto_2
monitor-exit v1
.line 92
return-void
.line 93
:goto_3
monitor-exit v1
:try_end_0
.catchall {:try_start_0 .. :try_end_0} :catchall_0
.line 94
throw p1
.end method