* 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>
266 lines
5.9 KiB
Smali
266 lines
5.9 KiB
Smali
.class public final Lj$/util/stream/w7;
|
|
.super Lj$/util/stream/e7;
|
|
.source "SourceFile"
|
|
|
|
# interfaces
|
|
.implements Lj$/util/Spliterator$OfLong;
|
|
|
|
|
|
# virtual methods
|
|
.method public final d()V
|
|
.locals 3
|
|
|
|
.line 402
|
|
new-instance v0, Lj$/util/stream/v6;
|
|
|
|
.line 865
|
|
invoke-direct {v0}, Lj$/util/stream/x6;-><init>()V
|
|
|
|
.line 403
|
|
iput-object v0, p0, Lj$/util/stream/e7;->h:Lj$/util/stream/c;
|
|
|
|
.line 404
|
|
invoke-static {v0}, Lj$/util/Objects;->requireNonNull(Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
new-instance v1, Lj$/util/stream/v7;
|
|
|
|
const/4 v2, 0x1
|
|
|
|
invoke-direct {v1, v0, v2}, Lj$/util/stream/v7;-><init>(Ljava/util/function/LongConsumer;I)V
|
|
|
|
iget-object v0, p0, Lj$/util/stream/e7;->b:Lj$/util/stream/a;
|
|
|
|
invoke-virtual {v0, v1}, Lj$/util/stream/a;->w0(Lj$/util/stream/n5;)Lj$/util/stream/n5;
|
|
|
|
move-result-object v0
|
|
|
|
iput-object v0, p0, Lj$/util/stream/e7;->e:Lj$/util/stream/n5;
|
|
|
|
.line 405
|
|
new-instance v0, Lj$/util/p;
|
|
|
|
const/16 v1, 0xc
|
|
|
|
invoke-direct {v0, v1, p0}, Lj$/util/p;-><init>(ILjava/lang/Object;)V
|
|
|
|
iput-object v0, p0, Lj$/util/stream/e7;->f:Ljava/util/function/BooleanSupplier;
|
|
|
|
return-void
|
|
.end method
|
|
|
|
.method public final e(Lj$/util/Spliterator;)Lj$/util/stream/e7;
|
|
.locals 3
|
|
|
|
.line 397
|
|
new-instance v0, Lj$/util/stream/w7;
|
|
|
|
iget-object v1, p0, Lj$/util/stream/e7;->b:Lj$/util/stream/a;
|
|
|
|
iget-boolean v2, p0, Lj$/util/stream/e7;->a:Z
|
|
|
|
.line 392
|
|
invoke-direct {v0, v1, p1, v2}, Lj$/util/stream/e7;-><init>(Lj$/util/stream/a;Lj$/util/Spliterator;Z)V
|
|
|
|
return-object v0
|
|
.end method
|
|
|
|
.method public final bridge synthetic forEachRemaining(Ljava/lang/Object;)V
|
|
.locals 0
|
|
|
|
.line 379
|
|
check-cast p1, Ljava/util/function/LongConsumer;
|
|
|
|
invoke-virtual {p0, p1}, Lj$/util/stream/w7;->forEachRemaining(Ljava/util/function/LongConsumer;)V
|
|
|
|
return-void
|
|
.end method
|
|
|
|
.method public final synthetic forEachRemaining(Ljava/util/function/Consumer;)V
|
|
.locals 0
|
|
|
|
invoke-static {p0, p1}, Lj$/com/android/tools/r8/a;->g(Lj$/util/Spliterator$OfLong;Ljava/util/function/Consumer;)V
|
|
|
|
return-void
|
|
.end method
|
|
|
|
.method public final forEachRemaining(Ljava/util/function/LongConsumer;)V
|
|
.locals 2
|
|
|
|
.line 424
|
|
iget-object v0, p0, Lj$/util/stream/e7;->h:Lj$/util/stream/c;
|
|
|
|
if-nez v0, :cond_0
|
|
|
|
iget-boolean v0, p0, Lj$/util/stream/e7;->i:Z
|
|
|
|
if-nez v0, :cond_0
|
|
|
|
.line 425
|
|
invoke-static {p1}, Lj$/util/Objects;->requireNonNull(Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
.line 426
|
|
invoke-virtual {p0}, Lj$/util/stream/e7;->c()V
|
|
|
|
.line 428
|
|
invoke-static {p1}, Lj$/util/Objects;->requireNonNull(Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
new-instance v0, Lj$/util/stream/v7;
|
|
|
|
const/4 v1, 0x0
|
|
|
|
invoke-direct {v0, p1, v1}, Lj$/util/stream/v7;-><init>(Ljava/util/function/LongConsumer;I)V
|
|
|
|
iget-object p1, p0, Lj$/util/stream/e7;->d:Lj$/util/Spliterator;
|
|
|
|
iget-object v1, p0, Lj$/util/stream/e7;->b:Lj$/util/stream/a;
|
|
|
|
invoke-virtual {v1, p1, v0}, Lj$/util/stream/a;->v0(Lj$/util/Spliterator;Lj$/util/stream/n5;)Lj$/util/stream/n5;
|
|
|
|
const/4 p1, 0x1
|
|
|
|
.line 429
|
|
iput-boolean p1, p0, Lj$/util/stream/e7;->i:Z
|
|
|
|
return-void
|
|
|
|
.line 432
|
|
:cond_0
|
|
invoke-virtual {p0, p1}, Lj$/util/stream/w7;->tryAdvance(Ljava/util/function/LongConsumer;)Z
|
|
|
|
move-result v0
|
|
|
|
if-nez v0, :cond_0
|
|
|
|
return-void
|
|
.end method
|
|
|
|
.method public final bridge synthetic tryAdvance(Ljava/lang/Object;)Z
|
|
.locals 0
|
|
|
|
.line 379
|
|
check-cast p1, Ljava/util/function/LongConsumer;
|
|
|
|
invoke-virtual {p0, p1}, Lj$/util/stream/w7;->tryAdvance(Ljava/util/function/LongConsumer;)Z
|
|
|
|
move-result p1
|
|
|
|
return p1
|
|
.end method
|
|
|
|
.method public final synthetic tryAdvance(Ljava/util/function/Consumer;)Z
|
|
.locals 0
|
|
|
|
invoke-static {p0, p1}, Lj$/com/android/tools/r8/a;->u(Lj$/util/Spliterator$OfLong;Ljava/util/function/Consumer;)Z
|
|
|
|
move-result p1
|
|
|
|
return p1
|
|
.end method
|
|
|
|
.method public final tryAdvance(Ljava/util/function/LongConsumer;)Z
|
|
.locals 8
|
|
|
|
.line 415
|
|
invoke-static {p1}, Lj$/util/Objects;->requireNonNull(Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
.line 416
|
|
invoke-virtual {p0}, Lj$/util/stream/e7;->a()Z
|
|
|
|
move-result v0
|
|
|
|
if-eqz v0, :cond_1
|
|
|
|
.line 418
|
|
iget-object v1, p0, Lj$/util/stream/e7;->h:Lj$/util/stream/c;
|
|
|
|
check-cast v1, Lj$/util/stream/v6;
|
|
|
|
iget-wide v2, p0, Lj$/util/stream/e7;->g:J
|
|
|
|
.line 915
|
|
invoke-virtual {v1, v2, v3}, Lj$/util/stream/x6;->r(J)I
|
|
|
|
move-result v4
|
|
|
|
.line 916
|
|
iget v5, v1, Lj$/util/stream/c;->c:I
|
|
|
|
if-nez v5, :cond_0
|
|
|
|
if-nez v4, :cond_0
|
|
|
|
.line 917
|
|
iget-object v1, v1, Lj$/util/stream/x6;->e:Ljava/lang/Object;
|
|
|
|
check-cast v1, [J
|
|
|
|
long-to-int v2, v2
|
|
|
|
aget-wide v2, v1, v2
|
|
|
|
goto :goto_0
|
|
|
|
.line 919
|
|
:cond_0
|
|
iget-object v5, v1, Lj$/util/stream/x6;->f:[Ljava/lang/Object;
|
|
|
|
check-cast v5, [[J
|
|
|
|
aget-object v5, v5, v4
|
|
|
|
iget-object v1, v1, Lj$/util/stream/c;->d:[J
|
|
|
|
aget-wide v6, v1, v4
|
|
|
|
sub-long/2addr v2, v6
|
|
|
|
long-to-int v1, v2
|
|
|
|
aget-wide v2, v5, v1
|
|
|
|
.line 418
|
|
:goto_0
|
|
invoke-interface {p1, v2, v3}, Ljava/util/function/LongConsumer;->accept(J)V
|
|
|
|
:cond_1
|
|
return v0
|
|
.end method
|
|
|
|
.method public final trySplit()Lj$/util/Spliterator$OfLong;
|
|
.locals 1
|
|
|
|
.line 410
|
|
invoke-super {p0}, Lj$/util/stream/e7;->trySplit()Lj$/util/Spliterator;
|
|
|
|
move-result-object v0
|
|
|
|
check-cast v0, Lj$/util/Spliterator$OfLong;
|
|
|
|
return-object v0
|
|
.end method
|
|
|
|
.method public final trySplit()Lj$/util/Spliterator$OfPrimitive;
|
|
.locals 1
|
|
|
|
.line 410
|
|
invoke-super {p0}, Lj$/util/stream/e7;->trySplit()Lj$/util/Spliterator;
|
|
|
|
move-result-object v0
|
|
|
|
check-cast v0, Lj$/util/Spliterator$OfLong;
|
|
|
|
return-object v0
|
|
.end method
|
|
|
|
.method public final trySplit()Lj$/util/Spliterator;
|
|
.locals 1
|
|
|
|
.line 410
|
|
invoke-super {p0}, Lj$/util/stream/e7;->trySplit()Lj$/util/Spliterator;
|
|
|
|
move-result-object v0
|
|
|
|
check-cast v0, Lj$/util/Spliterator$OfLong;
|
|
|
|
return-object v0
|
|
.end method
|