* 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>
376 lines
7.5 KiB
Smali
376 lines
7.5 KiB
Smali
.class public abstract Lj$/util/stream/b;
|
|
.super Lj$/util/stream/d;
|
|
.source "SourceFile"
|
|
|
|
|
|
# instance fields
|
|
.field public final h:Ljava/util/concurrent/atomic/AtomicReference;
|
|
|
|
.field public volatile i:Z
|
|
|
|
|
|
# direct methods
|
|
.method public constructor <init>(Lj$/util/stream/b;Lj$/util/Spliterator;)V
|
|
.locals 0
|
|
|
|
.line 83
|
|
invoke-direct {p0, p1, p2}, Lj$/util/stream/d;-><init>(Lj$/util/stream/d;Lj$/util/Spliterator;)V
|
|
|
|
.line 84
|
|
iget-object p1, p1, Lj$/util/stream/b;->h:Ljava/util/concurrent/atomic/AtomicReference;
|
|
|
|
iput-object p1, p0, Lj$/util/stream/b;->h:Ljava/util/concurrent/atomic/AtomicReference;
|
|
|
|
return-void
|
|
.end method
|
|
|
|
.method public constructor <init>(Lj$/util/stream/v3;Lj$/util/Spliterator;)V
|
|
.locals 0
|
|
|
|
.line 70
|
|
invoke-direct {p0, p1, p2}, Lj$/util/stream/d;-><init>(Lj$/util/stream/v3;Lj$/util/Spliterator;)V
|
|
|
|
.line 71
|
|
new-instance p1, Ljava/util/concurrent/atomic/AtomicReference;
|
|
|
|
const/4 p2, 0x0
|
|
|
|
invoke-direct {p1, p2}, Ljava/util/concurrent/atomic/AtomicReference;-><init>(Ljava/lang/Object;)V
|
|
|
|
iput-object p1, p0, Lj$/util/stream/b;->h:Ljava/util/concurrent/atomic/AtomicReference;
|
|
|
|
return-void
|
|
.end method
|
|
|
|
|
|
# virtual methods
|
|
.method public final compute()V
|
|
.locals 10
|
|
|
|
.line 102
|
|
iget-object v0, p0, Lj$/util/stream/d;->b:Lj$/util/Spliterator;
|
|
|
|
.line 103
|
|
invoke-interface {v0}, Lj$/util/Spliterator;->estimateSize()J
|
|
|
|
move-result-wide v1
|
|
|
|
.line 206
|
|
iget-wide v3, p0, Lj$/util/stream/d;->c:J
|
|
|
|
const-wide/16 v5, 0x0
|
|
|
|
cmp-long v5, v3, v5
|
|
|
|
if-eqz v5, :cond_0
|
|
|
|
goto :goto_0
|
|
|
|
.line 207
|
|
:cond_0
|
|
invoke-static {v1, v2}, Lj$/util/stream/d;->e(J)J
|
|
|
|
move-result-wide v3
|
|
|
|
iput-wide v3, p0, Lj$/util/stream/d;->c:J
|
|
|
|
.line 107
|
|
:goto_0
|
|
iget-object v5, p0, Lj$/util/stream/b;->h:Ljava/util/concurrent/atomic/AtomicReference;
|
|
|
|
const/4 v6, 0x0
|
|
|
|
move-object v7, p0
|
|
|
|
.line 109
|
|
:goto_1
|
|
invoke-virtual {v5}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
|
|
|
|
move-result-object v8
|
|
|
|
if-nez v8, :cond_6
|
|
|
|
.line 207
|
|
iget-boolean v8, v7, Lj$/util/stream/b;->i:Z
|
|
|
|
if-nez v8, :cond_1
|
|
|
|
.line 286
|
|
invoke-virtual {v7}, Ljava/util/concurrent/CountedCompleter;->getCompleter()Ljava/util/concurrent/CountedCompleter;
|
|
|
|
move-result-object v9
|
|
|
|
:goto_2
|
|
check-cast v9, Lj$/util/stream/d;
|
|
|
|
.line 209
|
|
check-cast v9, Lj$/util/stream/b;
|
|
|
|
if-nez v8, :cond_1
|
|
|
|
if-eqz v9, :cond_1
|
|
|
|
.line 210
|
|
iget-boolean v8, v9, Lj$/util/stream/b;->i:Z
|
|
|
|
.line 286
|
|
invoke-virtual {v9}, Ljava/util/concurrent/CountedCompleter;->getCompleter()Ljava/util/concurrent/CountedCompleter;
|
|
|
|
move-result-object v9
|
|
|
|
goto :goto_2
|
|
|
|
:cond_1
|
|
if-eqz v8, :cond_2
|
|
|
|
.line 111
|
|
invoke-virtual {v7}, Lj$/util/stream/b;->h()Ljava/lang/Object;
|
|
|
|
move-result-object v8
|
|
|
|
goto :goto_5
|
|
|
|
:cond_2
|
|
cmp-long v1, v1, v3
|
|
|
|
if-lez v1, :cond_5
|
|
|
|
.line 114
|
|
invoke-interface {v0}, Lj$/util/Spliterator;->trySplit()Lj$/util/Spliterator;
|
|
|
|
move-result-object v1
|
|
|
|
if-nez v1, :cond_3
|
|
|
|
goto :goto_4
|
|
|
|
.line 119
|
|
:cond_3
|
|
invoke-virtual {v7, v1}, Lj$/util/stream/d;->c(Lj$/util/Spliterator;)Lj$/util/stream/d;
|
|
|
|
move-result-object v2
|
|
|
|
check-cast v2, Lj$/util/stream/b;
|
|
|
|
iput-object v2, v7, Lj$/util/stream/d;->d:Lj$/util/stream/d;
|
|
|
|
.line 120
|
|
invoke-virtual {v7, v0}, Lj$/util/stream/d;->c(Lj$/util/Spliterator;)Lj$/util/stream/d;
|
|
|
|
move-result-object v8
|
|
|
|
check-cast v8, Lj$/util/stream/b;
|
|
|
|
iput-object v8, v7, Lj$/util/stream/d;->e:Lj$/util/stream/d;
|
|
|
|
const/4 v9, 0x1
|
|
|
|
.line 121
|
|
invoke-virtual {v7, v9}, Ljava/util/concurrent/CountedCompleter;->setPendingCount(I)V
|
|
|
|
if-eqz v6, :cond_4
|
|
|
|
move-object v0, v1
|
|
|
|
move-object v7, v2
|
|
|
|
move-object v2, v8
|
|
|
|
goto :goto_3
|
|
|
|
:cond_4
|
|
move-object v7, v8
|
|
|
|
:goto_3
|
|
xor-int/lit8 v6, v6, 0x1
|
|
|
|
.line 133
|
|
invoke-virtual {v2}, Ljava/util/concurrent/CountedCompleter;->fork()Ljava/util/concurrent/ForkJoinTask;
|
|
|
|
.line 134
|
|
invoke-interface {v0}, Lj$/util/Spliterator;->estimateSize()J
|
|
|
|
move-result-wide v1
|
|
|
|
goto :goto_1
|
|
|
|
.line 115
|
|
:cond_5
|
|
:goto_4
|
|
invoke-virtual {v7}, Lj$/util/stream/d;->a()Ljava/lang/Object;
|
|
|
|
move-result-object v8
|
|
|
|
.line 136
|
|
:cond_6
|
|
:goto_5
|
|
invoke-virtual {v7, v8}, Lj$/util/stream/b;->d(Ljava/lang/Object;)V
|
|
|
|
.line 137
|
|
invoke-virtual {v7}, Ljava/util/concurrent/CountedCompleter;->tryComplete()V
|
|
|
|
return-void
|
|
.end method
|
|
|
|
.method public final d(Ljava/lang/Object;)V
|
|
.locals 2
|
|
|
|
.line 163
|
|
invoke-virtual {p0}, Lj$/util/stream/d;->b()Z
|
|
|
|
move-result v0
|
|
|
|
if-eqz v0, :cond_3
|
|
|
|
if-eqz p1, :cond_2
|
|
|
|
.line 165
|
|
iget-object v0, p0, Lj$/util/stream/b;->h:Ljava/util/concurrent/atomic/AtomicReference;
|
|
|
|
:cond_0
|
|
const/4 v1, 0x0
|
|
|
|
.line 0
|
|
invoke-virtual {v0, v1, p1}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
|
|
|
|
move-result v1
|
|
|
|
if-eqz v1, :cond_1
|
|
|
|
goto :goto_0
|
|
|
|
:cond_1
|
|
invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
|
|
|
|
move-result-object v1
|
|
|
|
if-eqz v1, :cond_0
|
|
|
|
:cond_2
|
|
:goto_0
|
|
return-void
|
|
|
|
.line 255
|
|
:cond_3
|
|
iput-object p1, p0, Lj$/util/stream/d;->f:Ljava/lang/Object;
|
|
|
|
return-void
|
|
.end method
|
|
|
|
.method public f()V
|
|
.locals 1
|
|
|
|
const/4 v0, 0x1
|
|
|
|
.line 197
|
|
iput-boolean v0, p0, Lj$/util/stream/b;->i:Z
|
|
|
|
return-void
|
|
.end method
|
|
|
|
.method public final g()V
|
|
.locals 4
|
|
|
|
.line 286
|
|
invoke-virtual {p0}, Ljava/util/concurrent/CountedCompleter;->getCompleter()Ljava/util/concurrent/CountedCompleter;
|
|
|
|
move-result-object v0
|
|
|
|
check-cast v0, Lj$/util/stream/d;
|
|
|
|
.line 223
|
|
check-cast v0, Lj$/util/stream/b;
|
|
|
|
move-object v1, p0
|
|
|
|
:goto_0
|
|
if-eqz v0, :cond_1
|
|
|
|
.line 227
|
|
iget-object v2, v0, Lj$/util/stream/d;->d:Lj$/util/stream/d;
|
|
|
|
if-ne v2, v1, :cond_0
|
|
|
|
.line 228
|
|
iget-object v1, v0, Lj$/util/stream/d;->e:Lj$/util/stream/d;
|
|
|
|
check-cast v1, Lj$/util/stream/b;
|
|
|
|
.line 229
|
|
iget-boolean v2, v1, Lj$/util/stream/b;->i:Z
|
|
|
|
if-nez v2, :cond_0
|
|
|
|
.line 230
|
|
invoke-virtual {v1}, Lj$/util/stream/b;->f()V
|
|
|
|
.line 286
|
|
:cond_0
|
|
invoke-virtual {v0}, Ljava/util/concurrent/CountedCompleter;->getCompleter()Ljava/util/concurrent/CountedCompleter;
|
|
|
|
move-result-object v1
|
|
|
|
check-cast v1, Lj$/util/stream/d;
|
|
|
|
.line 225
|
|
check-cast v1, Lj$/util/stream/b;
|
|
|
|
move-object v3, v1
|
|
|
|
move-object v1, v0
|
|
|
|
move-object v0, v3
|
|
|
|
goto :goto_0
|
|
|
|
:cond_1
|
|
return-void
|
|
.end method
|
|
|
|
.method public final getRawResult()Ljava/lang/Object;
|
|
.locals 1
|
|
|
|
.line 176
|
|
invoke-virtual {p0}, Lj$/util/stream/b;->i()Ljava/lang/Object;
|
|
|
|
move-result-object v0
|
|
|
|
return-object v0
|
|
.end method
|
|
|
|
.method public abstract h()Ljava/lang/Object;
|
|
.end method
|
|
|
|
.method public final i()Ljava/lang/Object;
|
|
.locals 1
|
|
|
|
.line 185
|
|
invoke-virtual {p0}, Lj$/util/stream/d;->b()Z
|
|
|
|
move-result v0
|
|
|
|
if-eqz v0, :cond_1
|
|
|
|
.line 186
|
|
iget-object v0, p0, Lj$/util/stream/b;->h:Ljava/util/concurrent/atomic/AtomicReference;
|
|
|
|
invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
|
|
|
|
move-result-object v0
|
|
|
|
if-nez v0, :cond_0
|
|
|
|
.line 187
|
|
invoke-virtual {p0}, Lj$/util/stream/b;->h()Ljava/lang/Object;
|
|
|
|
move-result-object v0
|
|
|
|
:cond_0
|
|
return-object v0
|
|
|
|
.line 245
|
|
:cond_1
|
|
iget-object v0, p0, Lj$/util/stream/d;->f:Ljava/lang/Object;
|
|
|
|
return-object v0
|
|
.end method
|