* 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>
193 lines
5.3 KiB
Smali
193 lines
5.3 KiB
Smali
.class public final synthetic Lj$/util/Comparator$-CC;
|
|
.super Ljava/lang/Object;
|
|
.source "SourceFile"
|
|
|
|
|
|
# direct methods
|
|
.method public static $default$thenComparing(Ljava/util/Comparator;Ljava/util/Comparator;)Ljava/util/Comparator;
|
|
.locals 2
|
|
|
|
.line 214
|
|
invoke-static {p1}, Lj$/util/Objects;->requireNonNull(Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
.line 215
|
|
new-instance v0, Lj$/util/d;
|
|
|
|
const/4 v1, 0x0
|
|
|
|
invoke-direct {v0, p0, p1, v1}, Lj$/util/d;-><init>(Ljava/util/Comparator;Ljava/lang/Object;I)V
|
|
|
|
return-object v0
|
|
.end method
|
|
|
|
.method public static $default$thenComparing(Ljava/util/Comparator;Ljava/util/function/Function;)Ljava/util/Comparator;
|
|
.locals 0
|
|
|
|
.line 265
|
|
invoke-static {p1}, Lj$/util/Comparator$-CC;->comparing(Ljava/util/function/Function;)Ljava/util/Comparator;
|
|
|
|
move-result-object p1
|
|
|
|
invoke-static {p0, p1}, Lj$/com/android/tools/r8/a;->T(Ljava/util/Comparator;Ljava/util/Comparator;)Ljava/util/Comparator;
|
|
|
|
move-result-object p0
|
|
|
|
return-object p0
|
|
.end method
|
|
|
|
.method public static $default$thenComparing(Ljava/util/Comparator;Ljava/util/function/Function;Ljava/util/Comparator;)Ljava/util/Comparator;
|
|
.locals 2
|
|
|
|
.line 433
|
|
invoke-static {p1}, Lj$/util/Objects;->requireNonNull(Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
.line 434
|
|
invoke-static {p2}, Lj$/util/Objects;->requireNonNull(Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
.line 435
|
|
new-instance v0, Lj$/util/d;
|
|
|
|
const/4 v1, 0x1
|
|
|
|
invoke-direct {v0, p2, p1, v1}, Lj$/util/d;-><init>(Ljava/util/Comparator;Ljava/lang/Object;I)V
|
|
|
|
.line 242
|
|
invoke-static {p0, v0}, Lj$/com/android/tools/r8/a;->T(Ljava/util/Comparator;Ljava/util/Comparator;)Ljava/util/Comparator;
|
|
|
|
move-result-object p0
|
|
|
|
return-object p0
|
|
.end method
|
|
|
|
.method public static $default$thenComparingDouble(Ljava/util/Comparator;Ljava/util/function/ToDoubleFunction;)Ljava/util/Comparator;
|
|
.locals 2
|
|
|
|
.line 530
|
|
invoke-static {p1}, Lj$/util/Objects;->requireNonNull(Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
.line 531
|
|
new-instance v0, Lj$/util/c;
|
|
|
|
const/4 v1, 0x1
|
|
|
|
invoke-direct {v0, v1, p1}, Lj$/util/c;-><init>(ILjava/lang/Object;)V
|
|
|
|
.line 322
|
|
invoke-static {p0, v0}, Lj$/com/android/tools/r8/a;->T(Ljava/util/Comparator;Ljava/util/Comparator;)Ljava/util/Comparator;
|
|
|
|
move-result-object p0
|
|
|
|
return-object p0
|
|
.end method
|
|
|
|
.method public static $default$thenComparingInt(Ljava/util/Comparator;Ljava/util/function/ToIntFunction;)Ljava/util/Comparator;
|
|
.locals 0
|
|
|
|
.line 284
|
|
invoke-static {p1}, Lj$/util/Comparator$-CC;->comparingInt(Ljava/util/function/ToIntFunction;)Ljava/util/Comparator;
|
|
|
|
move-result-object p1
|
|
|
|
invoke-static {p0, p1}, Lj$/com/android/tools/r8/a;->T(Ljava/util/Comparator;Ljava/util/Comparator;)Ljava/util/Comparator;
|
|
|
|
move-result-object p0
|
|
|
|
return-object p0
|
|
.end method
|
|
|
|
.method public static $default$thenComparingLong(Ljava/util/Comparator;Ljava/util/function/ToLongFunction;)Ljava/util/Comparator;
|
|
.locals 2
|
|
|
|
.line 509
|
|
invoke-static {p1}, Lj$/util/Objects;->requireNonNull(Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
.line 510
|
|
new-instance v0, Lj$/util/c;
|
|
|
|
const/4 v1, 0x3
|
|
|
|
invoke-direct {v0, v1, p1}, Lj$/util/c;-><init>(ILjava/lang/Object;)V
|
|
|
|
.line 303
|
|
invoke-static {p0, v0}, Lj$/com/android/tools/r8/a;->T(Ljava/util/Comparator;Ljava/util/Comparator;)Ljava/util/Comparator;
|
|
|
|
move-result-object p0
|
|
|
|
return-object p0
|
|
.end method
|
|
|
|
.method public static comparing(Ljava/util/function/Function;)Ljava/util/Comparator;
|
|
.locals 2
|
|
.annotation system Ldalvik/annotation/Signature;
|
|
value = {
|
|
"<T:",
|
|
"Ljava/lang/Object;",
|
|
"U::",
|
|
"Ljava/lang/Comparable<",
|
|
"-TU;>;>(",
|
|
"Ljava/util/function/Function<",
|
|
"-TT;+TU;>;)",
|
|
"Ljava/util/Comparator<",
|
|
"TT;>;"
|
|
}
|
|
.end annotation
|
|
|
|
.line 467
|
|
invoke-static {p0}, Lj$/util/Objects;->requireNonNull(Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
.line 468
|
|
new-instance v0, Lj$/util/c;
|
|
|
|
const/4 v1, 0x2
|
|
|
|
invoke-direct {v0, v1, p0}, Lj$/util/c;-><init>(ILjava/lang/Object;)V
|
|
|
|
return-object v0
|
|
.end method
|
|
|
|
.method public static comparingInt(Ljava/util/function/ToIntFunction;)Ljava/util/Comparator;
|
|
.locals 2
|
|
.annotation system Ldalvik/annotation/Signature;
|
|
value = {
|
|
"<T:",
|
|
"Ljava/lang/Object;",
|
|
">(",
|
|
"Ljava/util/function/ToIntFunction<",
|
|
"-TT;>;)",
|
|
"Ljava/util/Comparator<",
|
|
"TT;>;"
|
|
}
|
|
.end annotation
|
|
|
|
.line 488
|
|
invoke-static {p0}, Lj$/util/Objects;->requireNonNull(Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
.line 489
|
|
new-instance v0, Lj$/util/c;
|
|
|
|
const/4 v1, 0x0
|
|
|
|
invoke-direct {v0, v1, p0}, Lj$/util/c;-><init>(ILjava/lang/Object;)V
|
|
|
|
return-object v0
|
|
.end method
|
|
|
|
.method public static reverseOrder()Ljava/util/Comparator;
|
|
.locals 1
|
|
.annotation system Ldalvik/annotation/Signature;
|
|
value = {
|
|
"<T::",
|
|
"Ljava/lang/Comparable<",
|
|
"-TT;>;>()",
|
|
"Ljava/util/Comparator<",
|
|
"TT;>;"
|
|
}
|
|
.end annotation
|
|
|
|
.line 339
|
|
invoke-static {}, Ljava/util/Collections;->reverseOrder()Ljava/util/Comparator;
|
|
|
|
move-result-object v0
|
|
|
|
return-object v0
|
|
.end method
|