* 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>
606 lines
11 KiB
Smali
606 lines
11 KiB
Smali
.class public abstract Lj$/util/concurrent/b;
|
|
.super Ljava/lang/Object;
|
|
.source "SourceFile"
|
|
|
|
# interfaces
|
|
.implements Ljava/util/Collection;
|
|
.implements Ljava/io/Serializable;
|
|
|
|
|
|
# static fields
|
|
.field private static final serialVersionUID:J = 0x6499de129d87293dL
|
|
|
|
|
|
# instance fields
|
|
.field public final a:Lj$/util/concurrent/ConcurrentHashMap;
|
|
|
|
|
|
# direct methods
|
|
.method public constructor <init>(Lj$/util/concurrent/ConcurrentHashMap;)V
|
|
.locals 0
|
|
|
|
.line 4419
|
|
invoke-direct {p0}, Ljava/lang/Object;-><init>()V
|
|
|
|
iput-object p1, p0, Lj$/util/concurrent/b;->a:Lj$/util/concurrent/ConcurrentHashMap;
|
|
|
|
return-void
|
|
.end method
|
|
|
|
|
|
# virtual methods
|
|
.method public final clear()V
|
|
.locals 1
|
|
|
|
.line 4432
|
|
iget-object v0, p0, Lj$/util/concurrent/b;->a:Lj$/util/concurrent/ConcurrentHashMap;
|
|
|
|
invoke-virtual {v0}, Lj$/util/concurrent/ConcurrentHashMap;->clear()V
|
|
|
|
return-void
|
|
.end method
|
|
|
|
.method public abstract contains(Ljava/lang/Object;)Z
|
|
.end method
|
|
|
|
.method public final containsAll(Ljava/util/Collection;)Z
|
|
.locals 1
|
|
|
|
if-eq p1, p0, :cond_2
|
|
|
|
.line 4533
|
|
invoke-interface {p1}, Ljava/util/Collection;->iterator()Ljava/util/Iterator;
|
|
|
|
move-result-object p1
|
|
|
|
:cond_0
|
|
invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
|
|
|
|
move-result v0
|
|
|
|
if-eqz v0, :cond_2
|
|
|
|
invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
|
|
|
|
move-result-object v0
|
|
|
|
if-eqz v0, :cond_1
|
|
|
|
.line 4534
|
|
invoke-virtual {p0, v0}, Lj$/util/concurrent/b;->contains(Ljava/lang/Object;)Z
|
|
|
|
move-result v0
|
|
|
|
if-nez v0, :cond_0
|
|
|
|
:cond_1
|
|
const/4 p1, 0x0
|
|
|
|
return p1
|
|
|
|
:cond_2
|
|
const/4 p1, 0x1
|
|
|
|
return p1
|
|
.end method
|
|
|
|
.method public final isEmpty()Z
|
|
.locals 1
|
|
|
|
.line 4434
|
|
iget-object v0, p0, Lj$/util/concurrent/b;->a:Lj$/util/concurrent/ConcurrentHashMap;
|
|
|
|
invoke-virtual {v0}, Lj$/util/concurrent/ConcurrentHashMap;->isEmpty()Z
|
|
|
|
move-result v0
|
|
|
|
return v0
|
|
.end method
|
|
|
|
.method public abstract iterator()Ljava/util/Iterator;
|
|
.end method
|
|
|
|
.method public abstract remove(Ljava/lang/Object;)Z
|
|
.end method
|
|
|
|
.method public removeAll(Ljava/util/Collection;)Z
|
|
.locals 3
|
|
|
|
.line 4542
|
|
invoke-virtual {p1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
|
|
|
|
.line 4547
|
|
iget-object v0, p0, Lj$/util/concurrent/b;->a:Lj$/util/concurrent/ConcurrentHashMap;
|
|
|
|
iget-object v0, v0, Lj$/util/concurrent/ConcurrentHashMap;->a:[Lj$/util/concurrent/l;
|
|
|
|
const/4 v1, 0x0
|
|
|
|
if-nez v0, :cond_0
|
|
|
|
return v1
|
|
|
|
.line 4549
|
|
:cond_0
|
|
instance-of v2, p1, Ljava/util/Set;
|
|
|
|
if-eqz v2, :cond_3
|
|
|
|
invoke-interface {p1}, Ljava/util/Collection;->size()I
|
|
|
|
move-result v2
|
|
|
|
array-length v0, v0
|
|
|
|
if-le v2, v0, :cond_3
|
|
|
|
.line 4550
|
|
invoke-virtual {p0}, Lj$/util/concurrent/b;->iterator()Ljava/util/Iterator;
|
|
|
|
move-result-object v0
|
|
|
|
:cond_1
|
|
:goto_0
|
|
invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
|
|
|
|
move-result v2
|
|
|
|
if-eqz v2, :cond_2
|
|
|
|
.line 4551
|
|
invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
|
|
|
|
move-result-object v2
|
|
|
|
invoke-interface {p1, v2}, Ljava/util/Collection;->contains(Ljava/lang/Object;)Z
|
|
|
|
move-result v2
|
|
|
|
if-eqz v2, :cond_1
|
|
|
|
.line 4552
|
|
invoke-interface {v0}, Ljava/util/Iterator;->remove()V
|
|
|
|
const/4 v1, 0x1
|
|
|
|
goto :goto_0
|
|
|
|
:cond_2
|
|
return v1
|
|
|
|
.line 4557
|
|
:cond_3
|
|
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 v0
|
|
|
|
if-eqz v0, :cond_4
|
|
|
|
invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
|
|
|
|
move-result-object v0
|
|
|
|
.line 4558
|
|
invoke-virtual {p0, v0}, Lj$/util/concurrent/b;->remove(Ljava/lang/Object;)Z
|
|
|
|
move-result v0
|
|
|
|
or-int/2addr v1, v0
|
|
|
|
goto :goto_1
|
|
|
|
:cond_4
|
|
return v1
|
|
.end method
|
|
|
|
.method public final retainAll(Ljava/util/Collection;)Z
|
|
.locals 3
|
|
|
|
.line 4564
|
|
invoke-virtual {p1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
|
|
|
|
.line 4566
|
|
invoke-virtual {p0}, Lj$/util/concurrent/b;->iterator()Ljava/util/Iterator;
|
|
|
|
move-result-object v0
|
|
|
|
const/4 v1, 0x0
|
|
|
|
:cond_0
|
|
:goto_0
|
|
invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
|
|
|
|
move-result v2
|
|
|
|
if-eqz v2, :cond_1
|
|
|
|
.line 4567
|
|
invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
|
|
|
|
move-result-object v2
|
|
|
|
invoke-interface {p1, v2}, Ljava/util/Collection;->contains(Ljava/lang/Object;)Z
|
|
|
|
move-result v2
|
|
|
|
if-nez v2, :cond_0
|
|
|
|
.line 4568
|
|
invoke-interface {v0}, Ljava/util/Iterator;->remove()V
|
|
|
|
const/4 v1, 0x1
|
|
|
|
goto :goto_0
|
|
|
|
:cond_1
|
|
return v1
|
|
.end method
|
|
|
|
.method public final size()I
|
|
.locals 1
|
|
|
|
.line 4433
|
|
iget-object v0, p0, Lj$/util/concurrent/b;->a:Lj$/util/concurrent/ConcurrentHashMap;
|
|
|
|
invoke-virtual {v0}, Lj$/util/concurrent/ConcurrentHashMap;->size()I
|
|
|
|
move-result v0
|
|
|
|
return v0
|
|
.end method
|
|
|
|
.method public final toArray()[Ljava/lang/Object;
|
|
.locals 8
|
|
|
|
.line 4453
|
|
iget-object v0, p0, Lj$/util/concurrent/b;->a:Lj$/util/concurrent/ConcurrentHashMap;
|
|
|
|
.line 2169
|
|
invoke-virtual {v0}, Lj$/util/concurrent/ConcurrentHashMap;->j()J
|
|
|
|
move-result-wide v0
|
|
|
|
const-wide/16 v2, 0x0
|
|
|
|
cmp-long v4, v0, v2
|
|
|
|
if-gez v4, :cond_0
|
|
|
|
move-wide v0, v2
|
|
|
|
:cond_0
|
|
const-wide/32 v2, 0x7ffffff7
|
|
|
|
cmp-long v2, v0, v2
|
|
|
|
.line 4454
|
|
const-string v3, "Required array size too large"
|
|
|
|
if-gtz v2, :cond_6
|
|
|
|
long-to-int v0, v0
|
|
|
|
.line 4457
|
|
new-array v1, v0, [Ljava/lang/Object;
|
|
|
|
.line 4459
|
|
invoke-virtual {p0}, Lj$/util/concurrent/b;->iterator()Ljava/util/Iterator;
|
|
|
|
move-result-object v2
|
|
|
|
const/4 v4, 0x0
|
|
|
|
:goto_0
|
|
invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
|
|
|
|
move-result v5
|
|
|
|
if-eqz v5, :cond_4
|
|
|
|
invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
|
|
|
|
move-result-object v5
|
|
|
|
if-ne v4, v0, :cond_3
|
|
|
|
const v6, 0x7ffffff7
|
|
|
|
if-ge v0, v6, :cond_2
|
|
|
|
const v7, 0x3ffffffb # 1.9999994f
|
|
|
|
if-lt v0, v7, :cond_1
|
|
|
|
goto :goto_1
|
|
|
|
:cond_1
|
|
ushr-int/lit8 v6, v0, 0x1
|
|
|
|
add-int/lit8 v6, v6, 0x1
|
|
|
|
add-int/2addr v6, v0
|
|
|
|
.line 4467
|
|
:goto_1
|
|
invoke-static {v1, v6}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
|
|
|
|
move-result-object v0
|
|
|
|
move-object v1, v0
|
|
|
|
move v0, v6
|
|
|
|
goto :goto_2
|
|
|
|
.line 4462
|
|
:cond_2
|
|
new-instance v0, Ljava/lang/OutOfMemoryError;
|
|
|
|
invoke-direct {v0, v3}, Ljava/lang/OutOfMemoryError;-><init>(Ljava/lang/String;)V
|
|
|
|
throw v0
|
|
|
|
:cond_3
|
|
:goto_2
|
|
add-int/lit8 v6, v4, 0x1
|
|
|
|
.line 4469
|
|
aput-object v5, v1, v4
|
|
|
|
move v4, v6
|
|
|
|
goto :goto_0
|
|
|
|
:cond_4
|
|
if-ne v4, v0, :cond_5
|
|
|
|
return-object v1
|
|
|
|
.line 4471
|
|
:cond_5
|
|
invoke-static {v1, v4}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
|
|
|
|
move-result-object v0
|
|
|
|
return-object v0
|
|
|
|
.line 4455
|
|
:cond_6
|
|
new-instance v0, Ljava/lang/OutOfMemoryError;
|
|
|
|
invoke-direct {v0, v3}, Ljava/lang/OutOfMemoryError;-><init>(Ljava/lang/String;)V
|
|
|
|
throw v0
|
|
.end method
|
|
|
|
.method public final toArray([Ljava/lang/Object;)[Ljava/lang/Object;
|
|
.locals 8
|
|
|
|
.line 4476
|
|
iget-object v0, p0, Lj$/util/concurrent/b;->a:Lj$/util/concurrent/ConcurrentHashMap;
|
|
|
|
.line 2169
|
|
invoke-virtual {v0}, Lj$/util/concurrent/ConcurrentHashMap;->j()J
|
|
|
|
move-result-wide v0
|
|
|
|
const-wide/16 v2, 0x0
|
|
|
|
cmp-long v4, v0, v2
|
|
|
|
if-gez v4, :cond_0
|
|
|
|
move-wide v0, v2
|
|
|
|
:cond_0
|
|
const-wide/32 v2, 0x7ffffff7
|
|
|
|
cmp-long v2, v0, v2
|
|
|
|
.line 4477
|
|
const-string v3, "Required array size too large"
|
|
|
|
if-gtz v2, :cond_8
|
|
|
|
long-to-int v0, v0
|
|
|
|
.line 4480
|
|
array-length v1, p1
|
|
|
|
if-lt v1, v0, :cond_1
|
|
|
|
move-object v0, p1
|
|
|
|
goto :goto_0
|
|
|
|
.line 4482
|
|
:cond_1
|
|
invoke-virtual {p1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
|
|
|
|
move-result-object v1
|
|
|
|
invoke-virtual {v1}, Ljava/lang/Class;->getComponentType()Ljava/lang/Class;
|
|
|
|
move-result-object v1
|
|
|
|
invoke-static {v1, v0}, Ljava/lang/reflect/Array;->newInstance(Ljava/lang/Class;I)Ljava/lang/Object;
|
|
|
|
move-result-object v0
|
|
|
|
check-cast v0, [Ljava/lang/Object;
|
|
|
|
.line 4483
|
|
:goto_0
|
|
array-length v1, v0
|
|
|
|
.line 4485
|
|
invoke-virtual {p0}, Lj$/util/concurrent/b;->iterator()Ljava/util/Iterator;
|
|
|
|
move-result-object v2
|
|
|
|
const/4 v4, 0x0
|
|
|
|
:goto_1
|
|
invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
|
|
|
|
move-result v5
|
|
|
|
if-eqz v5, :cond_5
|
|
|
|
invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
|
|
|
|
move-result-object v5
|
|
|
|
if-ne v4, v1, :cond_4
|
|
|
|
const v6, 0x7ffffff7
|
|
|
|
if-ge v1, v6, :cond_3
|
|
|
|
const v7, 0x3ffffffb # 1.9999994f
|
|
|
|
if-lt v1, v7, :cond_2
|
|
|
|
goto :goto_2
|
|
|
|
:cond_2
|
|
ushr-int/lit8 v6, v1, 0x1
|
|
|
|
add-int/lit8 v6, v6, 0x1
|
|
|
|
add-int/2addr v6, v1
|
|
|
|
.line 4493
|
|
:goto_2
|
|
invoke-static {v0, v6}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
|
|
|
|
move-result-object v0
|
|
|
|
move v1, v6
|
|
|
|
goto :goto_3
|
|
|
|
.line 4488
|
|
:cond_3
|
|
new-instance p1, Ljava/lang/OutOfMemoryError;
|
|
|
|
invoke-direct {p1, v3}, Ljava/lang/OutOfMemoryError;-><init>(Ljava/lang/String;)V
|
|
|
|
throw p1
|
|
|
|
:cond_4
|
|
:goto_3
|
|
add-int/lit8 v6, v4, 0x1
|
|
|
|
.line 4495
|
|
aput-object v5, v0, v4
|
|
|
|
move v4, v6
|
|
|
|
goto :goto_1
|
|
|
|
:cond_5
|
|
if-ne p1, v0, :cond_6
|
|
|
|
if-ge v4, v1, :cond_6
|
|
|
|
const/4 p1, 0x0
|
|
|
|
.line 4498
|
|
aput-object p1, v0, v4
|
|
|
|
return-object v0
|
|
|
|
:cond_6
|
|
if-ne v4, v1, :cond_7
|
|
|
|
return-object v0
|
|
|
|
.line 4501
|
|
:cond_7
|
|
invoke-static {v0, v4}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
|
|
|
|
move-result-object p1
|
|
|
|
return-object p1
|
|
|
|
.line 4478
|
|
:cond_8
|
|
new-instance p1, Ljava/lang/OutOfMemoryError;
|
|
|
|
invoke-direct {p1, v3}, Ljava/lang/OutOfMemoryError;-><init>(Ljava/lang/String;)V
|
|
|
|
throw p1
|
|
.end method
|
|
|
|
.method public final toString()Ljava/lang/String;
|
|
.locals 3
|
|
|
|
.line 4516
|
|
new-instance v0, Ljava/lang/StringBuilder;
|
|
|
|
const-string v1, "["
|
|
|
|
invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
|
|
|
|
.line 4518
|
|
invoke-virtual {p0}, Lj$/util/concurrent/b;->iterator()Ljava/util/Iterator;
|
|
|
|
move-result-object v1
|
|
|
|
.line 4519
|
|
invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
|
|
|
|
move-result v2
|
|
|
|
if-eqz v2, :cond_2
|
|
|
|
.line 4521
|
|
:goto_0
|
|
invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
|
|
|
|
move-result-object v2
|
|
|
|
if-ne v2, p0, :cond_0
|
|
|
|
.line 4522
|
|
const-string v2, "(this Collection)"
|
|
|
|
:cond_0
|
|
invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
|
|
|
|
.line 4523
|
|
invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
|
|
|
|
move-result v2
|
|
|
|
if-nez v2, :cond_1
|
|
|
|
goto :goto_1
|
|
|
|
.line 4525
|
|
:cond_1
|
|
const-string v2, ", "
|
|
|
|
invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
|
|
|
goto :goto_0
|
|
|
|
:cond_2
|
|
:goto_1
|
|
const/16 v1, 0x5d
|
|
|
|
.line 4528
|
|
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
|
|
|
|
invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
|
|
|
|
move-result-object v0
|
|
|
|
return-object v0
|
|
.end method
|