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

155 lines
3 KiB
Smali

.class Lcom/google/common/collect/Sets$1$1;
.super Lcom/google/common/collect/AbstractIterator;
.source "SourceFile"
# annotations
.annotation system Ldalvik/annotation/Signature;
value = {
"Lcom/google/common/collect/AbstractIterator<",
"Ljava/lang/Object;",
">;"
}
.end annotation
# instance fields
.field public final g:Ljava/util/Iterator;
.field public final h:Ljava/util/Iterator;
.field public final synthetic i:Ljava/util/Set;
# direct methods
.method public constructor <init>(Ljava/util/Set;Ljava/util/Set;)V
.locals 0
.line 1
iput-object p1, p0, Lcom/google/common/collect/Sets$1$1;->i:Ljava/util/Set;
.line 2
.line 3
invoke-direct {p0}, Lcom/google/common/collect/AbstractIterator;-><init>()V
.line 4
.line 5
.line 6
invoke-interface {p1}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
.line 7
.line 8
.line 9
move-result-object p1
.line 10
iput-object p1, p0, Lcom/google/common/collect/Sets$1$1;->g:Ljava/util/Iterator;
.line 11
.line 12
invoke-interface {p2}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
.line 13
.line 14
.line 15
move-result-object p1
.line 16
iput-object p1, p0, Lcom/google/common/collect/Sets$1$1;->h:Ljava/util/Iterator;
.line 17
.line 18
return-void
.end method
# virtual methods
.method public final a()Ljava/lang/Object;
.locals 2
.line 1
iget-object v0, p0, Lcom/google/common/collect/Sets$1$1;->g:Ljava/util/Iterator;
.line 2
.line 3
invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
.line 4
.line 5
.line 6
move-result v1
.line 7
if-eqz v1, :cond_0
.line 8
.line 9
invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
.line 10
.line 11
.line 12
move-result-object v0
.line 13
return-object v0
.line 14
:cond_0
iget-object v0, p0, Lcom/google/common/collect/Sets$1$1;->h:Ljava/util/Iterator;
.line 15
.line 16
invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
.line 17
.line 18
.line 19
move-result v1
.line 20
if-eqz v1, :cond_1
.line 21
.line 22
invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
.line 23
.line 24
.line 25
move-result-object v0
.line 26
iget-object v1, p0, Lcom/google/common/collect/Sets$1$1;->i:Ljava/util/Set;
.line 27
.line 28
invoke-interface {v1, v0}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
.line 29
.line 30
.line 31
move-result v1
.line 32
if-nez v1, :cond_0
.line 33
.line 34
return-object v0
.line 35
:cond_1
sget-object v0, Lcom/google/common/collect/AbstractIterator$State;->g:Lcom/google/common/collect/AbstractIterator$State;
.line 36
.line 37
iput-object v0, p0, Lcom/google/common/collect/AbstractIterator;->c:Lcom/google/common/collect/AbstractIterator$State;
.line 38
.line 39
const/4 v0, 0x0
.line 40
return-object v0
.end method