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>
411 lines
7.9 KiB
Smali
411 lines
7.9 KiB
Smali
.class public final Lj$/util/stream/j;
|
|
.super Lj$/util/stream/j5;
|
|
.source "SourceFile"
|
|
|
|
|
|
# instance fields
|
|
.field public final synthetic b:I
|
|
|
|
.field public c:Z
|
|
|
|
.field public d:Ljava/lang/Object;
|
|
|
|
|
|
# direct methods
|
|
.method public synthetic constructor <init>(Lj$/util/stream/n5;)V
|
|
.locals 1
|
|
|
|
const/4 v0, 0x0
|
|
|
|
iput v0, p0, Lj$/util/stream/j;->b:I
|
|
|
|
invoke-direct {p0, p1}, Lj$/util/stream/j5;-><init>(Lj$/util/stream/n5;)V
|
|
|
|
return-void
|
|
.end method
|
|
|
|
.method public constructor <init>(Lj$/util/stream/p;Lj$/util/stream/n5;)V
|
|
.locals 1
|
|
|
|
const/4 v0, 0x1
|
|
|
|
iput v0, p0, Lj$/util/stream/j;->b:I
|
|
|
|
.line 260
|
|
iput-object p1, p0, Lj$/util/stream/j;->d:Ljava/lang/Object;
|
|
|
|
invoke-direct {p0, p2}, Lj$/util/stream/j5;-><init>(Lj$/util/stream/n5;)V
|
|
|
|
return-void
|
|
.end method
|
|
|
|
.method public constructor <init>(Lj$/util/stream/q8;Lj$/util/stream/n5;)V
|
|
.locals 1
|
|
|
|
const/4 v0, 0x2
|
|
|
|
iput v0, p0, Lj$/util/stream/j;->b:I
|
|
|
|
.line 88
|
|
iput-object p1, p0, Lj$/util/stream/j;->d:Ljava/lang/Object;
|
|
|
|
invoke-direct {p0, p2}, Lj$/util/stream/j5;-><init>(Lj$/util/stream/n5;)V
|
|
|
|
const/4 p1, 0x1
|
|
|
|
.line 89
|
|
iput-boolean p1, p0, Lj$/util/stream/j;->c:Z
|
|
|
|
return-void
|
|
.end method
|
|
|
|
|
|
# virtual methods
|
|
.method public final accept(Ljava/lang/Object;)V
|
|
.locals 3
|
|
|
|
iget v0, p0, Lj$/util/stream/j;->b:I
|
|
|
|
packed-switch v0, :pswitch_data_0
|
|
|
|
.line 98
|
|
iget-boolean v0, p0, Lj$/util/stream/j;->c:Z
|
|
|
|
if-eqz v0, :cond_0
|
|
|
|
iget-object v0, p0, Lj$/util/stream/j;->d:Ljava/lang/Object;
|
|
|
|
check-cast v0, Lj$/util/stream/q8;
|
|
|
|
iget-object v0, v0, Lj$/util/stream/q8;->u:Ljava/util/function/Predicate;
|
|
|
|
invoke-interface {v0, p1}, Ljava/util/function/Predicate;->test(Ljava/lang/Object;)Z
|
|
|
|
move-result v0
|
|
|
|
iput-boolean v0, p0, Lj$/util/stream/j;->c:Z
|
|
|
|
if-eqz v0, :cond_0
|
|
|
|
.line 99
|
|
iget-object v0, p0, Lj$/util/stream/j5;->a:Lj$/util/stream/n5;
|
|
|
|
invoke-interface {v0, p1}, Ljava/util/function/Consumer;->accept(Ljava/lang/Object;)V
|
|
|
|
:cond_0
|
|
return-void
|
|
|
|
.line 271
|
|
:pswitch_0
|
|
iget-object v0, p0, Lj$/util/stream/j;->d:Ljava/lang/Object;
|
|
|
|
check-cast v0, Lj$/util/stream/p;
|
|
|
|
iget-object v0, v0, Lj$/util/stream/p;->u:Ljava/lang/Object;
|
|
|
|
check-cast v0, Lj$/util/p;
|
|
|
|
invoke-interface {v0, p1}, Ljava/util/function/Function;->apply(Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
move-result-object p1
|
|
|
|
check-cast p1, Lj$/util/stream/Stream;
|
|
|
|
if-eqz p1, :cond_3
|
|
|
|
.line 273
|
|
:try_start_0
|
|
iget-boolean v0, p0, Lj$/util/stream/j;->c:Z
|
|
:try_end_0
|
|
.catchall {:try_start_0 .. :try_end_0} :catchall_0
|
|
|
|
iget-object v1, p0, Lj$/util/stream/j5;->a:Lj$/util/stream/n5;
|
|
|
|
if-nez v0, :cond_1
|
|
|
|
.line 274
|
|
:try_start_1
|
|
invoke-interface {p1}, Lj$/util/stream/BaseStream;->sequential()Lj$/util/stream/BaseStream;
|
|
|
|
move-result-object v0
|
|
|
|
check-cast v0, Lj$/util/stream/Stream;
|
|
|
|
invoke-interface {v0, v1}, Lj$/util/stream/Stream;->forEach(Ljava/util/function/Consumer;)V
|
|
|
|
goto :goto_2
|
|
|
|
:catchall_0
|
|
move-exception v0
|
|
|
|
goto :goto_0
|
|
|
|
.line 277
|
|
:cond_1
|
|
invoke-interface {p1}, Lj$/util/stream/BaseStream;->sequential()Lj$/util/stream/BaseStream;
|
|
|
|
move-result-object v0
|
|
|
|
check-cast v0, Lj$/util/stream/Stream;
|
|
|
|
invoke-interface {v0}, Lj$/util/stream/BaseStream;->spliterator()Lj$/util/Spliterator;
|
|
|
|
move-result-object v0
|
|
|
|
.line 278
|
|
:cond_2
|
|
invoke-interface {v1}, Lj$/util/stream/n5;->e()Z
|
|
|
|
move-result v2
|
|
|
|
if-nez v2, :cond_3
|
|
|
|
invoke-interface {v0, v1}, Lj$/util/Spliterator;->tryAdvance(Ljava/util/function/Consumer;)Z
|
|
|
|
move-result v2
|
|
:try_end_1
|
|
.catchall {:try_start_1 .. :try_end_1} :catchall_0
|
|
|
|
if-nez v2, :cond_2
|
|
|
|
goto :goto_2
|
|
|
|
.line 271
|
|
:goto_0
|
|
:try_start_2
|
|
invoke-interface {p1}, Ljava/lang/AutoCloseable;->close()V
|
|
:try_end_2
|
|
.catchall {:try_start_2 .. :try_end_2} :catchall_1
|
|
|
|
goto :goto_1
|
|
|
|
:catchall_1
|
|
move-exception p1
|
|
|
|
invoke-virtual {v0, p1}, Ljava/lang/Throwable;->addSuppressed(Ljava/lang/Throwable;)V
|
|
|
|
:goto_1
|
|
throw v0
|
|
|
|
:cond_3
|
|
:goto_2
|
|
if-eqz p1, :cond_4
|
|
|
|
.line 281
|
|
invoke-interface {p1}, Ljava/lang/AutoCloseable;->close()V
|
|
|
|
:cond_4
|
|
return-void
|
|
|
|
.line 147
|
|
:pswitch_1
|
|
iget-object v0, p0, Lj$/util/stream/j5;->a:Lj$/util/stream/n5;
|
|
|
|
if-nez p1, :cond_5
|
|
|
|
.line 148
|
|
iget-boolean p1, p0, Lj$/util/stream/j;->c:Z
|
|
|
|
if-nez p1, :cond_7
|
|
|
|
const/4 p1, 0x1
|
|
|
|
.line 149
|
|
iput-boolean p1, p0, Lj$/util/stream/j;->c:Z
|
|
|
|
const/4 p1, 0x0
|
|
|
|
.line 150
|
|
iput-object p1, p0, Lj$/util/stream/j;->d:Ljava/lang/Object;
|
|
|
|
invoke-interface {v0, p1}, Ljava/util/function/Consumer;->accept(Ljava/lang/Object;)V
|
|
|
|
goto :goto_3
|
|
|
|
.line 152
|
|
:cond_5
|
|
iget-object v1, p0, Lj$/util/stream/j;->d:Ljava/lang/Object;
|
|
|
|
if-eqz v1, :cond_6
|
|
|
|
invoke-virtual {p1, v1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
|
|
|
|
move-result v1
|
|
|
|
if-nez v1, :cond_7
|
|
|
|
.line 153
|
|
:cond_6
|
|
iput-object p1, p0, Lj$/util/stream/j;->d:Ljava/lang/Object;
|
|
|
|
invoke-interface {v0, p1}, Ljava/util/function/Consumer;->accept(Ljava/lang/Object;)V
|
|
|
|
:cond_7
|
|
:goto_3
|
|
return-void
|
|
|
|
nop
|
|
|
|
:pswitch_data_0
|
|
.packed-switch 0x0
|
|
:pswitch_1
|
|
:pswitch_0
|
|
.end packed-switch
|
|
.end method
|
|
|
|
.method public final c(J)V
|
|
.locals 2
|
|
|
|
iget p1, p0, Lj$/util/stream/j;->b:I
|
|
|
|
packed-switch p1, :pswitch_data_0
|
|
|
|
.line 93
|
|
iget-object p1, p0, Lj$/util/stream/j5;->a:Lj$/util/stream/n5;
|
|
|
|
const-wide/16 v0, -0x1
|
|
|
|
invoke-interface {p1, v0, v1}, Lj$/util/stream/n5;->c(J)V
|
|
|
|
return-void
|
|
|
|
.line 266
|
|
:pswitch_0
|
|
iget-object p1, p0, Lj$/util/stream/j5;->a:Lj$/util/stream/n5;
|
|
|
|
const-wide/16 v0, -0x1
|
|
|
|
invoke-interface {p1, v0, v1}, Lj$/util/stream/n5;->c(J)V
|
|
|
|
return-void
|
|
|
|
:pswitch_1
|
|
const/4 p1, 0x0
|
|
|
|
.line 133
|
|
iput-boolean p1, p0, Lj$/util/stream/j;->c:Z
|
|
|
|
const/4 p1, 0x0
|
|
|
|
.line 134
|
|
iput-object p1, p0, Lj$/util/stream/j;->d:Ljava/lang/Object;
|
|
|
|
.line 135
|
|
iget-object p1, p0, Lj$/util/stream/j5;->a:Lj$/util/stream/n5;
|
|
|
|
const-wide/16 v0, -0x1
|
|
|
|
invoke-interface {p1, v0, v1}, Lj$/util/stream/n5;->c(J)V
|
|
|
|
return-void
|
|
|
|
nop
|
|
|
|
:pswitch_data_0
|
|
.packed-switch 0x0
|
|
:pswitch_1
|
|
:pswitch_0
|
|
.end packed-switch
|
|
.end method
|
|
|
|
.method public e()Z
|
|
.locals 1
|
|
|
|
iget v0, p0, Lj$/util/stream/j;->b:I
|
|
|
|
packed-switch v0, :pswitch_data_0
|
|
|
|
invoke-super {p0}, Lj$/util/stream/j5;->e()Z
|
|
|
|
move-result v0
|
|
|
|
return v0
|
|
|
|
.line 105
|
|
:pswitch_0
|
|
iget-boolean v0, p0, Lj$/util/stream/j;->c:Z
|
|
|
|
if-eqz v0, :cond_1
|
|
|
|
iget-object v0, p0, Lj$/util/stream/j5;->a:Lj$/util/stream/n5;
|
|
|
|
invoke-interface {v0}, Lj$/util/stream/n5;->e()Z
|
|
|
|
move-result v0
|
|
|
|
if-eqz v0, :cond_0
|
|
|
|
goto :goto_0
|
|
|
|
:cond_0
|
|
const/4 v0, 0x0
|
|
|
|
goto :goto_1
|
|
|
|
:cond_1
|
|
:goto_0
|
|
const/4 v0, 0x1
|
|
|
|
:goto_1
|
|
return v0
|
|
|
|
:pswitch_1
|
|
const/4 v0, 0x1
|
|
|
|
.line 290
|
|
iput-boolean v0, p0, Lj$/util/stream/j;->c:Z
|
|
|
|
.line 291
|
|
iget-object v0, p0, Lj$/util/stream/j5;->a:Lj$/util/stream/n5;
|
|
|
|
invoke-interface {v0}, Lj$/util/stream/n5;->e()Z
|
|
|
|
move-result v0
|
|
|
|
return v0
|
|
|
|
nop
|
|
|
|
:pswitch_data_0
|
|
.packed-switch 0x1
|
|
:pswitch_1
|
|
:pswitch_0
|
|
.end packed-switch
|
|
.end method
|
|
|
|
.method public end()V
|
|
.locals 1
|
|
|
|
iget v0, p0, Lj$/util/stream/j;->b:I
|
|
|
|
packed-switch v0, :pswitch_data_0
|
|
|
|
invoke-super {p0}, Lj$/util/stream/j5;->end()V
|
|
|
|
return-void
|
|
|
|
:pswitch_0
|
|
const/4 v0, 0x0
|
|
|
|
.line 140
|
|
iput-boolean v0, p0, Lj$/util/stream/j;->c:Z
|
|
|
|
const/4 v0, 0x0
|
|
|
|
.line 141
|
|
iput-object v0, p0, Lj$/util/stream/j;->d:Ljava/lang/Object;
|
|
|
|
.line 142
|
|
iget-object v0, p0, Lj$/util/stream/j5;->a:Lj$/util/stream/n5;
|
|
|
|
invoke-interface {v0}, Lj$/util/stream/n5;->end()V
|
|
|
|
return-void
|
|
|
|
nop
|
|
|
|
:pswitch_data_0
|
|
.packed-switch 0x0
|
|
:pswitch_0
|
|
.end packed-switch
|
|
.end method
|