* 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>
340 lines
5.7 KiB
Smali
340 lines
5.7 KiB
Smali
.class public Lokio/Timeout;
|
|
.super Ljava/lang/Object;
|
|
.source "SourceFile"
|
|
|
|
|
|
# annotations
|
|
.annotation system Ldalvik/annotation/MemberClasses;
|
|
value = {
|
|
Lokio/Timeout$Companion;
|
|
}
|
|
.end annotation
|
|
|
|
.annotation runtime Lkotlin/Metadata;
|
|
d1 = {
|
|
"\u0000\u000c\n\u0002\u0018\u0002\n\u0002\u0010\u0000\n\u0002\u0008\u0002\u0008\u0016\u0018\u00002\u00020\u0001:\u0001\u0002\u00a8\u0006\u0003"
|
|
}
|
|
d2 = {
|
|
"Lokio/Timeout;",
|
|
"",
|
|
"Companion",
|
|
"okio"
|
|
}
|
|
k = 0x1
|
|
mv = {
|
|
0x2,
|
|
0x2,
|
|
0x0
|
|
}
|
|
xi = 0x30
|
|
.end annotation
|
|
|
|
.annotation build Lkotlin/jvm/internal/SourceDebugExtension;
|
|
value = {
|
|
"SMAP\nTimeout.kt\nKotlin\n*S Kotlin\n*F\n+ 1 Timeout.kt\nokio/Timeout\n+ 2 fake.kt\nkotlin/jvm/internal/FakeKt\n*L\n1#1,358:1\n1#2:359\n*E\n"
|
|
}
|
|
.end annotation
|
|
|
|
|
|
# static fields
|
|
.field public static final d:Lokio/Timeout$Companion$NONE$1;
|
|
|
|
|
|
# instance fields
|
|
.field public a:Z
|
|
|
|
.field public b:J
|
|
|
|
.field public c:J
|
|
|
|
|
|
# direct methods
|
|
.method static constructor <clinit>()V
|
|
.locals 1
|
|
|
|
.line 1
|
|
new-instance v0, Lokio/Timeout$Companion$NONE$1;
|
|
|
|
.line 2
|
|
.line 3
|
|
invoke-direct {v0}, Ljava/lang/Object;-><init>()V
|
|
|
|
.line 4
|
|
.line 5
|
|
.line 6
|
|
sput-object v0, Lokio/Timeout;->d:Lokio/Timeout$Companion$NONE$1;
|
|
|
|
.line 7
|
|
.line 8
|
|
return-void
|
|
.end method
|
|
|
|
|
|
# virtual methods
|
|
.method public a()Lokio/Timeout;
|
|
.locals 1
|
|
|
|
.line 1
|
|
const/4 v0, 0x0
|
|
|
|
.line 2
|
|
iput-boolean v0, p0, Lokio/Timeout;->a:Z
|
|
|
|
.line 3
|
|
.line 4
|
|
return-object p0
|
|
.end method
|
|
|
|
.method public b()Lokio/Timeout;
|
|
.locals 2
|
|
|
|
.line 1
|
|
const-wide/16 v0, 0x0
|
|
|
|
.line 2
|
|
.line 3
|
|
iput-wide v0, p0, Lokio/Timeout;->c:J
|
|
|
|
.line 4
|
|
.line 5
|
|
return-object p0
|
|
.end method
|
|
|
|
.method public c()J
|
|
.locals 2
|
|
|
|
.line 1
|
|
iget-boolean v0, p0, Lokio/Timeout;->a:Z
|
|
|
|
.line 2
|
|
.line 3
|
|
if-eqz v0, :cond_0
|
|
|
|
.line 4
|
|
.line 5
|
|
iget-wide v0, p0, Lokio/Timeout;->b:J
|
|
|
|
.line 6
|
|
.line 7
|
|
return-wide v0
|
|
|
|
.line 8
|
|
:cond_0
|
|
new-instance v0, Ljava/lang/IllegalStateException;
|
|
|
|
.line 9
|
|
.line 10
|
|
const-string v1, "No deadline"
|
|
|
|
.line 11
|
|
.line 12
|
|
invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
|
|
|
|
.line 13
|
|
.line 14
|
|
.line 15
|
|
throw v0
|
|
.end method
|
|
|
|
.method public d(J)Lokio/Timeout;
|
|
.locals 1
|
|
|
|
.line 1
|
|
const/4 v0, 0x1
|
|
|
|
.line 2
|
|
iput-boolean v0, p0, Lokio/Timeout;->a:Z
|
|
|
|
.line 3
|
|
.line 4
|
|
iput-wide p1, p0, Lokio/Timeout;->b:J
|
|
|
|
.line 5
|
|
.line 6
|
|
return-object p0
|
|
.end method
|
|
|
|
.method public e()Z
|
|
.locals 1
|
|
|
|
.line 1
|
|
iget-boolean v0, p0, Lokio/Timeout;->a:Z
|
|
|
|
.line 2
|
|
.line 3
|
|
return v0
|
|
.end method
|
|
|
|
.method public f()V
|
|
.locals 4
|
|
|
|
.line 1
|
|
invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
|
|
|
|
.line 2
|
|
.line 3
|
|
.line 4
|
|
move-result-object v0
|
|
|
|
.line 5
|
|
invoke-virtual {v0}, Ljava/lang/Thread;->isInterrupted()Z
|
|
|
|
.line 6
|
|
.line 7
|
|
.line 8
|
|
move-result v0
|
|
|
|
.line 9
|
|
if-nez v0, :cond_2
|
|
|
|
.line 10
|
|
.line 11
|
|
iget-boolean v0, p0, Lokio/Timeout;->a:Z
|
|
|
|
.line 12
|
|
.line 13
|
|
if-eqz v0, :cond_1
|
|
|
|
.line 14
|
|
.line 15
|
|
iget-wide v0, p0, Lokio/Timeout;->b:J
|
|
|
|
.line 16
|
|
.line 17
|
|
invoke-static {}, Ljava/lang/System;->nanoTime()J
|
|
|
|
.line 18
|
|
.line 19
|
|
.line 20
|
|
move-result-wide v2
|
|
|
|
.line 21
|
|
sub-long/2addr v0, v2
|
|
|
|
.line 22
|
|
const-wide/16 v2, 0x0
|
|
|
|
.line 23
|
|
.line 24
|
|
cmp-long v0, v0, v2
|
|
|
|
.line 25
|
|
.line 26
|
|
if-lez v0, :cond_0
|
|
|
|
.line 27
|
|
.line 28
|
|
goto :goto_0
|
|
|
|
.line 29
|
|
:cond_0
|
|
new-instance v0, Ljava/io/InterruptedIOException;
|
|
|
|
.line 30
|
|
.line 31
|
|
const-string v1, "deadline reached"
|
|
|
|
.line 32
|
|
.line 33
|
|
invoke-direct {v0, v1}, Ljava/io/InterruptedIOException;-><init>(Ljava/lang/String;)V
|
|
|
|
.line 34
|
|
.line 35
|
|
.line 36
|
|
throw v0
|
|
|
|
.line 37
|
|
:cond_1
|
|
:goto_0
|
|
return-void
|
|
|
|
.line 38
|
|
:cond_2
|
|
new-instance v0, Ljava/io/InterruptedIOException;
|
|
|
|
.line 39
|
|
.line 40
|
|
const-string v1, "interrupted"
|
|
|
|
.line 41
|
|
.line 42
|
|
invoke-direct {v0, v1}, Ljava/io/InterruptedIOException;-><init>(Ljava/lang/String;)V
|
|
|
|
.line 43
|
|
.line 44
|
|
.line 45
|
|
throw v0
|
|
.end method
|
|
|
|
.method public g(JLjava/util/concurrent/TimeUnit;)Lokio/Timeout;
|
|
.locals 2
|
|
|
|
.line 1
|
|
const-string v0, "unit"
|
|
|
|
.line 2
|
|
.line 3
|
|
invoke-static {p3, v0}, Lkotlin/jvm/internal/Intrinsics;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
|
|
|
|
.line 4
|
|
.line 5
|
|
.line 6
|
|
const-wide/16 v0, 0x0
|
|
|
|
.line 7
|
|
.line 8
|
|
cmp-long v0, p1, v0
|
|
|
|
.line 9
|
|
.line 10
|
|
if-ltz v0, :cond_0
|
|
|
|
.line 11
|
|
.line 12
|
|
invoke-virtual {p3, p1, p2}, Ljava/util/concurrent/TimeUnit;->toNanos(J)J
|
|
|
|
.line 13
|
|
.line 14
|
|
.line 15
|
|
move-result-wide p1
|
|
|
|
.line 16
|
|
iput-wide p1, p0, Lokio/Timeout;->c:J
|
|
|
|
.line 17
|
|
.line 18
|
|
return-object p0
|
|
|
|
.line 19
|
|
:cond_0
|
|
const-string p3, "timeout < 0: "
|
|
|
|
.line 20
|
|
.line 21
|
|
invoke-static {p1, p2, p3}, Landroid/support/v4/media/a;->h(JLjava/lang/String;)Ljava/lang/String;
|
|
|
|
.line 22
|
|
.line 23
|
|
.line 24
|
|
move-result-object p1
|
|
|
|
.line 25
|
|
new-instance p2, Ljava/lang/IllegalArgumentException;
|
|
|
|
.line 26
|
|
.line 27
|
|
invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
|
|
|
|
.line 28
|
|
.line 29
|
|
.line 30
|
|
move-result-object p1
|
|
|
|
.line 31
|
|
invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
|
|
|
|
.line 32
|
|
.line 33
|
|
.line 34
|
|
throw p2
|
|
.end method
|