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>
300 lines
6.3 KiB
Smali
300 lines
6.3 KiB
Smali
.class public final Lj$/util/stream/h0;
|
|
.super Lj$/util/stream/b;
|
|
.source "SourceFile"
|
|
|
|
|
|
# instance fields
|
|
.field public final j:Lj$/util/stream/b0;
|
|
|
|
.field public final k:Z
|
|
|
|
|
|
# direct methods
|
|
.method public constructor <init>(Lj$/util/stream/b0;ZLj$/util/stream/a;Lj$/util/Spliterator;)V
|
|
.locals 0
|
|
|
|
.line 289
|
|
invoke-direct {p0, p3, p4}, Lj$/util/stream/b;-><init>(Lj$/util/stream/v3;Lj$/util/Spliterator;)V
|
|
|
|
.line 290
|
|
iput-boolean p2, p0, Lj$/util/stream/h0;->k:Z
|
|
|
|
.line 291
|
|
iput-object p1, p0, Lj$/util/stream/h0;->j:Lj$/util/stream/b0;
|
|
|
|
return-void
|
|
.end method
|
|
|
|
.method public constructor <init>(Lj$/util/stream/h0;Lj$/util/Spliterator;)V
|
|
.locals 0
|
|
|
|
.line 295
|
|
invoke-direct {p0, p1, p2}, Lj$/util/stream/b;-><init>(Lj$/util/stream/b;Lj$/util/Spliterator;)V
|
|
|
|
.line 296
|
|
iget-boolean p2, p1, Lj$/util/stream/h0;->k:Z
|
|
|
|
iput-boolean p2, p0, Lj$/util/stream/h0;->k:Z
|
|
|
|
.line 297
|
|
iget-object p1, p1, Lj$/util/stream/h0;->j:Lj$/util/stream/b0;
|
|
|
|
iput-object p1, p0, Lj$/util/stream/h0;->j:Lj$/util/stream/b0;
|
|
|
|
return-void
|
|
.end method
|
|
|
|
|
|
# virtual methods
|
|
.method public final a()Ljava/lang/Object;
|
|
.locals 5
|
|
|
|
.line 319
|
|
iget-object v0, p0, Lj$/util/stream/d;->a:Lj$/util/stream/v3;
|
|
|
|
iget-object v1, p0, Lj$/util/stream/h0;->j:Lj$/util/stream/b0;
|
|
|
|
iget-object v1, v1, Lj$/util/stream/b0;->d:Ljava/util/function/Supplier;
|
|
|
|
invoke-interface {v1}, Ljava/util/function/Supplier;->get()Ljava/lang/Object;
|
|
|
|
move-result-object v1
|
|
|
|
check-cast v1, Lj$/util/stream/o8;
|
|
|
|
iget-object v2, p0, Lj$/util/stream/d;->b:Lj$/util/Spliterator;
|
|
|
|
invoke-virtual {v0, v2, v1}, Lj$/util/stream/v3;->v0(Lj$/util/Spliterator;Lj$/util/stream/n5;)Lj$/util/stream/n5;
|
|
|
|
invoke-interface {v1}, Ljava/util/function/Supplier;->get()Ljava/lang/Object;
|
|
|
|
move-result-object v0
|
|
|
|
.line 320
|
|
iget-boolean v1, p0, Lj$/util/stream/h0;->k:Z
|
|
|
|
const/4 v2, 0x0
|
|
|
|
if-nez v1, :cond_2
|
|
|
|
if-eqz v0, :cond_7
|
|
|
|
.line 152
|
|
iget-object v1, p0, Lj$/util/stream/b;->h:Ljava/util/concurrent/atomic/AtomicReference;
|
|
|
|
.line 0
|
|
:cond_0
|
|
invoke-virtual {v1, v2, v0}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
|
|
|
|
move-result v3
|
|
|
|
if-eqz v3, :cond_1
|
|
|
|
goto :goto_2
|
|
|
|
:cond_1
|
|
invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
|
|
|
|
move-result-object v3
|
|
|
|
if-eqz v3, :cond_0
|
|
|
|
goto :goto_2
|
|
|
|
:cond_2
|
|
if-eqz v0, :cond_7
|
|
|
|
move-object v1, p0
|
|
|
|
:goto_0
|
|
if-eqz v1, :cond_4
|
|
|
|
.line 286
|
|
invoke-virtual {v1}, Ljava/util/concurrent/CountedCompleter;->getCompleter()Ljava/util/concurrent/CountedCompleter;
|
|
|
|
move-result-object v3
|
|
|
|
check-cast v3, Lj$/util/stream/d;
|
|
|
|
if-eqz v3, :cond_3
|
|
|
|
.line 358
|
|
iget-object v4, v3, Lj$/util/stream/d;->d:Lj$/util/stream/d;
|
|
|
|
if-eq v4, v1, :cond_3
|
|
|
|
.line 314
|
|
invoke-virtual {p0}, Lj$/util/stream/b;->g()V
|
|
|
|
return-object v0
|
|
|
|
:cond_3
|
|
move-object v1, v3
|
|
|
|
goto :goto_0
|
|
|
|
.line 152
|
|
:cond_4
|
|
iget-object v1, p0, Lj$/util/stream/b;->h:Ljava/util/concurrent/atomic/AtomicReference;
|
|
|
|
.line 0
|
|
:cond_5
|
|
invoke-virtual {v1, v2, v0}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
|
|
|
|
move-result v3
|
|
|
|
if-eqz v3, :cond_6
|
|
|
|
goto :goto_1
|
|
|
|
:cond_6
|
|
invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
|
|
|
|
move-result-object v3
|
|
|
|
if-eqz v3, :cond_5
|
|
|
|
:goto_1
|
|
return-object v0
|
|
|
|
:cond_7
|
|
:goto_2
|
|
return-object v2
|
|
.end method
|
|
|
|
.method public final c(Lj$/util/Spliterator;)Lj$/util/stream/d;
|
|
.locals 1
|
|
|
|
.line 302
|
|
new-instance v0, Lj$/util/stream/h0;
|
|
|
|
invoke-direct {v0, p0, p1}, Lj$/util/stream/h0;-><init>(Lj$/util/stream/h0;Lj$/util/Spliterator;)V
|
|
|
|
return-object v0
|
|
.end method
|
|
|
|
.method public final h()Ljava/lang/Object;
|
|
.locals 1
|
|
|
|
.line 307
|
|
iget-object v0, p0, Lj$/util/stream/h0;->j:Lj$/util/stream/b0;
|
|
|
|
iget-object v0, v0, Lj$/util/stream/b0;->b:Ljava/lang/Object;
|
|
|
|
return-object v0
|
|
.end method
|
|
|
|
.method public final onCompletion(Ljava/util/concurrent/CountedCompleter;)V
|
|
.locals 6
|
|
|
|
.line 337
|
|
iget-boolean v0, p0, Lj$/util/stream/h0;->k:Z
|
|
|
|
if-eqz v0, :cond_5
|
|
|
|
.line 338
|
|
iget-object v0, p0, Lj$/util/stream/d;->d:Lj$/util/stream/d;
|
|
|
|
check-cast v0, Lj$/util/stream/h0;
|
|
|
|
const/4 v1, 0x0
|
|
|
|
move-object v2, v1
|
|
|
|
:goto_0
|
|
if-eq v0, v2, :cond_5
|
|
|
|
.line 340
|
|
invoke-virtual {v0}, Lj$/util/stream/b;->i()Ljava/lang/Object;
|
|
|
|
move-result-object v2
|
|
|
|
if-eqz v2, :cond_4
|
|
|
|
.line 341
|
|
iget-object v3, p0, Lj$/util/stream/h0;->j:Lj$/util/stream/b0;
|
|
|
|
iget-object v3, v3, Lj$/util/stream/b0;->c:Ljava/util/function/Predicate;
|
|
|
|
invoke-interface {v3, v2}, Ljava/util/function/Predicate;->test(Ljava/lang/Object;)Z
|
|
|
|
move-result v3
|
|
|
|
if-eqz v3, :cond_4
|
|
|
|
.line 342
|
|
invoke-virtual {p0, v2}, Lj$/util/stream/b;->d(Ljava/lang/Object;)V
|
|
|
|
move-object v0, p0
|
|
|
|
:goto_1
|
|
if-eqz v0, :cond_1
|
|
|
|
.line 286
|
|
invoke-virtual {v0}, Ljava/util/concurrent/CountedCompleter;->getCompleter()Ljava/util/concurrent/CountedCompleter;
|
|
|
|
move-result-object v3
|
|
|
|
check-cast v3, Lj$/util/stream/d;
|
|
|
|
if-eqz v3, :cond_0
|
|
|
|
.line 358
|
|
iget-object v4, v3, Lj$/util/stream/d;->d:Lj$/util/stream/d;
|
|
|
|
if-eq v4, v0, :cond_0
|
|
|
|
.line 314
|
|
invoke-virtual {p0}, Lj$/util/stream/b;->g()V
|
|
|
|
goto :goto_2
|
|
|
|
:cond_0
|
|
move-object v0, v3
|
|
|
|
goto :goto_1
|
|
|
|
.line 152
|
|
:cond_1
|
|
iget-object v3, p0, Lj$/util/stream/b;->h:Ljava/util/concurrent/atomic/AtomicReference;
|
|
|
|
.line 0
|
|
:cond_2
|
|
invoke-virtual {v3, v1, v2}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
|
|
|
|
move-result v0
|
|
|
|
if-eqz v0, :cond_3
|
|
|
|
goto :goto_2
|
|
|
|
:cond_3
|
|
invoke-virtual {v3}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
|
|
|
|
move-result-object v0
|
|
|
|
if-eqz v0, :cond_2
|
|
|
|
goto :goto_2
|
|
|
|
.line 339
|
|
:cond_4
|
|
iget-object v2, p0, Lj$/util/stream/d;->e:Lj$/util/stream/d;
|
|
|
|
check-cast v2, Lj$/util/stream/h0;
|
|
|
|
move-object v5, v2
|
|
|
|
move-object v2, v0
|
|
|
|
move-object v0, v5
|
|
|
|
goto :goto_0
|
|
|
|
.line 348
|
|
:cond_5
|
|
:goto_2
|
|
invoke-super {p0, p1}, Lj$/util/stream/d;->onCompletion(Ljava/util/concurrent/CountedCompleter;)V
|
|
|
|
return-void
|
|
.end method
|