KaKi87
550ddb0413
* 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>
345 lines
6.5 KiB
Smali
345 lines
6.5 KiB
Smali
.class public final Lj$/time/format/d;
|
|
.super Ljava/lang/Object;
|
|
.source "SourceFile"
|
|
|
|
# interfaces
|
|
.implements Lj$/time/format/e;
|
|
|
|
|
|
# instance fields
|
|
.field public final a:[Lj$/time/format/e;
|
|
|
|
.field public final b:Z
|
|
|
|
|
|
# direct methods
|
|
.method public constructor <init>(Ljava/util/List;Z)V
|
|
.locals 1
|
|
|
|
.line 2328
|
|
check-cast p1, Ljava/util/ArrayList;
|
|
|
|
invoke-virtual {p1}, Ljava/util/ArrayList;->size()I
|
|
|
|
move-result v0
|
|
|
|
new-array v0, v0, [Lj$/time/format/e;
|
|
|
|
invoke-interface {p1, v0}, Ljava/util/List;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
|
|
|
|
move-result-object p1
|
|
|
|
check-cast p1, [Lj$/time/format/e;
|
|
|
|
invoke-direct {p0, p1, p2}, Lj$/time/format/d;-><init>([Lj$/time/format/e;Z)V
|
|
|
|
return-void
|
|
.end method
|
|
|
|
.method public constructor <init>([Lj$/time/format/e;Z)V
|
|
.locals 0
|
|
|
|
.line 2331
|
|
invoke-direct {p0}, Ljava/lang/Object;-><init>()V
|
|
|
|
.line 2332
|
|
iput-object p1, p0, Lj$/time/format/d;->a:[Lj$/time/format/e;
|
|
|
|
.line 2333
|
|
iput-boolean p2, p0, Lj$/time/format/d;->b:Z
|
|
|
|
return-void
|
|
.end method
|
|
|
|
|
|
# virtual methods
|
|
.method public final d(Lj$/time/format/y;Ljava/lang/StringBuilder;)Z
|
|
.locals 7
|
|
|
|
.line 2351
|
|
invoke-virtual {p2}, Ljava/lang/StringBuilder;->length()I
|
|
|
|
move-result v0
|
|
|
|
const/4 v1, 0x1
|
|
|
|
.line 2352
|
|
iget-boolean v2, p0, Lj$/time/format/d;->b:Z
|
|
|
|
if-eqz v2, :cond_0
|
|
|
|
.line 269
|
|
iget v3, p1, Lj$/time/format/y;->c:I
|
|
|
|
add-int/2addr v3, v1
|
|
|
|
.line 269
|
|
iput v3, p1, Lj$/time/format/y;->c:I
|
|
|
|
.line 2356
|
|
:cond_0
|
|
:try_start_0
|
|
iget-object v3, p0, Lj$/time/format/d;->a:[Lj$/time/format/e;
|
|
|
|
array-length v4, v3
|
|
|
|
const/4 v5, 0x0
|
|
|
|
:goto_0
|
|
if-ge v5, v4, :cond_2
|
|
|
|
aget-object v6, v3, v5
|
|
|
|
.line 2357
|
|
invoke-interface {v6, p1, p2}, Lj$/time/format/e;->d(Lj$/time/format/y;Ljava/lang/StringBuilder;)Z
|
|
|
|
move-result v6
|
|
|
|
if-nez v6, :cond_1
|
|
|
|
.line 2358
|
|
invoke-virtual {p2, v0}, Ljava/lang/StringBuilder;->setLength(I)V
|
|
:try_end_0
|
|
.catchall {:try_start_0 .. :try_end_0} :catchall_0
|
|
|
|
if-eqz v2, :cond_3
|
|
|
|
.line 276
|
|
:goto_1
|
|
iget p2, p1, Lj$/time/format/y;->c:I
|
|
|
|
sub-int/2addr p2, v1
|
|
|
|
iput p2, p1, Lj$/time/format/y;->c:I
|
|
|
|
return v1
|
|
|
|
:catchall_0
|
|
move-exception p2
|
|
|
|
goto :goto_2
|
|
|
|
:cond_1
|
|
add-int/lit8 v5, v5, 0x1
|
|
|
|
goto :goto_0
|
|
|
|
:cond_2
|
|
if-eqz v2, :cond_3
|
|
|
|
goto :goto_1
|
|
|
|
:cond_3
|
|
return v1
|
|
|
|
:goto_2
|
|
if-eqz v2, :cond_4
|
|
|
|
iget v0, p1, Lj$/time/format/y;->c:I
|
|
|
|
sub-int/2addr v0, v1
|
|
|
|
iput v0, p1, Lj$/time/format/y;->c:I
|
|
|
|
.line 2366
|
|
:cond_4
|
|
throw p2
|
|
.end method
|
|
|
|
.method public final g(Lj$/time/format/v;Ljava/lang/CharSequence;I)I
|
|
.locals 7
|
|
|
|
.line 2372
|
|
iget-boolean v0, p0, Lj$/time/format/d;->b:Z
|
|
|
|
iget-object v1, p0, Lj$/time/format/d;->a:[Lj$/time/format/e;
|
|
|
|
const/4 v2, 0x0
|
|
|
|
if-eqz v0, :cond_2
|
|
|
|
.line 287
|
|
iget-object v0, p1, Lj$/time/format/v;->d:Ljava/util/ArrayList;
|
|
|
|
.line 287
|
|
invoke-virtual {p1}, Lj$/time/format/v;->c()Lj$/time/format/d0;
|
|
|
|
move-result-object v3
|
|
|
|
invoke-virtual {v3}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
|
|
|
|
.line 170
|
|
new-instance v4, Lj$/time/format/d0;
|
|
|
|
invoke-direct {v4}, Lj$/time/format/d0;-><init>()V
|
|
|
|
.line 171
|
|
iget-object v5, v4, Lj$/time/format/d0;->a:Ljava/util/Map;
|
|
|
|
iget-object v6, v3, Lj$/time/format/d0;->a:Ljava/util/Map;
|
|
|
|
check-cast v5, Ljava/util/HashMap;
|
|
|
|
invoke-virtual {v5, v6}, Ljava/util/HashMap;->putAll(Ljava/util/Map;)V
|
|
|
|
.line 172
|
|
iget-object v5, v3, Lj$/time/format/d0;->b:Lj$/time/ZoneId;
|
|
|
|
iput-object v5, v4, Lj$/time/format/d0;->b:Lj$/time/ZoneId;
|
|
|
|
.line 173
|
|
iget-object v5, v3, Lj$/time/format/d0;->c:Lj$/time/chrono/m;
|
|
|
|
iput-object v5, v4, Lj$/time/format/d0;->c:Lj$/time/chrono/m;
|
|
|
|
.line 174
|
|
iget-boolean v3, v3, Lj$/time/format/d0;->d:Z
|
|
|
|
iput-boolean v3, v4, Lj$/time/format/d0;->d:Z
|
|
|
|
.line 287
|
|
invoke-virtual {v0, v4}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
|
|
|
|
.line 2375
|
|
array-length v0, v1
|
|
|
|
move v3, p3
|
|
|
|
:goto_0
|
|
if-ge v2, v0, :cond_1
|
|
|
|
aget-object v4, v1, v2
|
|
|
|
.line 2376
|
|
invoke-interface {v4, p1, p2, v3}, Lj$/time/format/e;->g(Lj$/time/format/v;Ljava/lang/CharSequence;I)I
|
|
|
|
move-result v3
|
|
|
|
if-gez v3, :cond_0
|
|
|
|
.line 299
|
|
iget-object p1, p1, Lj$/time/format/v;->d:Ljava/util/ArrayList;
|
|
|
|
invoke-virtual {p1}, Ljava/util/ArrayList;->size()I
|
|
|
|
move-result p2
|
|
|
|
add-int/lit8 p2, p2, -0x1
|
|
|
|
invoke-virtual {p1, p2}, Ljava/util/ArrayList;->remove(I)Ljava/lang/Object;
|
|
|
|
return p3
|
|
|
|
:cond_0
|
|
add-int/lit8 v2, v2, 0x1
|
|
|
|
goto :goto_0
|
|
|
|
.line 297
|
|
:cond_1
|
|
iget-object p1, p1, Lj$/time/format/v;->d:Ljava/util/ArrayList;
|
|
|
|
invoke-virtual {p1}, Ljava/util/ArrayList;->size()I
|
|
|
|
move-result p2
|
|
|
|
add-int/lit8 p2, p2, -0x2
|
|
|
|
invoke-virtual {p1, p2}, Ljava/util/ArrayList;->remove(I)Ljava/lang/Object;
|
|
|
|
return v3
|
|
|
|
.line 2385
|
|
:cond_2
|
|
array-length v0, v1
|
|
|
|
:goto_1
|
|
if-ge v2, v0, :cond_4
|
|
|
|
aget-object v3, v1, v2
|
|
|
|
.line 2386
|
|
invoke-interface {v3, p1, p2, p3}, Lj$/time/format/e;->g(Lj$/time/format/v;Ljava/lang/CharSequence;I)I
|
|
|
|
move-result p3
|
|
|
|
if-gez p3, :cond_3
|
|
|
|
return p3
|
|
|
|
:cond_3
|
|
add-int/lit8 v2, v2, 0x1
|
|
|
|
goto :goto_1
|
|
|
|
:cond_4
|
|
return p3
|
|
.end method
|
|
|
|
.method public final toString()Ljava/lang/String;
|
|
.locals 6
|
|
|
|
.line 2397
|
|
new-instance v0, Ljava/lang/StringBuilder;
|
|
|
|
invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
|
|
|
|
.line 2398
|
|
iget-object v1, p0, Lj$/time/format/d;->a:[Lj$/time/format/e;
|
|
|
|
if-eqz v1, :cond_3
|
|
|
|
.line 2399
|
|
iget-boolean v2, p0, Lj$/time/format/d;->b:Z
|
|
|
|
if-eqz v2, :cond_0
|
|
|
|
const-string v3, "["
|
|
|
|
goto :goto_0
|
|
|
|
:cond_0
|
|
const-string v3, "("
|
|
|
|
:goto_0
|
|
invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
|
|
|
.line 2400
|
|
array-length v3, v1
|
|
|
|
const/4 v4, 0x0
|
|
|
|
:goto_1
|
|
if-ge v4, v3, :cond_1
|
|
|
|
aget-object v5, v1, v4
|
|
|
|
.line 2401
|
|
invoke-virtual {v0, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
|
|
|
|
add-int/lit8 v4, v4, 0x1
|
|
|
|
goto :goto_1
|
|
|
|
:cond_1
|
|
if-eqz v2, :cond_2
|
|
|
|
.line 2403
|
|
const-string v1, "]"
|
|
|
|
goto :goto_2
|
|
|
|
:cond_2
|
|
const-string v1, ")"
|
|
|
|
:goto_2
|
|
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
|
|
|
.line 2405
|
|
:cond_3
|
|
invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
|
|
|
|
move-result-object v0
|
|
|
|
return-object v0
|
|
.end method
|