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>
181 lines
4 KiB
Smali
181 lines
4 KiB
Smali
.class public final Lj$/util/stream/j6;
|
|
.super Lj$/util/stream/d5;
|
|
.source "SourceFile"
|
|
|
|
|
|
# instance fields
|
|
.field public final t:Z
|
|
|
|
.field public final u:Ljava/util/Comparator;
|
|
|
|
|
|
# direct methods
|
|
.method public constructor <init>(Lj$/util/stream/f5;)V
|
|
.locals 2
|
|
|
|
.line 111
|
|
sget v0, Lj$/util/stream/c7;->q:I
|
|
|
|
sget v1, Lj$/util/stream/c7;->o:I
|
|
|
|
or-int/2addr v0, v1
|
|
|
|
.line 94
|
|
invoke-direct {p0, p1, v0}, Lj$/util/stream/a;-><init>(Lj$/util/stream/a;I)V
|
|
|
|
const/4 p1, 0x1
|
|
|
|
.line 113
|
|
iput-boolean p1, p0, Lj$/util/stream/j6;->t:Z
|
|
|
|
.line 357
|
|
sget-object p1, Lj$/util/e;->INSTANCE:Lj$/util/e;
|
|
|
|
.line 117
|
|
iput-object p1, p0, Lj$/util/stream/j6;->u:Ljava/util/Comparator;
|
|
|
|
return-void
|
|
.end method
|
|
|
|
.method public constructor <init>(Lj$/util/stream/f5;Ljava/util/Comparator;)V
|
|
.locals 2
|
|
|
|
.line 126
|
|
sget v0, Lj$/util/stream/c7;->q:I
|
|
|
|
sget v1, Lj$/util/stream/c7;->p:I
|
|
|
|
or-int/2addr v0, v1
|
|
|
|
.line 94
|
|
invoke-direct {p0, p1, v0}, Lj$/util/stream/a;-><init>(Lj$/util/stream/a;I)V
|
|
|
|
const/4 p1, 0x0
|
|
|
|
.line 128
|
|
iput-boolean p1, p0, Lj$/util/stream/j6;->t:Z
|
|
|
|
.line 129
|
|
invoke-static {p2}, Lj$/util/Objects;->requireNonNull(Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
move-result-object p1
|
|
|
|
check-cast p1, Ljava/util/Comparator;
|
|
|
|
iput-object p1, p0, Lj$/util/stream/j6;->u:Ljava/util/Comparator;
|
|
|
|
return-void
|
|
.end method
|
|
|
|
|
|
# virtual methods
|
|
.method public final E0(Lj$/util/stream/v3;Lj$/util/Spliterator;Ljava/util/function/IntFunction;)Lj$/util/stream/c2;
|
|
.locals 2
|
|
|
|
.line 152
|
|
sget-object v0, Lj$/util/stream/c7;->SORTED:Lj$/util/stream/c7;
|
|
|
|
move-object v1, p1
|
|
|
|
check-cast v1, Lj$/util/stream/a;
|
|
|
|
.line 509
|
|
iget v1, v1, Lj$/util/stream/a;->m:I
|
|
|
|
.line 152
|
|
invoke-virtual {v0, v1}, Lj$/util/stream/c7;->i(I)Z
|
|
|
|
move-result v0
|
|
|
|
if-eqz v0, :cond_0
|
|
|
|
iget-boolean v0, p0, Lj$/util/stream/j6;->t:Z
|
|
|
|
if-eqz v0, :cond_0
|
|
|
|
const/4 v0, 0x0
|
|
|
|
.line 153
|
|
invoke-virtual {p1, p2, v0, p3}, Lj$/util/stream/v3;->g0(Lj$/util/Spliterator;ZLjava/util/function/IntFunction;)Lj$/util/stream/c2;
|
|
|
|
move-result-object p1
|
|
|
|
return-object p1
|
|
|
|
:cond_0
|
|
const/4 v0, 0x1
|
|
|
|
.line 157
|
|
invoke-virtual {p1, p2, v0, p3}, Lj$/util/stream/v3;->g0(Lj$/util/Spliterator;ZLjava/util/function/IntFunction;)Lj$/util/stream/c2;
|
|
|
|
move-result-object p1
|
|
|
|
invoke-interface {p1, p3}, Lj$/util/stream/c2;->m(Ljava/util/function/IntFunction;)[Ljava/lang/Object;
|
|
|
|
move-result-object p1
|
|
|
|
.line 160
|
|
iget-object p2, p0, Lj$/util/stream/j6;->u:Ljava/util/Comparator;
|
|
|
|
invoke-static {p1, p2}, Ljava/util/Arrays;->sort([Ljava/lang/Object;Ljava/util/Comparator;)V
|
|
|
|
.line 148
|
|
new-instance p2, Lj$/util/stream/f2;
|
|
|
|
invoke-direct {p2, p1}, Lj$/util/stream/f2;-><init>([Ljava/lang/Object;)V
|
|
|
|
return-object p2
|
|
.end method
|
|
|
|
.method public final H0(ILj$/util/stream/n5;)Lj$/util/stream/n5;
|
|
.locals 1
|
|
|
|
.line 134
|
|
invoke-static {p2}, Lj$/util/Objects;->requireNonNull(Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
.line 138
|
|
sget-object v0, Lj$/util/stream/c7;->SORTED:Lj$/util/stream/c7;
|
|
|
|
invoke-virtual {v0, p1}, Lj$/util/stream/c7;->i(I)Z
|
|
|
|
move-result v0
|
|
|
|
if-eqz v0, :cond_0
|
|
|
|
iget-boolean v0, p0, Lj$/util/stream/j6;->t:Z
|
|
|
|
if-eqz v0, :cond_0
|
|
|
|
return-object p2
|
|
|
|
.line 140
|
|
:cond_0
|
|
sget-object v0, Lj$/util/stream/c7;->SIZED:Lj$/util/stream/c7;
|
|
|
|
invoke-virtual {v0, p1}, Lj$/util/stream/c7;->i(I)Z
|
|
|
|
move-result p1
|
|
|
|
if-eqz p1, :cond_1
|
|
|
|
.line 141
|
|
new-instance p1, Lj$/util/stream/o6;
|
|
|
|
iget-object v0, p0, Lj$/util/stream/j6;->u:Ljava/util/Comparator;
|
|
|
|
.line 348
|
|
invoke-direct {p1, p2, v0}, Lj$/util/stream/c6;-><init>(Lj$/util/stream/n5;Ljava/util/Comparator;)V
|
|
|
|
return-object p1
|
|
|
|
.line 143
|
|
:cond_1
|
|
new-instance p1, Lj$/util/stream/k6;
|
|
|
|
iget-object v0, p0, Lj$/util/stream/j6;->u:Ljava/util/Comparator;
|
|
|
|
.line 388
|
|
invoke-direct {p1, p2, v0}, Lj$/util/stream/c6;-><init>(Lj$/util/stream/n5;Ljava/util/Comparator;)V
|
|
|
|
return-object p1
|
|
.end method
|