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>
290 lines
6.7 KiB
Smali
290 lines
6.7 KiB
Smali
.class public final Lj$/util/stream/l;
|
|
.super Lj$/util/stream/d5;
|
|
.source "SourceFile"
|
|
|
|
|
|
# direct methods
|
|
.method public static L0(Lj$/util/stream/v3;Lj$/util/Spliterator;)Lj$/util/stream/g2;
|
|
.locals 6
|
|
|
|
.line 62
|
|
new-instance v4, Lj$/time/h;
|
|
|
|
const/16 v0, 0x17
|
|
|
|
.line 0
|
|
invoke-direct {v4, v0}, Lj$/time/h;-><init>(I)V
|
|
|
|
.line 62
|
|
new-instance v3, Lj$/time/h;
|
|
|
|
const/16 v0, 0x18
|
|
|
|
.line 0
|
|
invoke-direct {v3, v0}, Lj$/time/h;-><init>(I)V
|
|
|
|
.line 62
|
|
new-instance v2, Lj$/time/h;
|
|
|
|
const/16 v0, 0x19
|
|
|
|
.line 0
|
|
invoke-direct {v2, v0}, Lj$/time/h;-><init>(I)V
|
|
|
|
.line 208
|
|
invoke-static {v4}, Lj$/util/Objects;->requireNonNull(Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
.line 209
|
|
invoke-static {v3}, Lj$/util/Objects;->requireNonNull(Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
.line 210
|
|
invoke-static {v2}, Lj$/util/Objects;->requireNonNull(Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
.line 228
|
|
new-instance v0, Lj$/util/stream/a4;
|
|
|
|
sget-object v1, Lj$/util/stream/d7;->REFERENCE:Lj$/util/stream/d7;
|
|
|
|
const/4 v5, 0x3
|
|
|
|
invoke-direct/range {v0 .. v5}, Lj$/util/stream/a4;-><init>(Lj$/util/stream/d7;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;I)V
|
|
|
|
.line 65
|
|
invoke-virtual {v0, p0, p1}, Lj$/util/stream/v3;->i(Lj$/util/stream/v3;Lj$/util/Spliterator;)Ljava/lang/Object;
|
|
|
|
move-result-object p0
|
|
|
|
check-cast p0, Ljava/util/Collection;
|
|
|
|
.line 161
|
|
new-instance p1, Lj$/util/stream/g2;
|
|
|
|
invoke-direct {p1, p0}, Lj$/util/stream/g2;-><init>(Ljava/util/Collection;)V
|
|
|
|
return-object p1
|
|
.end method
|
|
|
|
|
|
# virtual methods
|
|
.method public final E0(Lj$/util/stream/v3;Lj$/util/Spliterator;Ljava/util/function/IntFunction;)Lj$/util/stream/c2;
|
|
.locals 4
|
|
|
|
.line 72
|
|
sget-object v0, Lj$/util/stream/c7;->DISTINCT:Lj$/util/stream/c7;
|
|
|
|
move-object v1, p1
|
|
|
|
check-cast v1, Lj$/util/stream/a;
|
|
|
|
.line 509
|
|
iget v2, v1, Lj$/util/stream/a;->m:I
|
|
|
|
.line 72
|
|
invoke-virtual {v0, v2}, Lj$/util/stream/c7;->i(I)Z
|
|
|
|
move-result v0
|
|
|
|
const/4 v2, 0x0
|
|
|
|
if-eqz v0, :cond_0
|
|
|
|
.line 74
|
|
invoke-virtual {p1, p2, v2, p3}, Lj$/util/stream/v3;->g0(Lj$/util/Spliterator;ZLjava/util/function/IntFunction;)Lj$/util/stream/c2;
|
|
|
|
move-result-object p1
|
|
|
|
return-object p1
|
|
|
|
.line 76
|
|
:cond_0
|
|
sget-object p3, Lj$/util/stream/c7;->ORDERED:Lj$/util/stream/c7;
|
|
|
|
.line 509
|
|
iget v0, v1, Lj$/util/stream/a;->m:I
|
|
|
|
.line 76
|
|
invoke-virtual {p3, v0}, Lj$/util/stream/c7;->i(I)Z
|
|
|
|
move-result p3
|
|
|
|
if-eqz p3, :cond_1
|
|
|
|
.line 77
|
|
invoke-static {p1, p2}, Lj$/util/stream/l;->L0(Lj$/util/stream/v3;Lj$/util/Spliterator;)Lj$/util/stream/g2;
|
|
|
|
move-result-object p1
|
|
|
|
return-object p1
|
|
|
|
.line 81
|
|
:cond_1
|
|
new-instance p3, Ljava/util/concurrent/atomic/AtomicBoolean;
|
|
|
|
invoke-direct {p3, v2}, Ljava/util/concurrent/atomic/AtomicBoolean;-><init>(Z)V
|
|
|
|
.line 82
|
|
new-instance v0, Lj$/util/concurrent/ConcurrentHashMap;
|
|
|
|
invoke-direct {v0}, Lj$/util/concurrent/ConcurrentHashMap;-><init>()V
|
|
|
|
.line 83
|
|
new-instance v1, Lj$/util/concurrent/t;
|
|
|
|
const/4 v3, 0x4
|
|
|
|
invoke-direct {v1, v3, p3, v0}, Lj$/util/concurrent/t;-><init>(ILjava/lang/Object;Ljava/lang/Object;)V
|
|
|
|
.line 71
|
|
invoke-static {v1}, Lj$/util/Objects;->requireNonNull(Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
.line 72
|
|
new-instance v3, Lj$/util/stream/m0;
|
|
|
|
invoke-direct {v3, v1, v2}, Lj$/util/stream/m0;-><init>(Ljava/util/function/Consumer;Z)V
|
|
|
|
.line 173
|
|
invoke-virtual {v3, p1, p2}, Lj$/util/stream/n0;->a(Lj$/util/stream/v3;Lj$/util/Spliterator;)V
|
|
|
|
.line 94
|
|
invoke-interface {v0}, Ljava/util/Map;->keySet()Ljava/util/Set;
|
|
|
|
move-result-object p1
|
|
|
|
.line 95
|
|
invoke-virtual {p3}, Ljava/util/concurrent/atomic/AtomicBoolean;->get()Z
|
|
|
|
move-result p2
|
|
|
|
if-eqz p2, :cond_2
|
|
|
|
.line 97
|
|
new-instance p2, Ljava/util/HashSet;
|
|
|
|
invoke-direct {p2, p1}, Ljava/util/HashSet;-><init>(Ljava/util/Collection;)V
|
|
|
|
const/4 p1, 0x0
|
|
|
|
.line 98
|
|
invoke-virtual {p2, p1}, Ljava/util/HashSet;->add(Ljava/lang/Object;)Z
|
|
|
|
move-object p1, p2
|
|
|
|
.line 161
|
|
:cond_2
|
|
new-instance p2, Lj$/util/stream/g2;
|
|
|
|
invoke-direct {p2, p1}, Lj$/util/stream/g2;-><init>(Ljava/util/Collection;)V
|
|
|
|
return-object p2
|
|
.end method
|
|
|
|
.method public final F0(Lj$/util/stream/a;Lj$/util/Spliterator;)Lj$/util/Spliterator;
|
|
.locals 2
|
|
|
|
.line 106
|
|
sget-object v0, Lj$/util/stream/c7;->DISTINCT:Lj$/util/stream/c7;
|
|
|
|
.line 509
|
|
iget v1, p1, Lj$/util/stream/a;->m:I
|
|
|
|
.line 106
|
|
invoke-virtual {v0, v1}, Lj$/util/stream/c7;->i(I)Z
|
|
|
|
move-result v0
|
|
|
|
if-eqz v0, :cond_0
|
|
|
|
.line 108
|
|
invoke-virtual {p1, p2}, Lj$/util/stream/a;->x0(Lj$/util/Spliterator;)Lj$/util/Spliterator;
|
|
|
|
move-result-object p1
|
|
|
|
return-object p1
|
|
|
|
.line 110
|
|
:cond_0
|
|
sget-object v0, Lj$/util/stream/c7;->ORDERED:Lj$/util/stream/c7;
|
|
|
|
.line 509
|
|
iget v1, p1, Lj$/util/stream/a;->m:I
|
|
|
|
.line 110
|
|
invoke-virtual {v0, v1}, Lj$/util/stream/c7;->i(I)Z
|
|
|
|
move-result v0
|
|
|
|
if-eqz v0, :cond_1
|
|
|
|
.line 112
|
|
invoke-static {p1, p2}, Lj$/util/stream/l;->L0(Lj$/util/stream/v3;Lj$/util/Spliterator;)Lj$/util/stream/g2;
|
|
|
|
move-result-object p1
|
|
|
|
invoke-virtual {p1}, Lj$/util/stream/g2;->spliterator()Lj$/util/Spliterator;
|
|
|
|
move-result-object p1
|
|
|
|
return-object p1
|
|
|
|
.line 116
|
|
:cond_1
|
|
new-instance v0, Lj$/util/stream/q7;
|
|
|
|
invoke-virtual {p1, p2}, Lj$/util/stream/a;->x0(Lj$/util/Spliterator;)Lj$/util/Spliterator;
|
|
|
|
move-result-object p1
|
|
|
|
.line 1260
|
|
new-instance p2, Lj$/util/concurrent/ConcurrentHashMap;
|
|
|
|
invoke-direct {p2}, Lj$/util/concurrent/ConcurrentHashMap;-><init>()V
|
|
|
|
invoke-direct {v0, p1, p2}, Lj$/util/stream/q7;-><init>(Lj$/util/Spliterator;Lj$/util/concurrent/ConcurrentHashMap;)V
|
|
|
|
return-object v0
|
|
.end method
|
|
|
|
.method public final H0(ILj$/util/stream/n5;)Lj$/util/stream/n5;
|
|
.locals 1
|
|
|
|
.line 122
|
|
invoke-static {p2}, Lj$/util/Objects;->requireNonNull(Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
.line 124
|
|
sget-object v0, Lj$/util/stream/c7;->DISTINCT:Lj$/util/stream/c7;
|
|
|
|
invoke-virtual {v0, p1}, Lj$/util/stream/c7;->i(I)Z
|
|
|
|
move-result v0
|
|
|
|
if-eqz v0, :cond_0
|
|
|
|
return-object p2
|
|
|
|
.line 126
|
|
:cond_0
|
|
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 p1
|
|
|
|
if-eqz p1, :cond_1
|
|
|
|
.line 127
|
|
new-instance p1, Lj$/util/stream/j;
|
|
|
|
.line 127
|
|
invoke-direct {p1, p2}, Lj$/util/stream/j;-><init>(Lj$/util/stream/n5;)V
|
|
|
|
return-object p1
|
|
|
|
.line 158
|
|
:cond_1
|
|
new-instance p1, Lj$/util/stream/k;
|
|
|
|
.line 158
|
|
invoke-direct {p1, p2}, Lj$/util/stream/k;-><init>(Lj$/util/stream/n5;)V
|
|
|
|
return-object p1
|
|
.end method
|