* 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>
333 lines
8.1 KiB
Smali
333 lines
8.1 KiB
Smali
.class public final Lj$/time/zone/i;
|
|
.super Ljava/lang/Object;
|
|
.source "SourceFile"
|
|
|
|
|
|
# static fields
|
|
.field public static final b:Ljava/util/concurrent/CopyOnWriteArrayList;
|
|
|
|
.field public static final c:Lj$/util/concurrent/ConcurrentHashMap;
|
|
|
|
.field public static volatile d:Ljava/util/Set;
|
|
|
|
|
|
# instance fields
|
|
.field public final a:Ljava/util/Set;
|
|
|
|
|
|
# direct methods
|
|
.method static constructor <clinit>()V
|
|
.locals 5
|
|
|
|
.line 138
|
|
new-instance v0, Ljava/util/concurrent/CopyOnWriteArrayList;
|
|
|
|
invoke-direct {v0}, Ljava/util/concurrent/CopyOnWriteArrayList;-><init>()V
|
|
|
|
sput-object v0, Lj$/time/zone/i;->b:Ljava/util/concurrent/CopyOnWriteArrayList;
|
|
|
|
.line 142
|
|
new-instance v1, Lj$/util/concurrent/ConcurrentHashMap;
|
|
|
|
const/high16 v2, 0x3f400000 # 0.75f
|
|
|
|
const/4 v3, 0x2
|
|
|
|
const/16 v4, 0x200
|
|
|
|
invoke-direct {v1, v4, v2, v3}, Lj$/util/concurrent/ConcurrentHashMap;-><init>(IFI)V
|
|
|
|
sput-object v1, Lj$/time/zone/i;->c:Lj$/util/concurrent/ConcurrentHashMap;
|
|
|
|
.line 152
|
|
new-instance v1, Ljava/util/ArrayList;
|
|
|
|
invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
|
|
|
|
.line 153
|
|
new-instance v2, Lj$/time/zone/h;
|
|
|
|
invoke-direct {v2, v1}, Lj$/time/zone/h;-><init>(Ljava/util/List;)V
|
|
|
|
invoke-static {v2}, Ljava/security/AccessController;->doPrivileged(Ljava/security/PrivilegedAction;)Ljava/lang/Object;
|
|
|
|
.line 201
|
|
invoke-virtual {v0, v1}, Ljava/util/concurrent/CopyOnWriteArrayList;->addAll(Ljava/util/Collection;)Z
|
|
|
|
return-void
|
|
.end method
|
|
|
|
.method public constructor <init>()V
|
|
.locals 5
|
|
|
|
.line 367
|
|
invoke-direct {p0}, Ljava/lang/Object;-><init>()V
|
|
|
|
.line 461
|
|
new-instance v0, Ljava/util/LinkedHashSet;
|
|
|
|
invoke-direct {v0}, Ljava/util/LinkedHashSet;-><init>()V
|
|
|
|
.line 462
|
|
invoke-static {}, Ljava/util/TimeZone;->getAvailableIDs()[Ljava/lang/String;
|
|
|
|
move-result-object v1
|
|
|
|
array-length v2, v1
|
|
|
|
const/4 v3, 0x0
|
|
|
|
:goto_0
|
|
if-ge v3, v2, :cond_0
|
|
|
|
aget-object v4, v1, v3
|
|
|
|
.line 463
|
|
invoke-virtual {v0, v4}, Ljava/util/LinkedHashSet;->add(Ljava/lang/Object;)Z
|
|
|
|
add-int/lit8 v3, v3, 0x1
|
|
|
|
goto :goto_0
|
|
|
|
.line 465
|
|
:cond_0
|
|
invoke-static {v0}, Ljava/util/Collections;->unmodifiableSet(Ljava/util/Set;)Ljava/util/Set;
|
|
|
|
move-result-object v0
|
|
|
|
iput-object v0, p0, Lj$/time/zone/i;->a:Ljava/util/Set;
|
|
|
|
return-void
|
|
.end method
|
|
|
|
.method public static a(Ljava/lang/String;)Lj$/time/zone/f;
|
|
.locals 3
|
|
|
|
.line 240
|
|
const-string v0, "zoneId"
|
|
|
|
invoke-static {p0, v0}, Lj$/util/Objects;->requireNonNull(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
|
|
|
|
.line 281
|
|
sget-object v0, Lj$/time/zone/i;->c:Lj$/util/concurrent/ConcurrentHashMap;
|
|
|
|
invoke-interface {v0, p0}, Ljava/util/concurrent/ConcurrentMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
move-result-object v1
|
|
|
|
check-cast v1, Lj$/time/zone/i;
|
|
|
|
if-nez v1, :cond_1
|
|
|
|
.line 283
|
|
invoke-interface {v0}, Ljava/util/concurrent/ConcurrentMap;->isEmpty()Z
|
|
|
|
move-result v0
|
|
|
|
if-eqz v0, :cond_0
|
|
|
|
.line 284
|
|
new-instance p0, Lj$/time/zone/g;
|
|
|
|
const-string v0, "No time-zone data files registered"
|
|
|
|
.line 88
|
|
invoke-direct {p0, v0}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/String;)V
|
|
|
|
.line 284
|
|
throw p0
|
|
|
|
.line 286
|
|
:cond_0
|
|
new-instance v0, Lj$/time/zone/g;
|
|
|
|
new-instance v1, Ljava/lang/StringBuilder;
|
|
|
|
const-string v2, "Unknown time-zone ID: "
|
|
|
|
invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
|
|
|
|
invoke-virtual {v1, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
|
|
|
invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
|
|
|
|
move-result-object p0
|
|
|
|
.line 88
|
|
invoke-direct {v0, p0}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/String;)V
|
|
|
|
.line 286
|
|
throw v0
|
|
|
|
.line 475
|
|
:cond_1
|
|
iget-object v0, v1, Lj$/time/zone/i;->a:Ljava/util/Set;
|
|
|
|
invoke-interface {v0, p0}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
|
|
|
|
move-result v0
|
|
|
|
if-eqz v0, :cond_2
|
|
|
|
.line 476
|
|
new-instance v0, Lj$/time/zone/f;
|
|
|
|
invoke-static {p0}, Ljava/util/TimeZone;->getTimeZone(Ljava/lang/String;)Ljava/util/TimeZone;
|
|
|
|
move-result-object p0
|
|
|
|
invoke-direct {v0, p0}, Lj$/time/zone/f;-><init>(Ljava/util/TimeZone;)V
|
|
|
|
return-object v0
|
|
|
|
.line 478
|
|
:cond_2
|
|
new-instance v0, Lj$/time/zone/g;
|
|
|
|
new-instance v1, Ljava/lang/StringBuilder;
|
|
|
|
const-string v2, "Not a built-in time zone: "
|
|
|
|
invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
|
|
|
|
invoke-virtual {v1, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
|
|
|
invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
|
|
|
|
move-result-object p0
|
|
|
|
.line 88
|
|
invoke-direct {v0, p0}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/String;)V
|
|
|
|
.line 478
|
|
throw v0
|
|
.end method
|
|
|
|
.method public static b(Lj$/time/zone/i;)V
|
|
.locals 5
|
|
|
|
.line 308
|
|
const-string v0, "provider"
|
|
|
|
invoke-static {p0, v0}, Lj$/util/Objects;->requireNonNull(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
|
|
|
|
.line 309
|
|
const-class v0, Lj$/time/zone/i;
|
|
|
|
monitor-enter v0
|
|
|
|
.line 470
|
|
:try_start_0
|
|
iget-object v1, p0, Lj$/time/zone/i;->a:Ljava/util/Set;
|
|
|
|
.line 320
|
|
invoke-interface {v1}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
|
|
|
|
move-result-object v1
|
|
|
|
:goto_0
|
|
invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
|
|
|
|
move-result v2
|
|
|
|
if-eqz v2, :cond_1
|
|
|
|
invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
|
|
|
|
move-result-object v2
|
|
|
|
check-cast v2, Ljava/lang/String;
|
|
|
|
.line 321
|
|
const-string v3, "zoneId"
|
|
|
|
invoke-static {v2, v3}, Lj$/util/Objects;->requireNonNull(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
|
|
|
|
.line 322
|
|
sget-object v3, Lj$/time/zone/i;->c:Lj$/util/concurrent/ConcurrentHashMap;
|
|
|
|
invoke-interface {v3, v2, p0}, Ljava/util/concurrent/ConcurrentMap;->putIfAbsent(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
move-result-object v3
|
|
|
|
check-cast v3, Lj$/time/zone/i;
|
|
|
|
if-nez v3, :cond_0
|
|
|
|
goto :goto_0
|
|
|
|
.line 324
|
|
:cond_0
|
|
new-instance v1, Lj$/time/zone/g;
|
|
|
|
new-instance v3, Ljava/lang/StringBuilder;
|
|
|
|
invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
|
|
|
|
const-string v4, "Unable to register zone as one already registered with that ID: "
|
|
|
|
invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
|
|
|
invoke-virtual {v3, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
|
|
|
const-string v2, ", currently loading from provider: "
|
|
|
|
invoke-virtual {v3, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
|
|
|
invoke-virtual {v3, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
|
|
|
|
invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
|
|
|
|
move-result-object p0
|
|
|
|
.line 88
|
|
invoke-direct {v1, p0}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/String;)V
|
|
|
|
.line 324
|
|
throw v1
|
|
|
|
:catchall_0
|
|
move-exception p0
|
|
|
|
goto :goto_1
|
|
|
|
.line 329
|
|
:cond_1
|
|
new-instance v1, Ljava/util/HashSet;
|
|
|
|
sget-object v2, Lj$/time/zone/i;->c:Lj$/util/concurrent/ConcurrentHashMap;
|
|
|
|
invoke-interface {v2}, Ljava/util/concurrent/ConcurrentMap;->keySet()Ljava/util/Set;
|
|
|
|
move-result-object v2
|
|
|
|
invoke-direct {v1, v2}, Ljava/util/HashSet;-><init>(Ljava/util/Collection;)V
|
|
|
|
.line 330
|
|
invoke-static {v1}, Ljava/util/Collections;->unmodifiableSet(Ljava/util/Set;)Ljava/util/Set;
|
|
|
|
move-result-object v1
|
|
|
|
sput-object v1, Lj$/time/zone/i;->d:Ljava/util/Set;
|
|
:try_end_0
|
|
.catchall {:try_start_0 .. :try_end_0} :catchall_0
|
|
|
|
.line 331
|
|
monitor-exit v0
|
|
|
|
.line 310
|
|
sget-object v0, Lj$/time/zone/i;->b:Ljava/util/concurrent/CopyOnWriteArrayList;
|
|
|
|
invoke-virtual {v0, p0}, Ljava/util/concurrent/CopyOnWriteArrayList;->add(Ljava/lang/Object;)Z
|
|
|
|
return-void
|
|
|
|
.line 331
|
|
:goto_1
|
|
:try_start_1
|
|
monitor-exit v0
|
|
:try_end_1
|
|
.catchall {:try_start_1 .. :try_end_1} :catchall_0
|
|
|
|
throw p0
|
|
.end method
|