soul-browser/app/smali_classes2/j$/util/concurrent/r.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

181 lines
3.2 KiB
Smali

.class public final Lj$/util/concurrent/r;
.super Lj$/util/concurrent/l;
.source "SourceFile"
# instance fields
.field public e:Lj$/util/concurrent/r;
.field public f:Lj$/util/concurrent/r;
.field public g:Lj$/util/concurrent/r;
.field public h:Lj$/util/concurrent/r;
.field public i:Z
# direct methods
.method public constructor <init>(ILjava/lang/Object;Ljava/lang/Object;Lj$/util/concurrent/l;Lj$/util/concurrent/r;)V
.locals 0
.line 2716
invoke-direct {p0, p1, p2, p3, p4}, Lj$/util/concurrent/l;-><init>(ILjava/lang/Object;Ljava/lang/Object;Lj$/util/concurrent/l;)V
.line 2717
iput-object p5, p0, Lj$/util/concurrent/r;->e:Lj$/util/concurrent/r;
return-void
.end method
# virtual methods
.method public final a(ILjava/lang/Object;)Lj$/util/concurrent/l;
.locals 1
const/4 v0, 0x0
.line 2721
invoke-virtual {p0, p1, p2, v0}, Lj$/util/concurrent/r;->b(ILjava/lang/Object;Ljava/lang/Class;)Lj$/util/concurrent/r;
move-result-object p1
return-object p1
.end method
.method public final b(ILjava/lang/Object;Ljava/lang/Class;)Lj$/util/concurrent/r;
.locals 5
if-eqz p2, :cond_d
move-object v0, p0
.line 2733
:cond_0
iget-object v1, v0, Lj$/util/concurrent/r;->f:Lj$/util/concurrent/r;
iget-object v2, v0, Lj$/util/concurrent/r;->g:Lj$/util/concurrent/r;
.line 2734
iget v3, v0, Lj$/util/concurrent/l;->a:I
if-le v3, p1, :cond_1
goto :goto_1
:cond_1
if-ge v3, p1, :cond_2
goto :goto_0
.line 2738
:cond_2
iget-object v3, v0, Lj$/util/concurrent/l;->b:Ljava/lang/Object;
if-eq v3, p2, :cond_c
if-eqz v3, :cond_3
invoke-virtual {p2, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
move-result v4
if-eqz v4, :cond_3
goto :goto_5
:cond_3
if-nez v1, :cond_4
:goto_0
move-object v0, v2
goto :goto_4
:cond_4
if-nez v2, :cond_6
:cond_5
:goto_1
move-object v0, v1
goto :goto_4
:cond_6
if-nez p3, :cond_7
.line 2745
invoke-static {p2}, Lj$/util/concurrent/ConcurrentHashMap;->c(Ljava/lang/Object;)Ljava/lang/Class;
move-result-object p3
if-eqz p3, :cond_b
.line 2746
:cond_7
sget v0, Lj$/util/concurrent/ConcurrentHashMap;->g:I
if-eqz v3, :cond_9
.line 738
invoke-virtual {v3}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
move-result-object v0
if-eq v0, p3, :cond_8
goto :goto_2
.line 739
:cond_8
move-object v0, p2
check-cast v0, Ljava/lang/Comparable;
invoke-interface {v0, v3}, Ljava/lang/Comparable;->compareTo(Ljava/lang/Object;)I
move-result v0
goto :goto_3
:cond_9
:goto_2
const/4 v0, 0x0
:goto_3
if-eqz v0, :cond_b
if-gez v0, :cond_a
goto :goto_1
:cond_a
move-object v1, v2
goto :goto_1
.line 2748
:cond_b
invoke-virtual {v2, p1, p2, p3}, Lj$/util/concurrent/r;->b(ILjava/lang/Object;Ljava/lang/Class;)Lj$/util/concurrent/r;
move-result-object v0
if-eqz v0, :cond_5
return-object v0
:goto_4
if-nez v0, :cond_0
goto :goto_6
:cond_c
:goto_5
return-object v0
:cond_d
:goto_6
const/4 p1, 0x0
return-object p1
.end method