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>
355 lines
7.1 KiB
Smali
355 lines
7.1 KiB
Smali
.class public final Lj$/util/stream/r5;
|
|
.super Lj$/util/stream/v0;
|
|
.source "SourceFile"
|
|
|
|
|
|
# instance fields
|
|
.field public final synthetic t:J
|
|
|
|
.field public final synthetic u:J
|
|
|
|
|
|
# direct methods
|
|
.method public constructor <init>(Lj$/util/stream/x0;IJJ)V
|
|
.locals 0
|
|
|
|
.line 231
|
|
iput-wide p3, p0, Lj$/util/stream/r5;->t:J
|
|
|
|
iput-wide p5, p0, Lj$/util/stream/r5;->u:J
|
|
|
|
.line 91
|
|
invoke-direct {p0, p1, p2}, Lj$/util/stream/a;-><init>(Lj$/util/stream/a;I)V
|
|
|
|
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 12
|
|
|
|
.line 267
|
|
invoke-virtual {p1, p2}, Lj$/util/stream/v3;->h0(Lj$/util/Spliterator;)J
|
|
|
|
move-result-wide v0
|
|
|
|
const-wide/16 v2, 0x0
|
|
|
|
cmp-long v4, v0, v2
|
|
|
|
const/4 v5, 0x1
|
|
|
|
if-lez v4, :cond_1
|
|
|
|
const/16 v4, 0x4000
|
|
|
|
.line 268
|
|
invoke-interface {p2, v4}, Lj$/util/Spliterator;->hasCharacteristics(I)Z
|
|
|
|
move-result v4
|
|
|
|
if-eqz v4, :cond_1
|
|
|
|
.line 274
|
|
move-object p3, p1
|
|
|
|
check-cast p3, Lj$/util/stream/a;
|
|
|
|
.line 461
|
|
:goto_0
|
|
iget v0, p3, Lj$/util/stream/a;->l:I
|
|
|
|
if-lez v0, :cond_0
|
|
|
|
.line 462
|
|
iget-object p3, p3, Lj$/util/stream/a;->i:Lj$/util/stream/a;
|
|
|
|
goto :goto_0
|
|
|
|
.line 464
|
|
:cond_0
|
|
invoke-virtual {p3}, Lj$/util/stream/a;->C0()Lj$/util/stream/d7;
|
|
|
|
move-result-object v6
|
|
|
|
.line 274
|
|
iget-wide v8, p0, Lj$/util/stream/r5;->t:J
|
|
|
|
iget-wide v10, p0, Lj$/util/stream/r5;->u:J
|
|
|
|
move-object v7, p2
|
|
|
|
invoke-static/range {v6 .. v11}, Lj$/util/stream/y5;->b(Lj$/util/stream/d7;Lj$/util/Spliterator;JJ)Lj$/util/Spliterator;
|
|
|
|
move-result-object p2
|
|
|
|
.line 275
|
|
invoke-static {p1, p2, v5}, Lj$/util/stream/v3;->Z(Lj$/util/stream/v3;Lj$/util/Spliterator;Z)Lj$/util/stream/y1;
|
|
|
|
move-result-object p1
|
|
|
|
return-object p1
|
|
|
|
:cond_1
|
|
move-object v7, p2
|
|
|
|
.line 276
|
|
sget-object p2, Lj$/util/stream/c7;->ORDERED:Lj$/util/stream/c7;
|
|
|
|
move-object v4, p1
|
|
|
|
check-cast v4, Lj$/util/stream/a;
|
|
|
|
.line 509
|
|
iget v4, v4, Lj$/util/stream/a;->m:I
|
|
|
|
.line 276
|
|
invoke-virtual {p2, v4}, Lj$/util/stream/c7;->i(I)Z
|
|
|
|
move-result p2
|
|
|
|
if-nez p2, :cond_4
|
|
|
|
.line 278
|
|
invoke-virtual {p1, v7}, Lj$/util/stream/v3;->x0(Lj$/util/Spliterator;)Lj$/util/Spliterator;
|
|
|
|
move-result-object p1
|
|
|
|
move-object v7, p1
|
|
|
|
check-cast v7, Lj$/util/Spliterator$OfInt;
|
|
|
|
iget-wide p1, p0, Lj$/util/stream/r5;->t:J
|
|
|
|
iget-wide v8, p0, Lj$/util/stream/r5;->u:J
|
|
|
|
cmp-long p3, p1, v0
|
|
|
|
if-gtz p3, :cond_3
|
|
|
|
cmp-long p3, v8, v2
|
|
|
|
sub-long/2addr v0, p1
|
|
|
|
if-ltz p3, :cond_2
|
|
|
|
.line 237
|
|
invoke-static {v8, v9, v0, v1}, Ljava/lang/Math;->min(JJ)J
|
|
|
|
move-result-wide p1
|
|
|
|
move-wide v8, p1
|
|
|
|
goto :goto_1
|
|
|
|
:cond_2
|
|
move-wide v8, v0
|
|
|
|
:goto_1
|
|
move-wide v10, v8
|
|
|
|
move-wide v8, v2
|
|
|
|
goto :goto_2
|
|
|
|
:cond_3
|
|
move-wide v10, v8
|
|
|
|
move-wide v8, p1
|
|
|
|
.line 240
|
|
:goto_2
|
|
new-instance v6, Lj$/util/stream/e8;
|
|
|
|
.line 1077
|
|
invoke-direct/range {v6 .. v11}, Lj$/util/stream/j8;-><init>(Lj$/util/Spliterator;JJ)V
|
|
|
|
.line 284
|
|
invoke-static {p0, v6, v5}, Lj$/util/stream/v3;->Z(Lj$/util/stream/v3;Lj$/util/Spliterator;Z)Lj$/util/stream/y1;
|
|
|
|
move-result-object p1
|
|
|
|
return-object p1
|
|
|
|
.line 287
|
|
:cond_4
|
|
new-instance v0, Lj$/util/stream/x5;
|
|
|
|
iget-wide v5, p0, Lj$/util/stream/r5;->t:J
|
|
|
|
move-object v3, v7
|
|
|
|
iget-wide v7, p0, Lj$/util/stream/r5;->u:J
|
|
|
|
move-object v1, p0
|
|
|
|
move-object v2, p1
|
|
|
|
move-object v4, p3
|
|
|
|
invoke-direct/range {v0 .. v8}, Lj$/util/stream/x5;-><init>(Lj$/util/stream/a;Lj$/util/stream/v3;Lj$/util/Spliterator;Ljava/util/function/IntFunction;JJ)V
|
|
|
|
.line 288
|
|
invoke-virtual {v0}, Ljava/util/concurrent/CountedCompleter;->invoke()Ljava/lang/Object;
|
|
|
|
move-result-object p1
|
|
|
|
check-cast p1, Lj$/util/stream/c2;
|
|
|
|
return-object p1
|
|
.end method
|
|
|
|
.method public final F0(Lj$/util/stream/a;Lj$/util/Spliterator;)Lj$/util/Spliterator;
|
|
.locals 12
|
|
|
|
.line 246
|
|
invoke-virtual/range {p1 .. p2}, Lj$/util/stream/a;->h0(Lj$/util/Spliterator;)J
|
|
|
|
move-result-wide v2
|
|
|
|
const-wide/16 v4, 0x0
|
|
|
|
cmp-long v0, v2, v4
|
|
|
|
if-lez v0, :cond_0
|
|
|
|
const/16 v0, 0x4000
|
|
|
|
.line 247
|
|
invoke-interface {p2, v0}, Lj$/util/Spliterator;->hasCharacteristics(I)Z
|
|
|
|
move-result v0
|
|
|
|
if-eqz v0, :cond_0
|
|
|
|
.line 248
|
|
new-instance v6, Lj$/util/stream/y7;
|
|
|
|
.line 249
|
|
invoke-virtual/range {p1 .. p2}, Lj$/util/stream/a;->x0(Lj$/util/Spliterator;)Lj$/util/Spliterator;
|
|
|
|
move-result-object v0
|
|
|
|
move-object v7, v0
|
|
|
|
check-cast v7, Lj$/util/Spliterator$OfInt;
|
|
|
|
iget-wide v8, p0, Lj$/util/stream/r5;->t:J
|
|
|
|
iget-wide v2, p0, Lj$/util/stream/r5;->u:J
|
|
|
|
.line 0
|
|
invoke-static {v8, v9, v2, v3}, Lj$/util/stream/y5;->c(JJ)J
|
|
|
|
move-result-wide v10
|
|
|
|
.line 823
|
|
invoke-direct/range {v6 .. v11}, Lj$/util/stream/a8;-><init>(Lj$/util/Spliterator$OfPrimitive;JJ)V
|
|
|
|
return-object v6
|
|
|
|
.line 252
|
|
:cond_0
|
|
sget-object v0, Lj$/util/stream/c7;->ORDERED:Lj$/util/stream/c7;
|
|
|
|
.line 509
|
|
iget v7, p1, Lj$/util/stream/a;->m:I
|
|
|
|
.line 252
|
|
invoke-virtual {v0, v7}, Lj$/util/stream/c7;->i(I)Z
|
|
|
|
move-result v0
|
|
|
|
if-nez v0, :cond_3
|
|
|
|
.line 254
|
|
invoke-virtual/range {p1 .. p2}, Lj$/util/stream/a;->x0(Lj$/util/Spliterator;)Lj$/util/Spliterator;
|
|
|
|
move-result-object v0
|
|
|
|
move-object v7, v0
|
|
|
|
check-cast v7, Lj$/util/Spliterator$OfInt;
|
|
|
|
iget-wide v8, p0, Lj$/util/stream/r5;->t:J
|
|
|
|
iget-wide v10, p0, Lj$/util/stream/r5;->u:J
|
|
|
|
cmp-long v0, v8, v2
|
|
|
|
if-gtz v0, :cond_2
|
|
|
|
cmp-long v0, v10, v4
|
|
|
|
sub-long/2addr v2, v8
|
|
|
|
if-ltz v0, :cond_1
|
|
|
|
.line 237
|
|
invoke-static {v10, v11, v2, v3}, Ljava/lang/Math;->min(JJ)J
|
|
|
|
move-result-wide v2
|
|
|
|
:cond_1
|
|
move-wide v10, v2
|
|
|
|
move-wide v8, v4
|
|
|
|
.line 240
|
|
:cond_2
|
|
new-instance v6, Lj$/util/stream/e8;
|
|
|
|
.line 1077
|
|
invoke-direct/range {v6 .. v11}, Lj$/util/stream/j8;-><init>(Lj$/util/Spliterator;JJ)V
|
|
|
|
return-object v6
|
|
|
|
.line 258
|
|
:cond_3
|
|
new-instance v0, Lj$/util/stream/x5;
|
|
|
|
new-instance v4, Lj$/util/stream/y0;
|
|
|
|
const/16 v2, 0x14
|
|
|
|
.line 0
|
|
invoke-direct {v4, v2}, Lj$/util/stream/y0;-><init>(I)V
|
|
|
|
.line 258
|
|
iget-wide v5, p0, Lj$/util/stream/r5;->t:J
|
|
|
|
iget-wide v7, p0, Lj$/util/stream/r5;->u:J
|
|
|
|
move-object v1, p0
|
|
|
|
move-object v2, p1
|
|
|
|
move-object v3, p2
|
|
|
|
invoke-direct/range {v0 .. v8}, Lj$/util/stream/x5;-><init>(Lj$/util/stream/a;Lj$/util/stream/v3;Lj$/util/Spliterator;Ljava/util/function/IntFunction;JJ)V
|
|
|
|
.line 259
|
|
invoke-virtual {v0}, Ljava/util/concurrent/CountedCompleter;->invoke()Ljava/lang/Object;
|
|
|
|
move-result-object v0
|
|
|
|
check-cast v0, Lj$/util/stream/c2;
|
|
|
|
invoke-interface {v0}, Lj$/util/stream/c2;->spliterator()Lj$/util/Spliterator;
|
|
|
|
move-result-object v0
|
|
|
|
return-object v0
|
|
.end method
|
|
|
|
.method public final H0(ILj$/util/stream/n5;)Lj$/util/stream/n5;
|
|
.locals 0
|
|
|
|
.line 294
|
|
new-instance p1, Lj$/util/stream/q5;
|
|
|
|
invoke-direct {p1, p0, p2}, Lj$/util/stream/q5;-><init>(Lj$/util/stream/r5;Lj$/util/stream/n5;)V
|
|
|
|
return-object p1
|
|
.end method
|