soul-browser/app/smali_classes3/com/google/common/collect/ImmutableMultiset$Builder.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

205 lines
4.6 KiB
Smali

.class public Lcom/google/common/collect/ImmutableMultiset$Builder;
.super Lcom/google/common/collect/ImmutableCollection$Builder;
.source "SourceFile"
# annotations
.annotation system Ldalvik/annotation/EnclosingClass;
value = Lcom/google/common/collect/ImmutableMultiset;
.end annotation
.annotation system Ldalvik/annotation/InnerClass;
accessFlags = 0x9
name = "Builder"
.end annotation
.annotation system Ldalvik/annotation/Signature;
value = {
"<E:",
"Ljava/lang/Object;",
">",
"Lcom/google/common/collect/ImmutableCollection$Builder<",
"TE;>;"
}
.end annotation
# instance fields
.field public a:Lcom/google/common/collect/ObjectCountHashMap;
.field public b:Z
# virtual methods
.method public bridge synthetic a(Ljava/lang/Object;)Lcom/google/common/collect/ImmutableCollection$Builder;
.locals 0
.line 1
invoke-virtual {p0, p1}, Lcom/google/common/collect/ImmutableMultiset$Builder;->c(Ljava/lang/Object;)Lcom/google/common/collect/ImmutableMultiset$Builder;
.line 2
.line 3
.line 4
move-result-object p1
.line 5
return-object p1
.end method
.method public c(Ljava/lang/Object;)Lcom/google/common/collect/ImmutableMultiset$Builder;
.locals 1
.line 1
const/4 v0, 0x1
.line 2
invoke-virtual {p0, v0, p1}, Lcom/google/common/collect/ImmutableMultiset$Builder;->d(ILjava/lang/Object;)Lcom/google/common/collect/ImmutableMultiset$Builder;
.line 3
.line 4
.line 5
move-result-object p1
.line 6
return-object p1
.end method
.method public d(ILjava/lang/Object;)Lcom/google/common/collect/ImmutableMultiset$Builder;
.locals 5
.line 1
iget-object v0, p0, Lcom/google/common/collect/ImmutableMultiset$Builder;->a:Lcom/google/common/collect/ObjectCountHashMap;
.line 2
.line 3
invoke-static {v0}, Lj$/util/Objects;->requireNonNull(Ljava/lang/Object;)Ljava/lang/Object;
.line 4
.line 5
.line 6
if-nez p1, :cond_0
.line 7
.line 8
return-object p0
.line 9
:cond_0
iget-boolean v0, p0, Lcom/google/common/collect/ImmutableMultiset$Builder;->b:Z
.line 10
.line 11
if-eqz v0, :cond_2
.line 12
.line 13
new-instance v0, Lcom/google/common/collect/ObjectCountHashMap;
.line 14
.line 15
iget-object v1, p0, Lcom/google/common/collect/ImmutableMultiset$Builder;->a:Lcom/google/common/collect/ObjectCountHashMap;
.line 16
.line 17
invoke-direct {v0}, Ljava/lang/Object;-><init>()V
.line 18
.line 19
.line 20
iget v2, v1, Lcom/google/common/collect/ObjectCountHashMap;->c:I
.line 21
.line 22
invoke-virtual {v0, v2}, Lcom/google/common/collect/ObjectCountHashMap;->h(I)V
.line 23
.line 24
.line 25
invoke-virtual {v1}, Lcom/google/common/collect/ObjectCountHashMap;->c()I
.line 26
.line 27
.line 28
move-result v2
.line 29
:goto_0
const/4 v3, -0x1
.line 30
if-eq v2, v3, :cond_1
.line 31
.line 32
invoke-virtual {v1, v2}, Lcom/google/common/collect/ObjectCountHashMap;->e(I)Ljava/lang/Object;
.line 33
.line 34
.line 35
move-result-object v3
.line 36
invoke-virtual {v1, v2}, Lcom/google/common/collect/ObjectCountHashMap;->f(I)I
.line 37
.line 38
.line 39
move-result v4
.line 40
invoke-virtual {v0, v4, v3}, Lcom/google/common/collect/ObjectCountHashMap;->m(ILjava/lang/Object;)I
.line 41
.line 42
.line 43
invoke-virtual {v1, v2}, Lcom/google/common/collect/ObjectCountHashMap;->k(I)I
.line 44
.line 45
.line 46
move-result v2
.line 47
goto :goto_0
.line 48
:cond_1
iput-object v0, p0, Lcom/google/common/collect/ImmutableMultiset$Builder;->a:Lcom/google/common/collect/ObjectCountHashMap;
.line 49
.line 50
:cond_2
const/4 v0, 0x0
.line 51
iput-boolean v0, p0, Lcom/google/common/collect/ImmutableMultiset$Builder;->b:Z
.line 52
.line 53
invoke-virtual {p2}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
.line 54
.line 55
.line 56
iget-object v0, p0, Lcom/google/common/collect/ImmutableMultiset$Builder;->a:Lcom/google/common/collect/ObjectCountHashMap;
.line 57
.line 58
invoke-virtual {v0, p2}, Lcom/google/common/collect/ObjectCountHashMap;->d(Ljava/lang/Object;)I
.line 59
.line 60
.line 61
move-result v1
.line 62
add-int/2addr p1, v1
.line 63
invoke-virtual {v0, p1, p2}, Lcom/google/common/collect/ObjectCountHashMap;->m(ILjava/lang/Object;)I
.line 64
.line 65
.line 66
return-object p0
.end method