KaKi87
550ddb0413
* 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>
327 lines
8 KiB
Smali
327 lines
8 KiB
Smali
.class public final Lj$/util/stream/o0;
|
|
.super Ljava/util/concurrent/CountedCompleter;
|
|
.source "SourceFile"
|
|
|
|
|
|
# instance fields
|
|
.field public final a:Lj$/util/stream/v3;
|
|
|
|
.field public b:Lj$/util/Spliterator;
|
|
|
|
.field public final c:J
|
|
|
|
.field public final d:Lj$/util/concurrent/ConcurrentHashMap;
|
|
|
|
.field public final e:Lj$/util/stream/n0;
|
|
|
|
.field public final f:Lj$/util/stream/o0;
|
|
|
|
.field public g:Lj$/util/stream/c2;
|
|
|
|
|
|
# direct methods
|
|
.method public constructor <init>(Lj$/util/stream/o0;Lj$/util/Spliterator;Lj$/util/stream/o0;)V
|
|
.locals 2
|
|
|
|
.line 388
|
|
invoke-direct {p0, p1}, Ljava/util/concurrent/CountedCompleter;-><init>(Ljava/util/concurrent/CountedCompleter;)V
|
|
|
|
.line 389
|
|
iget-object v0, p1, Lj$/util/stream/o0;->a:Lj$/util/stream/v3;
|
|
|
|
iput-object v0, p0, Lj$/util/stream/o0;->a:Lj$/util/stream/v3;
|
|
|
|
.line 390
|
|
iput-object p2, p0, Lj$/util/stream/o0;->b:Lj$/util/Spliterator;
|
|
|
|
.line 391
|
|
iget-wide v0, p1, Lj$/util/stream/o0;->c:J
|
|
|
|
iput-wide v0, p0, Lj$/util/stream/o0;->c:J
|
|
|
|
.line 392
|
|
iget-object p2, p1, Lj$/util/stream/o0;->d:Lj$/util/concurrent/ConcurrentHashMap;
|
|
|
|
iput-object p2, p0, Lj$/util/stream/o0;->d:Lj$/util/concurrent/ConcurrentHashMap;
|
|
|
|
.line 393
|
|
iget-object p1, p1, Lj$/util/stream/o0;->e:Lj$/util/stream/n0;
|
|
|
|
iput-object p1, p0, Lj$/util/stream/o0;->e:Lj$/util/stream/n0;
|
|
|
|
.line 394
|
|
iput-object p3, p0, Lj$/util/stream/o0;->f:Lj$/util/stream/o0;
|
|
|
|
return-void
|
|
.end method
|
|
|
|
.method public constructor <init>(Lj$/util/stream/v3;Lj$/util/Spliterator;Lj$/util/stream/n0;)V
|
|
.locals 2
|
|
|
|
const/4 v0, 0x0
|
|
|
|
.line 375
|
|
invoke-direct {p0, v0}, Ljava/util/concurrent/CountedCompleter;-><init>(Ljava/util/concurrent/CountedCompleter;)V
|
|
|
|
.line 376
|
|
iput-object p1, p0, Lj$/util/stream/o0;->a:Lj$/util/stream/v3;
|
|
|
|
.line 377
|
|
iput-object p2, p0, Lj$/util/stream/o0;->b:Lj$/util/Spliterator;
|
|
|
|
.line 378
|
|
invoke-interface {p2}, Lj$/util/Spliterator;->estimateSize()J
|
|
|
|
move-result-wide p1
|
|
|
|
invoke-static {p1, p2}, Lj$/util/stream/d;->e(J)J
|
|
|
|
move-result-wide p1
|
|
|
|
iput-wide p1, p0, Lj$/util/stream/o0;->c:J
|
|
|
|
.line 380
|
|
new-instance p1, Lj$/util/concurrent/ConcurrentHashMap;
|
|
|
|
.line 168
|
|
sget p2, Lj$/util/stream/d;->g:I
|
|
|
|
shl-int/lit8 p2, p2, 0x1
|
|
|
|
const/16 v1, 0x10
|
|
|
|
.line 380
|
|
invoke-static {v1, p2}, Ljava/lang/Math;->max(II)I
|
|
|
|
move-result p2
|
|
|
|
invoke-direct {p1, p2}, Lj$/util/concurrent/ConcurrentHashMap;-><init>(I)V
|
|
|
|
iput-object p1, p0, Lj$/util/stream/o0;->d:Lj$/util/concurrent/ConcurrentHashMap;
|
|
|
|
.line 381
|
|
iput-object p3, p0, Lj$/util/stream/o0;->e:Lj$/util/stream/n0;
|
|
|
|
.line 382
|
|
iput-object v0, p0, Lj$/util/stream/o0;->f:Lj$/util/stream/o0;
|
|
|
|
return-void
|
|
.end method
|
|
|
|
|
|
# virtual methods
|
|
.method public final compute()V
|
|
.locals 10
|
|
|
|
.line 403
|
|
iget-object v0, p0, Lj$/util/stream/o0;->b:Lj$/util/Spliterator;
|
|
|
|
.line 404
|
|
iget-wide v1, p0, Lj$/util/stream/o0;->c:J
|
|
|
|
const/4 v3, 0x0
|
|
|
|
move-object v4, p0
|
|
|
|
.line 406
|
|
:goto_0
|
|
invoke-interface {v0}, Lj$/util/Spliterator;->estimateSize()J
|
|
|
|
move-result-wide v5
|
|
|
|
cmp-long v5, v5, v1
|
|
|
|
if-lez v5, :cond_3
|
|
|
|
.line 407
|
|
invoke-interface {v0}, Lj$/util/Spliterator;->trySplit()Lj$/util/Spliterator;
|
|
|
|
move-result-object v5
|
|
|
|
if-eqz v5, :cond_3
|
|
|
|
.line 408
|
|
new-instance v6, Lj$/util/stream/o0;
|
|
|
|
iget-object v7, v4, Lj$/util/stream/o0;->f:Lj$/util/stream/o0;
|
|
|
|
invoke-direct {v6, v4, v5, v7}, Lj$/util/stream/o0;-><init>(Lj$/util/stream/o0;Lj$/util/Spliterator;Lj$/util/stream/o0;)V
|
|
|
|
.line 410
|
|
new-instance v7, Lj$/util/stream/o0;
|
|
|
|
invoke-direct {v7, v4, v0, v6}, Lj$/util/stream/o0;-><init>(Lj$/util/stream/o0;Lj$/util/Spliterator;Lj$/util/stream/o0;)V
|
|
|
|
const/4 v8, 0x1
|
|
|
|
.line 416
|
|
invoke-virtual {v4, v8}, Ljava/util/concurrent/CountedCompleter;->addToPendingCount(I)V
|
|
|
|
.line 419
|
|
invoke-virtual {v7, v8}, Ljava/util/concurrent/CountedCompleter;->addToPendingCount(I)V
|
|
|
|
.line 420
|
|
iget-object v9, v4, Lj$/util/stream/o0;->d:Lj$/util/concurrent/ConcurrentHashMap;
|
|
|
|
invoke-virtual {v9, v6, v7}, Lj$/util/concurrent/ConcurrentHashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
.line 423
|
|
iget-object v9, v4, Lj$/util/stream/o0;->f:Lj$/util/stream/o0;
|
|
|
|
if-eqz v9, :cond_1
|
|
|
|
.line 433
|
|
invoke-virtual {v6, v8}, Ljava/util/concurrent/CountedCompleter;->addToPendingCount(I)V
|
|
|
|
.line 436
|
|
iget-object v8, v4, Lj$/util/stream/o0;->d:Lj$/util/concurrent/ConcurrentHashMap;
|
|
|
|
iget-object v9, v4, Lj$/util/stream/o0;->f:Lj$/util/stream/o0;
|
|
|
|
invoke-virtual {v8, v9, v4, v6}, Lj$/util/concurrent/ConcurrentHashMap;->replace(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
|
|
|
|
move-result v8
|
|
|
|
const/4 v9, -0x1
|
|
|
|
if-eqz v8, :cond_0
|
|
|
|
.line 439
|
|
invoke-virtual {v4, v9}, Ljava/util/concurrent/CountedCompleter;->addToPendingCount(I)V
|
|
|
|
goto :goto_1
|
|
|
|
.line 444
|
|
:cond_0
|
|
invoke-virtual {v6, v9}, Ljava/util/concurrent/CountedCompleter;->addToPendingCount(I)V
|
|
|
|
:cond_1
|
|
:goto_1
|
|
if-eqz v3, :cond_2
|
|
|
|
move-object v0, v5
|
|
|
|
move-object v4, v6
|
|
|
|
move-object v6, v7
|
|
|
|
goto :goto_2
|
|
|
|
:cond_2
|
|
move-object v4, v7
|
|
|
|
:goto_2
|
|
xor-int/lit8 v3, v3, 0x1
|
|
|
|
.line 460
|
|
invoke-virtual {v6}, Ljava/util/concurrent/CountedCompleter;->fork()Ljava/util/concurrent/ForkJoinTask;
|
|
|
|
goto :goto_0
|
|
|
|
.line 471
|
|
:cond_3
|
|
invoke-virtual {v4}, Ljava/util/concurrent/CountedCompleter;->getPendingCount()I
|
|
|
|
move-result v1
|
|
|
|
if-lez v1, :cond_4
|
|
|
|
.line 475
|
|
new-instance v1, Lj$/util/stream/m;
|
|
|
|
const/16 v2, 0x11
|
|
|
|
.line 0
|
|
invoke-direct {v1, v2}, Lj$/util/stream/m;-><init>(I)V
|
|
|
|
.line 476
|
|
iget-object v2, v4, Lj$/util/stream/o0;->a:Lj$/util/stream/v3;
|
|
|
|
.line 477
|
|
invoke-virtual {v2, v0}, Lj$/util/stream/v3;->h0(Lj$/util/Spliterator;)J
|
|
|
|
move-result-wide v5
|
|
|
|
.line 476
|
|
invoke-virtual {v2, v5, v6, v1}, Lj$/util/stream/v3;->s0(JLjava/util/function/IntFunction;)Lj$/util/stream/u1;
|
|
|
|
move-result-object v1
|
|
|
|
.line 479
|
|
iget-object v2, v4, Lj$/util/stream/o0;->a:Lj$/util/stream/v3;
|
|
|
|
invoke-virtual {v2, v0, v1}, Lj$/util/stream/v3;->v0(Lj$/util/Spliterator;Lj$/util/stream/n5;)Lj$/util/stream/n5;
|
|
|
|
invoke-interface {v1}, Lj$/util/stream/u1;->build()Lj$/util/stream/c2;
|
|
|
|
move-result-object v0
|
|
|
|
iput-object v0, v4, Lj$/util/stream/o0;->g:Lj$/util/stream/c2;
|
|
|
|
const/4 v0, 0x0
|
|
|
|
.line 480
|
|
iput-object v0, v4, Lj$/util/stream/o0;->b:Lj$/util/Spliterator;
|
|
|
|
.line 482
|
|
:cond_4
|
|
invoke-virtual {v4}, Ljava/util/concurrent/CountedCompleter;->tryComplete()V
|
|
|
|
return-void
|
|
.end method
|
|
|
|
.method public final onCompletion(Ljava/util/concurrent/CountedCompleter;)V
|
|
.locals 3
|
|
|
|
.line 487
|
|
iget-object p1, p0, Lj$/util/stream/o0;->g:Lj$/util/stream/c2;
|
|
|
|
const/4 v0, 0x0
|
|
|
|
if-eqz p1, :cond_0
|
|
|
|
.line 489
|
|
iget-object v1, p0, Lj$/util/stream/o0;->e:Lj$/util/stream/n0;
|
|
|
|
invoke-interface {p1, v1}, Lj$/util/stream/c2;->forEach(Ljava/util/function/Consumer;)V
|
|
|
|
.line 490
|
|
iput-object v0, p0, Lj$/util/stream/o0;->g:Lj$/util/stream/c2;
|
|
|
|
goto :goto_0
|
|
|
|
.line 492
|
|
:cond_0
|
|
iget-object p1, p0, Lj$/util/stream/o0;->b:Lj$/util/Spliterator;
|
|
|
|
if-eqz p1, :cond_1
|
|
|
|
.line 494
|
|
iget-object v1, p0, Lj$/util/stream/o0;->a:Lj$/util/stream/v3;
|
|
|
|
iget-object v2, p0, Lj$/util/stream/o0;->e:Lj$/util/stream/n0;
|
|
|
|
invoke-virtual {v1, p1, v2}, Lj$/util/stream/v3;->v0(Lj$/util/Spliterator;Lj$/util/stream/n5;)Lj$/util/stream/n5;
|
|
|
|
.line 495
|
|
iput-object v0, p0, Lj$/util/stream/o0;->b:Lj$/util/Spliterator;
|
|
|
|
.line 502
|
|
:cond_1
|
|
:goto_0
|
|
iget-object p1, p0, Lj$/util/stream/o0;->d:Lj$/util/concurrent/ConcurrentHashMap;
|
|
|
|
invoke-virtual {p1, p0}, Lj$/util/concurrent/ConcurrentHashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
move-result-object p1
|
|
|
|
check-cast p1, Lj$/util/stream/o0;
|
|
|
|
if-eqz p1, :cond_2
|
|
|
|
.line 504
|
|
invoke-virtual {p1}, Ljava/util/concurrent/CountedCompleter;->tryComplete()V
|
|
|
|
:cond_2
|
|
return-void
|
|
.end method
|