* 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>
380 lines
7.6 KiB
Smali
380 lines
7.6 KiB
Smali
.class public final Lj$/util/Optional;
|
|
.super Ljava/lang/Object;
|
|
.source "SourceFile"
|
|
|
|
|
|
# annotations
|
|
.annotation system Ldalvik/annotation/Signature;
|
|
value = {
|
|
"<T:",
|
|
"Ljava/lang/Object;",
|
|
">",
|
|
"Ljava/lang/Object;"
|
|
}
|
|
.end annotation
|
|
|
|
|
|
# static fields
|
|
.field public static final b:Lj$/util/Optional;
|
|
|
|
|
|
# instance fields
|
|
.field public final a:Ljava/lang/Object;
|
|
|
|
|
|
# direct methods
|
|
.method static constructor <clinit>()V
|
|
.locals 1
|
|
|
|
.line 64
|
|
new-instance v0, Lj$/util/Optional;
|
|
|
|
invoke-direct {v0}, Lj$/util/Optional;-><init>()V
|
|
|
|
sput-object v0, Lj$/util/Optional;->b:Lj$/util/Optional;
|
|
|
|
return-void
|
|
.end method
|
|
|
|
.method public constructor <init>()V
|
|
.locals 1
|
|
|
|
.line 77
|
|
invoke-direct {p0}, Ljava/lang/Object;-><init>()V
|
|
|
|
const/4 v0, 0x0
|
|
|
|
.line 78
|
|
iput-object v0, p0, Lj$/util/Optional;->a:Ljava/lang/Object;
|
|
|
|
return-void
|
|
.end method
|
|
|
|
.method public constructor <init>(Ljava/lang/Object;)V
|
|
.locals 0
|
|
|
|
.line 106
|
|
invoke-direct {p0}, Ljava/lang/Object;-><init>()V
|
|
|
|
.line 107
|
|
invoke-static {p1}, Lj$/util/Objects;->requireNonNull(Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
move-result-object p1
|
|
|
|
iput-object p1, p0, Lj$/util/Optional;->a:Ljava/lang/Object;
|
|
|
|
return-void
|
|
.end method
|
|
|
|
.method public static empty()Lj$/util/Optional;
|
|
.locals 1
|
|
.annotation system Ldalvik/annotation/Signature;
|
|
value = {
|
|
"<T:",
|
|
"Ljava/lang/Object;",
|
|
">()",
|
|
"Lj$/util/Optional<",
|
|
"TT;>;"
|
|
}
|
|
.end annotation
|
|
|
|
.line 96
|
|
sget-object v0, Lj$/util/Optional;->b:Lj$/util/Optional;
|
|
|
|
return-object v0
|
|
.end method
|
|
|
|
.method public static of(Ljava/lang/Object;)Lj$/util/Optional;
|
|
.locals 1
|
|
.annotation system Ldalvik/annotation/Signature;
|
|
value = {
|
|
"<T:",
|
|
"Ljava/lang/Object;",
|
|
">(TT;)",
|
|
"Lj$/util/Optional<",
|
|
"TT;>;"
|
|
}
|
|
.end annotation
|
|
|
|
.line 120
|
|
new-instance v0, Lj$/util/Optional;
|
|
|
|
invoke-direct {v0, p0}, Lj$/util/Optional;-><init>(Ljava/lang/Object;)V
|
|
|
|
return-object v0
|
|
.end method
|
|
|
|
.method public static ofNullable(Ljava/lang/Object;)Lj$/util/Optional;
|
|
.locals 0
|
|
.annotation system Ldalvik/annotation/Signature;
|
|
value = {
|
|
"<T:",
|
|
"Ljava/lang/Object;",
|
|
">(TT;)",
|
|
"Lj$/util/Optional<",
|
|
"TT;>;"
|
|
}
|
|
.end annotation
|
|
|
|
if-nez p0, :cond_0
|
|
|
|
.line 133
|
|
invoke-static {}, Lj$/util/Optional;->empty()Lj$/util/Optional;
|
|
|
|
move-result-object p0
|
|
|
|
return-object p0
|
|
|
|
:cond_0
|
|
invoke-static {p0}, Lj$/util/Optional;->of(Ljava/lang/Object;)Lj$/util/Optional;
|
|
|
|
move-result-object p0
|
|
|
|
return-object p0
|
|
.end method
|
|
|
|
|
|
# virtual methods
|
|
.method public final equals(Ljava/lang/Object;)Z
|
|
.locals 1
|
|
|
|
if-ne p0, p1, :cond_0
|
|
|
|
const/4 p1, 0x1
|
|
|
|
return p1
|
|
|
|
.line 431
|
|
:cond_0
|
|
instance-of v0, p1, Lj$/util/Optional;
|
|
|
|
if-nez v0, :cond_1
|
|
|
|
const/4 p1, 0x0
|
|
|
|
return p1
|
|
|
|
.line 435
|
|
:cond_1
|
|
check-cast p1, Lj$/util/Optional;
|
|
|
|
.line 436
|
|
iget-object v0, p0, Lj$/util/Optional;->a:Ljava/lang/Object;
|
|
|
|
iget-object p1, p1, Lj$/util/Optional;->a:Ljava/lang/Object;
|
|
|
|
invoke-static {v0, p1}, Lj$/util/Objects;->equals(Ljava/lang/Object;Ljava/lang/Object;)Z
|
|
|
|
move-result p1
|
|
|
|
return p1
|
|
.end method
|
|
|
|
.method public get()Ljava/lang/Object;
|
|
.locals 2
|
|
.annotation system Ldalvik/annotation/Signature;
|
|
value = {
|
|
"()TT;"
|
|
}
|
|
.end annotation
|
|
|
|
.line 147
|
|
iget-object v0, p0, Lj$/util/Optional;->a:Ljava/lang/Object;
|
|
|
|
if-eqz v0, :cond_0
|
|
|
|
return-object v0
|
|
|
|
.line 148
|
|
:cond_0
|
|
new-instance v0, Ljava/util/NoSuchElementException;
|
|
|
|
const-string v1, "No value present"
|
|
|
|
invoke-direct {v0, v1}, Ljava/util/NoSuchElementException;-><init>(Ljava/lang/String;)V
|
|
|
|
throw v0
|
|
.end method
|
|
|
|
.method public final hashCode()I
|
|
.locals 1
|
|
|
|
.line 448
|
|
iget-object v0, p0, Lj$/util/Optional;->a:Ljava/lang/Object;
|
|
|
|
invoke-static {v0}, Lj$/util/Objects;->hashCode(Ljava/lang/Object;)I
|
|
|
|
move-result v0
|
|
|
|
return v0
|
|
.end method
|
|
|
|
.method public isPresent()Z
|
|
.locals 1
|
|
|
|
.line 159
|
|
iget-object v0, p0, Lj$/util/Optional;->a:Ljava/lang/Object;
|
|
|
|
if-eqz v0, :cond_0
|
|
|
|
const/4 v0, 0x1
|
|
|
|
return v0
|
|
|
|
:cond_0
|
|
const/4 v0, 0x0
|
|
|
|
return v0
|
|
.end method
|
|
|
|
.method public map(Ljava/util/function/Function;)Lj$/util/Optional;
|
|
.locals 1
|
|
.annotation system Ldalvik/annotation/Signature;
|
|
value = {
|
|
"<U:",
|
|
"Ljava/lang/Object;",
|
|
">(",
|
|
"Ljava/util/function/Function<",
|
|
"-TT;+TU;>;)",
|
|
"Lj$/util/Optional<",
|
|
"TU;>;"
|
|
}
|
|
.end annotation
|
|
|
|
.line 261
|
|
invoke-static {p1}, Lj$/util/Objects;->requireNonNull(Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
.line 262
|
|
invoke-virtual {p0}, Lj$/util/Optional;->isPresent()Z
|
|
|
|
move-result v0
|
|
|
|
if-nez v0, :cond_0
|
|
|
|
.line 263
|
|
invoke-static {}, Lj$/util/Optional;->empty()Lj$/util/Optional;
|
|
|
|
move-result-object p1
|
|
|
|
return-object p1
|
|
|
|
.line 265
|
|
:cond_0
|
|
iget-object v0, p0, Lj$/util/Optional;->a:Ljava/lang/Object;
|
|
|
|
invoke-interface {p1, v0}, Ljava/util/function/Function;->apply(Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
move-result-object p1
|
|
|
|
invoke-static {p1}, Lj$/util/Optional;->ofNullable(Ljava/lang/Object;)Lj$/util/Optional;
|
|
|
|
move-result-object p1
|
|
|
|
return-object p1
|
|
.end method
|
|
|
|
.method public orElse(Ljava/lang/Object;)Ljava/lang/Object;
|
|
.locals 1
|
|
.annotation system Ldalvik/annotation/Signature;
|
|
value = {
|
|
"(TT;)TT;"
|
|
}
|
|
.end annotation
|
|
|
|
.line 355
|
|
iget-object v0, p0, Lj$/util/Optional;->a:Ljava/lang/Object;
|
|
|
|
if-eqz v0, :cond_0
|
|
|
|
return-object v0
|
|
|
|
:cond_0
|
|
return-object p1
|
|
.end method
|
|
|
|
.method public orElseGet(Ljava/util/function/Supplier;)Ljava/lang/Object;
|
|
.locals 1
|
|
.annotation system Ldalvik/annotation/Signature;
|
|
value = {
|
|
"(",
|
|
"Ljava/util/function/Supplier<",
|
|
"+TT;>;)TT;"
|
|
}
|
|
.end annotation
|
|
|
|
.line 369
|
|
iget-object v0, p0, Lj$/util/Optional;->a:Ljava/lang/Object;
|
|
|
|
if-eqz v0, :cond_0
|
|
|
|
return-object v0
|
|
|
|
:cond_0
|
|
invoke-interface {p1}, Ljava/util/function/Supplier;->get()Ljava/lang/Object;
|
|
|
|
move-result-object p1
|
|
|
|
return-object p1
|
|
.end method
|
|
|
|
.method public orElseThrow(Ljava/util/function/Supplier;)Ljava/lang/Object;
|
|
.locals 1
|
|
.annotation system Ldalvik/annotation/Signature;
|
|
value = {
|
|
"<X:",
|
|
"Ljava/lang/Throwable;",
|
|
">(",
|
|
"Ljava/util/function/Supplier<",
|
|
"+TX;>;)TT;^TX;"
|
|
}
|
|
.end annotation
|
|
|
|
.line 405
|
|
iget-object v0, p0, Lj$/util/Optional;->a:Ljava/lang/Object;
|
|
|
|
if-eqz v0, :cond_0
|
|
|
|
return-object v0
|
|
|
|
.line 408
|
|
:cond_0
|
|
invoke-interface {p1}, Ljava/util/function/Supplier;->get()Ljava/lang/Object;
|
|
|
|
move-result-object p1
|
|
|
|
check-cast p1, Ljava/lang/Throwable;
|
|
|
|
throw p1
|
|
.end method
|
|
|
|
.method public final toString()Ljava/lang/String;
|
|
.locals 3
|
|
|
|
.line 465
|
|
iget-object v0, p0, Lj$/util/Optional;->a:Ljava/lang/Object;
|
|
|
|
if-eqz v0, :cond_0
|
|
|
|
const/4 v1, 0x1
|
|
|
|
.line 466
|
|
new-array v1, v1, [Ljava/lang/Object;
|
|
|
|
const/4 v2, 0x0
|
|
|
|
aput-object v0, v1, v2
|
|
|
|
const-string v0, "Optional[%s]"
|
|
|
|
invoke-static {v0, v1}, Ljava/lang/String;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
|
|
|
|
move-result-object v0
|
|
|
|
return-object v0
|
|
|
|
.line 467
|
|
:cond_0
|
|
const-string v0, "Optional.empty"
|
|
|
|
return-object v0
|
|
.end method
|