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>
307 lines
6.3 KiB
Smali
307 lines
6.3 KiB
Smali
.class public final Lj$/util/stream/s9;
|
|
.super Lj$/util/stream/t9;
|
|
.source "SourceFile"
|
|
|
|
# interfaces
|
|
.implements Ljava/util/function/Consumer;
|
|
|
|
|
|
# instance fields
|
|
.field public final e:Ljava/util/function/Predicate;
|
|
|
|
.field public f:Ljava/lang/Object;
|
|
|
|
.field public final synthetic g:I
|
|
|
|
|
|
# direct methods
|
|
.method public constructor <init>(Lj$/util/Spliterator;Lj$/util/stream/s9;I)V
|
|
.locals 0
|
|
|
|
iput p3, p0, Lj$/util/stream/s9;->g:I
|
|
|
|
.line 728
|
|
invoke-direct {p0, p1, p2}, Lj$/util/stream/t9;-><init>(Lj$/util/Spliterator;Lj$/util/stream/t9;)V
|
|
|
|
.line 729
|
|
iget-object p1, p2, Lj$/util/stream/s9;->e:Ljava/util/function/Predicate;
|
|
|
|
iput-object p1, p0, Lj$/util/stream/s9;->e:Ljava/util/function/Predicate;
|
|
|
|
return-void
|
|
.end method
|
|
|
|
.method public constructor <init>(Lj$/util/Spliterator;Ljava/util/function/Predicate;I)V
|
|
.locals 0
|
|
|
|
iput p3, p0, Lj$/util/stream/s9;->g:I
|
|
|
|
.line 723
|
|
invoke-direct {p0, p1}, Lj$/util/stream/t9;-><init>(Lj$/util/Spliterator;)V
|
|
|
|
.line 724
|
|
iput-object p2, p0, Lj$/util/stream/s9;->e:Ljava/util/function/Predicate;
|
|
|
|
return-void
|
|
.end method
|
|
|
|
|
|
# virtual methods
|
|
.method public final accept(Ljava/lang/Object;)V
|
|
.locals 1
|
|
|
|
.line 734
|
|
iget v0, p0, Lj$/util/stream/t9;->d:I
|
|
|
|
add-int/lit8 v0, v0, 0x1
|
|
|
|
and-int/lit8 v0, v0, 0x3f
|
|
|
|
iput v0, p0, Lj$/util/stream/t9;->d:I
|
|
|
|
.line 735
|
|
iput-object p1, p0, Lj$/util/stream/s9;->f:Ljava/lang/Object;
|
|
|
|
return-void
|
|
.end method
|
|
|
|
.method public final synthetic andThen(Ljava/util/function/Consumer;)Ljava/util/function/Consumer;
|
|
.locals 0
|
|
|
|
.line 0
|
|
invoke-static {p0, p1}, Lj$/util/function/Consumer$-CC;->$default$andThen(Ljava/util/function/Consumer;Ljava/util/function/Consumer;)Ljava/util/function/Consumer;
|
|
|
|
move-result-object p1
|
|
|
|
return-object p1
|
|
.end method
|
|
|
|
.method public final b(Lj$/util/Spliterator;)Lj$/util/Spliterator;
|
|
.locals 2
|
|
|
|
iget v0, p0, Lj$/util/stream/s9;->g:I
|
|
|
|
packed-switch v0, :pswitch_data_0
|
|
|
|
.line 776
|
|
new-instance v0, Lj$/util/stream/s9;
|
|
|
|
const/4 v1, 0x1
|
|
|
|
.line 744
|
|
invoke-direct {v0, p1, p0, v1}, Lj$/util/stream/s9;-><init>(Lj$/util/Spliterator;Lj$/util/stream/s9;I)V
|
|
|
|
return-object v0
|
|
|
|
.line 818
|
|
:pswitch_0
|
|
new-instance v0, Lj$/util/stream/s9;
|
|
|
|
const/4 v1, 0x0
|
|
|
|
.line 786
|
|
invoke-direct {v0, p1, p0, v1}, Lj$/util/stream/s9;-><init>(Lj$/util/Spliterator;Lj$/util/stream/s9;I)V
|
|
|
|
return-object v0
|
|
|
|
nop
|
|
|
|
:pswitch_data_0
|
|
.packed-switch 0x0
|
|
:pswitch_0
|
|
.end packed-switch
|
|
.end method
|
|
|
|
.method public final tryAdvance(Ljava/util/function/Consumer;)Z
|
|
.locals 6
|
|
|
|
iget v0, p0, Lj$/util/stream/s9;->g:I
|
|
|
|
packed-switch v0, :pswitch_data_0
|
|
|
|
.line 750
|
|
iget-boolean v0, p0, Lj$/util/stream/t9;->c:Z
|
|
|
|
const/4 v1, 0x1
|
|
|
|
if-eqz v0, :cond_0
|
|
|
|
.line 751
|
|
invoke-virtual {p0}, Lj$/util/stream/t9;->a()Z
|
|
|
|
move-result v0
|
|
|
|
if-eqz v0, :cond_0
|
|
|
|
iget-object v0, p0, Lj$/util/stream/t9;->a:Lj$/util/Spliterator;
|
|
|
|
.line 752
|
|
invoke-interface {v0, p0}, Lj$/util/Spliterator;->tryAdvance(Ljava/util/function/Consumer;)Z
|
|
|
|
move-result v0
|
|
|
|
if-eqz v0, :cond_0
|
|
|
|
iget-object v0, p0, Lj$/util/stream/s9;->e:Ljava/util/function/Predicate;
|
|
|
|
iget-object v2, p0, Lj$/util/stream/s9;->f:Ljava/lang/Object;
|
|
|
|
.line 753
|
|
invoke-interface {v0, v2}, Ljava/util/function/Predicate;->test(Ljava/lang/Object;)Z
|
|
|
|
move-result v0
|
|
|
|
if-eqz v0, :cond_1
|
|
|
|
.line 754
|
|
iget-object v0, p0, Lj$/util/stream/s9;->f:Ljava/lang/Object;
|
|
|
|
invoke-interface {p1, v0}, Ljava/util/function/Consumer;->accept(Ljava/lang/Object;)V
|
|
|
|
goto :goto_0
|
|
|
|
:cond_0
|
|
move v0, v1
|
|
|
|
:cond_1
|
|
const/4 p1, 0x0
|
|
|
|
.line 759
|
|
iput-boolean p1, p0, Lj$/util/stream/t9;->c:Z
|
|
|
|
if-nez v0, :cond_2
|
|
|
|
.line 763
|
|
iget-object v0, p0, Lj$/util/stream/t9;->b:Ljava/util/concurrent/atomic/AtomicBoolean;
|
|
|
|
invoke-virtual {v0, v1}, Ljava/util/concurrent/atomic/AtomicBoolean;->set(Z)V
|
|
|
|
:cond_2
|
|
move v1, p1
|
|
|
|
:goto_0
|
|
return v1
|
|
|
|
.line 791
|
|
:pswitch_0
|
|
iget-boolean v0, p0, Lj$/util/stream/t9;->c:Z
|
|
|
|
iget-object v1, p0, Lj$/util/stream/t9;->a:Lj$/util/Spliterator;
|
|
|
|
if-eqz v0, :cond_5
|
|
|
|
const/4 v0, 0x0
|
|
|
|
.line 792
|
|
iput-boolean v0, p0, Lj$/util/stream/t9;->c:Z
|
|
|
|
.line 795
|
|
:goto_1
|
|
invoke-interface {v1, p0}, Lj$/util/Spliterator;->tryAdvance(Ljava/util/function/Consumer;)Z
|
|
|
|
move-result v2
|
|
|
|
const/4 v3, 0x1
|
|
|
|
if-eqz v2, :cond_3
|
|
|
|
.line 796
|
|
invoke-virtual {p0}, Lj$/util/stream/t9;->a()Z
|
|
|
|
move-result v4
|
|
|
|
if-eqz v4, :cond_3
|
|
|
|
iget-object v4, p0, Lj$/util/stream/s9;->e:Ljava/util/function/Predicate;
|
|
|
|
iget-object v5, p0, Lj$/util/stream/s9;->f:Ljava/lang/Object;
|
|
|
|
.line 797
|
|
invoke-interface {v4, v5}, Ljava/util/function/Predicate;->test(Ljava/lang/Object;)Z
|
|
|
|
move-result v4
|
|
|
|
if-eqz v4, :cond_3
|
|
|
|
move v0, v3
|
|
|
|
goto :goto_1
|
|
|
|
:cond_3
|
|
if-eqz v2, :cond_6
|
|
|
|
if-eqz v0, :cond_4
|
|
|
|
.line 806
|
|
iget-object v0, p0, Lj$/util/stream/t9;->b:Ljava/util/concurrent/atomic/AtomicBoolean;
|
|
|
|
invoke-virtual {v0, v3}, Ljava/util/concurrent/atomic/AtomicBoolean;->set(Z)V
|
|
|
|
.line 807
|
|
:cond_4
|
|
iget-object v0, p0, Lj$/util/stream/s9;->f:Ljava/lang/Object;
|
|
|
|
invoke-interface {p1, v0}, Ljava/util/function/Consumer;->accept(Ljava/lang/Object;)V
|
|
|
|
goto :goto_2
|
|
|
|
.line 812
|
|
:cond_5
|
|
invoke-interface {v1, p1}, Lj$/util/Spliterator;->tryAdvance(Ljava/util/function/Consumer;)Z
|
|
|
|
move-result v2
|
|
|
|
:cond_6
|
|
:goto_2
|
|
return v2
|
|
|
|
nop
|
|
|
|
:pswitch_data_0
|
|
.packed-switch 0x0
|
|
:pswitch_0
|
|
.end packed-switch
|
|
.end method
|
|
|
|
.method public trySplit()Lj$/util/Spliterator;
|
|
.locals 1
|
|
|
|
iget v0, p0, Lj$/util/stream/s9;->g:I
|
|
|
|
packed-switch v0, :pswitch_data_0
|
|
|
|
invoke-super {p0}, Lj$/util/stream/t9;->trySplit()Lj$/util/Spliterator;
|
|
|
|
move-result-object v0
|
|
|
|
return-object v0
|
|
|
|
.line 771
|
|
:pswitch_0
|
|
iget-object v0, p0, Lj$/util/stream/t9;->b:Ljava/util/concurrent/atomic/AtomicBoolean;
|
|
|
|
invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicBoolean;->get()Z
|
|
|
|
move-result v0
|
|
|
|
if-eqz v0, :cond_0
|
|
|
|
const/4 v0, 0x0
|
|
|
|
goto :goto_0
|
|
|
|
:cond_0
|
|
invoke-super {p0}, Lj$/util/stream/t9;->trySplit()Lj$/util/Spliterator;
|
|
|
|
move-result-object v0
|
|
|
|
:goto_0
|
|
return-object v0
|
|
|
|
nop
|
|
|
|
:pswitch_data_0
|
|
.packed-switch 0x1
|
|
:pswitch_0
|
|
.end packed-switch
|
|
.end method
|