* 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>
248 lines
5.1 KiB
Smali
248 lines
5.1 KiB
Smali
.class public final Lj$/util/b1;
|
|
.super Ljava/lang/Object;
|
|
.source "SourceFile"
|
|
|
|
# interfaces
|
|
.implements Lj$/util/PrimitiveIterator$OfLong;
|
|
.implements Ljava/util/function/LongConsumer;
|
|
.implements Lj$/util/a0;
|
|
|
|
|
|
# instance fields
|
|
.field public a:Z
|
|
|
|
.field public b:J
|
|
|
|
.field public final synthetic c:Lj$/util/Spliterator$OfLong;
|
|
|
|
|
|
# direct methods
|
|
.method public constructor <init>(Lj$/util/Spliterator$OfLong;)V
|
|
.locals 0
|
|
|
|
.line 758
|
|
invoke-direct {p0}, Ljava/lang/Object;-><init>()V
|
|
|
|
iput-object p1, p0, Lj$/util/b1;->c:Lj$/util/Spliterator$OfLong;
|
|
|
|
const/4 p1, 0x0
|
|
|
|
.line 759
|
|
iput-boolean p1, p0, Lj$/util/b1;->a:Z
|
|
|
|
return-void
|
|
.end method
|
|
|
|
|
|
# virtual methods
|
|
.method public final accept(J)V
|
|
.locals 1
|
|
|
|
const/4 v0, 0x1
|
|
|
|
.line 764
|
|
iput-boolean v0, p0, Lj$/util/b1;->a:Z
|
|
|
|
.line 765
|
|
iput-wide p1, p0, Lj$/util/b1;->b:J
|
|
|
|
return-void
|
|
.end method
|
|
|
|
.method public final synthetic andThen(Ljava/util/function/LongConsumer;)Ljava/util/function/LongConsumer;
|
|
.locals 0
|
|
|
|
invoke-static {p0, p1}, Lj$/util/function/LongConsumer$-CC;->$default$andThen(Ljava/util/function/LongConsumer;Ljava/util/function/LongConsumer;)Ljava/util/function/LongConsumer;
|
|
|
|
move-result-object p1
|
|
|
|
return-object p1
|
|
.end method
|
|
|
|
.method public final bridge synthetic forEachRemaining(Ljava/lang/Object;)V
|
|
.locals 0
|
|
|
|
.line 160
|
|
check-cast p1, Ljava/util/function/LongConsumer;
|
|
|
|
invoke-virtual {p0, p1}, Lj$/util/b1;->forEachRemaining(Ljava/util/function/LongConsumer;)V
|
|
|
|
return-void
|
|
.end method
|
|
|
|
.method public final forEachRemaining(Ljava/util/function/Consumer;)V
|
|
.locals 2
|
|
|
|
.line 216
|
|
instance-of v0, p1, Ljava/util/function/LongConsumer;
|
|
|
|
if-eqz v0, :cond_0
|
|
|
|
.line 217
|
|
check-cast p1, Ljava/util/function/LongConsumer;
|
|
|
|
invoke-virtual {p0, p1}, Lj$/util/b1;->forEachRemaining(Ljava/util/function/LongConsumer;)V
|
|
|
|
return-void
|
|
|
|
.line 221
|
|
:cond_0
|
|
invoke-static {p1}, Lj$/util/Objects;->requireNonNull(Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
.line 222
|
|
sget-boolean v0, Lj$/util/o1;->a:Z
|
|
|
|
if-nez v0, :cond_1
|
|
|
|
.line 224
|
|
invoke-static {p1}, Lj$/util/Objects;->requireNonNull(Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
new-instance v0, Lj$/util/l0;
|
|
|
|
const/4 v1, 0x0
|
|
|
|
invoke-direct {v0, p1, v1}, Lj$/util/l0;-><init>(Ljava/util/function/Consumer;I)V
|
|
|
|
invoke-virtual {p0, v0}, Lj$/util/b1;->forEachRemaining(Ljava/util/function/LongConsumer;)V
|
|
|
|
return-void
|
|
|
|
.line 223
|
|
:cond_1
|
|
const-class p1, Lj$/util/b1;
|
|
|
|
const-string v0, "{0} calling PrimitiveIterator.OfLong.forEachRemainingLong(action::accept)"
|
|
|
|
invoke-static {p1, v0}, Lj$/util/o1;->a(Ljava/lang/Class;Ljava/lang/String;)V
|
|
|
|
const/4 p1, 0x0
|
|
|
|
throw p1
|
|
.end method
|
|
|
|
.method public final forEachRemaining(Ljava/util/function/LongConsumer;)V
|
|
.locals 2
|
|
|
|
.line 187
|
|
invoke-static {p1}, Lj$/util/Objects;->requireNonNull(Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
.line 188
|
|
:goto_0
|
|
invoke-virtual {p0}, Lj$/util/b1;->hasNext()Z
|
|
|
|
move-result v0
|
|
|
|
if-eqz v0, :cond_0
|
|
|
|
.line 189
|
|
invoke-virtual {p0}, Lj$/util/b1;->nextLong()J
|
|
|
|
move-result-wide v0
|
|
|
|
invoke-interface {p1, v0, v1}, Ljava/util/function/LongConsumer;->accept(J)V
|
|
|
|
goto :goto_0
|
|
|
|
:cond_0
|
|
return-void
|
|
.end method
|
|
|
|
.method public final hasNext()Z
|
|
.locals 1
|
|
|
|
.line 770
|
|
iget-boolean v0, p0, Lj$/util/b1;->a:Z
|
|
|
|
if-nez v0, :cond_0
|
|
|
|
.line 771
|
|
iget-object v0, p0, Lj$/util/b1;->c:Lj$/util/Spliterator$OfLong;
|
|
|
|
invoke-interface {v0, p0}, Lj$/util/Spliterator$OfLong;->tryAdvance(Ljava/util/function/LongConsumer;)Z
|
|
|
|
.line 772
|
|
:cond_0
|
|
iget-boolean v0, p0, Lj$/util/b1;->a:Z
|
|
|
|
return v0
|
|
.end method
|
|
|
|
.method public final next()Ljava/lang/Long;
|
|
.locals 2
|
|
|
|
.line 200
|
|
sget-boolean v0, Lj$/util/o1;->a:Z
|
|
|
|
if-nez v0, :cond_0
|
|
|
|
.line 202
|
|
invoke-virtual {p0}, Lj$/util/b1;->nextLong()J
|
|
|
|
move-result-wide v0
|
|
|
|
invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
|
|
|
|
move-result-object v0
|
|
|
|
return-object v0
|
|
|
|
.line 201
|
|
:cond_0
|
|
const-class v0, Lj$/util/b1;
|
|
|
|
const-string v1, "{0} calling PrimitiveIterator.OfLong.nextLong()"
|
|
|
|
invoke-static {v0, v1}, Lj$/util/o1;->a(Ljava/lang/Class;Ljava/lang/String;)V
|
|
|
|
const/4 v0, 0x0
|
|
|
|
throw v0
|
|
.end method
|
|
|
|
.method public final bridge synthetic next()Ljava/lang/Object;
|
|
.locals 1
|
|
|
|
.line 160
|
|
invoke-virtual {p0}, Lj$/util/b1;->next()Ljava/lang/Long;
|
|
|
|
move-result-object v0
|
|
|
|
return-object v0
|
|
.end method
|
|
|
|
.method public final nextLong()J
|
|
.locals 2
|
|
|
|
.line 777
|
|
iget-boolean v0, p0, Lj$/util/b1;->a:Z
|
|
|
|
if-nez v0, :cond_1
|
|
|
|
invoke-virtual {p0}, Lj$/util/b1;->hasNext()Z
|
|
|
|
move-result v0
|
|
|
|
if-eqz v0, :cond_0
|
|
|
|
goto :goto_0
|
|
|
|
.line 778
|
|
:cond_0
|
|
new-instance v0, Ljava/util/NoSuchElementException;
|
|
|
|
invoke-direct {v0}, Ljava/util/NoSuchElementException;-><init>()V
|
|
|
|
throw v0
|
|
|
|
:cond_1
|
|
:goto_0
|
|
const/4 v0, 0x0
|
|
|
|
.line 780
|
|
iput-boolean v0, p0, Lj$/util/b1;->a:Z
|
|
|
|
.line 781
|
|
iget-wide v0, p0, Lj$/util/b1;->b:J
|
|
|
|
return-wide v0
|
|
.end method
|