* 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>
360 lines
8.7 KiB
Smali
360 lines
8.7 KiB
Smali
.class public final Lokhttp3/internal/connection/RealConnectionPool;
|
|
.super Ljava/lang/Object;
|
|
.source "SourceFile"
|
|
|
|
|
|
# annotations
|
|
.annotation system Ldalvik/annotation/MemberClasses;
|
|
value = {
|
|
Lokhttp3/internal/connection/RealConnectionPool$Companion;
|
|
}
|
|
.end annotation
|
|
|
|
.annotation runtime Lkotlin/Metadata;
|
|
d1 = {
|
|
"\u0000\u000c\n\u0002\u0018\u0002\n\u0002\u0010\u0000\n\u0002\u0008\u0002\u0018\u00002\u00020\u0001:\u0001\u0002\u00a8\u0006\u0003"
|
|
}
|
|
d2 = {
|
|
"Lokhttp3/internal/connection/RealConnectionPool;",
|
|
"",
|
|
"Companion",
|
|
"okhttp"
|
|
}
|
|
k = 0x1
|
|
mv = {
|
|
0x2,
|
|
0x2,
|
|
0x0
|
|
}
|
|
xi = 0x30
|
|
.end annotation
|
|
|
|
.annotation build Lkotlin/jvm/internal/SourceDebugExtension;
|
|
value = {
|
|
"SMAP\nRealConnectionPool.kt\nKotlin\n*S Kotlin\n*F\n+ 1 RealConnectionPool.kt\nokhttp3/internal/connection/RealConnectionPool\n+ 2 fake.kt\nkotlin/jvm/internal/FakeKt\n+ 3 _Collections.kt\nkotlin/collections/CollectionsKt___CollectionsKt\n+ 4 Lockable.kt\nokhttp3/internal/concurrent/LockableKt\n*L\n1#1,326:1\n1#2:327\n1788#3,3:328\n1791#3:332\n63#4:331\n63#4:333\n63#4:334\n55#4,4:335\n55#4,4:339\n63#4:343\n63#4:344\n63#4:345\n55#4,4:346\n*S KotlinDebug\n*F\n+ 1 RealConnectionPool.kt\nokhttp3/internal/connection/RealConnectionPool\n*L\n64#1:328,3\n64#1:332\n65#1:331\n92#1:333\n111#1:334\n127#1:335,4\n139#1:339,4\n157#1:343\n201#1:344\n247#1:345\n287#1:346,4\n*E\n"
|
|
}
|
|
.end annotation
|
|
|
|
|
|
# instance fields
|
|
.field public final a:J
|
|
|
|
.field public final b:Lokhttp3/internal/concurrent/TaskQueue;
|
|
|
|
.field public final c:Lokhttp3/internal/connection/RealConnectionPool$cleanupTask$1;
|
|
|
|
.field public final d:Ljava/util/concurrent/ConcurrentLinkedQueue;
|
|
|
|
|
|
# direct methods
|
|
.method public constructor <init>(Lokhttp3/internal/concurrent/TaskRunner;)V
|
|
.locals 3
|
|
|
|
.line 1
|
|
sget-object v0, Ljava/util/concurrent/TimeUnit;->MINUTES:Ljava/util/concurrent/TimeUnit;
|
|
|
|
.line 2
|
|
.line 3
|
|
const-string v1, "taskRunner"
|
|
|
|
.line 4
|
|
.line 5
|
|
invoke-static {p1, v1}, Lkotlin/jvm/internal/Intrinsics;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
|
|
|
|
.line 6
|
|
.line 7
|
|
.line 8
|
|
const-string v1, "timeUnit"
|
|
|
|
.line 9
|
|
.line 10
|
|
invoke-static {v0, v1}, Lkotlin/jvm/internal/Intrinsics;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
|
|
|
|
.line 11
|
|
.line 12
|
|
.line 13
|
|
const-string v1, "connectionListener"
|
|
|
|
.line 14
|
|
.line 15
|
|
sget-object v2, Lokhttp3/internal/connection/ConnectionListener;->a:Lokhttp3/internal/connection/ConnectionListener$Companion$NONE$1;
|
|
|
|
.line 16
|
|
.line 17
|
|
invoke-static {v2, v1}, Lkotlin/jvm/internal/Intrinsics;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
|
|
|
|
.line 18
|
|
.line 19
|
|
.line 20
|
|
invoke-direct {p0}, Ljava/lang/Object;-><init>()V
|
|
|
|
.line 21
|
|
.line 22
|
|
.line 23
|
|
const-wide/16 v1, 0x5
|
|
|
|
.line 24
|
|
.line 25
|
|
invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/TimeUnit;->toNanos(J)J
|
|
|
|
.line 26
|
|
.line 27
|
|
.line 28
|
|
move-result-wide v0
|
|
|
|
.line 29
|
|
iput-wide v0, p0, Lokhttp3/internal/connection/RealConnectionPool;->a:J
|
|
|
|
.line 30
|
|
.line 31
|
|
invoke-virtual {p1}, Lokhttp3/internal/concurrent/TaskRunner;->d()Lokhttp3/internal/concurrent/TaskQueue;
|
|
|
|
.line 32
|
|
.line 33
|
|
.line 34
|
|
move-result-object p1
|
|
|
|
.line 35
|
|
iput-object p1, p0, Lokhttp3/internal/connection/RealConnectionPool;->b:Lokhttp3/internal/concurrent/TaskQueue;
|
|
|
|
.line 36
|
|
.line 37
|
|
new-instance p1, Ljava/lang/StringBuilder;
|
|
|
|
.line 38
|
|
.line 39
|
|
invoke-direct {p1}, Ljava/lang/StringBuilder;-><init>()V
|
|
|
|
.line 40
|
|
.line 41
|
|
.line 42
|
|
sget-object v0, Lokhttp3/internal/_UtilJvmKt;->b:Ljava/lang/String;
|
|
|
|
.line 43
|
|
.line 44
|
|
const-string v1, " ConnectionPool connection closer"
|
|
|
|
.line 45
|
|
.line 46
|
|
invoke-static {p1, v0, v1}, Landroid/support/v4/media/a;->p(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
|
|
|
|
.line 47
|
|
.line 48
|
|
.line 49
|
|
move-result-object p1
|
|
|
|
.line 50
|
|
new-instance v0, Lokhttp3/internal/connection/RealConnectionPool$cleanupTask$1;
|
|
|
|
.line 51
|
|
.line 52
|
|
invoke-direct {v0, p0, p1}, Lokhttp3/internal/connection/RealConnectionPool$cleanupTask$1;-><init>(Lokhttp3/internal/connection/RealConnectionPool;Ljava/lang/String;)V
|
|
|
|
.line 53
|
|
.line 54
|
|
.line 55
|
|
iput-object v0, p0, Lokhttp3/internal/connection/RealConnectionPool;->c:Lokhttp3/internal/connection/RealConnectionPool$cleanupTask$1;
|
|
|
|
.line 56
|
|
.line 57
|
|
new-instance p1, Ljava/util/concurrent/ConcurrentLinkedQueue;
|
|
|
|
.line 58
|
|
.line 59
|
|
invoke-direct {p1}, Ljava/util/concurrent/ConcurrentLinkedQueue;-><init>()V
|
|
|
|
.line 60
|
|
.line 61
|
|
.line 62
|
|
iput-object p1, p0, Lokhttp3/internal/connection/RealConnectionPool;->d:Ljava/util/concurrent/ConcurrentLinkedQueue;
|
|
|
|
.line 63
|
|
.line 64
|
|
return-void
|
|
.end method
|
|
|
|
|
|
# virtual methods
|
|
.method public final a(Lokhttp3/internal/connection/RealConnection;J)I
|
|
.locals 6
|
|
|
|
.line 1
|
|
sget-object v0, Lokhttp3/internal/_UtilJvmKt;->a:Ljava/util/TimeZone;
|
|
|
|
.line 2
|
|
.line 3
|
|
iget-object v0, p1, Lokhttp3/internal/connection/RealConnection;->t:Ljava/util/ArrayList;
|
|
|
|
.line 4
|
|
.line 5
|
|
const/4 v1, 0x0
|
|
|
|
.line 6
|
|
move v2, v1
|
|
|
|
.line 7
|
|
:cond_0
|
|
:goto_0
|
|
invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
|
|
|
|
.line 8
|
|
.line 9
|
|
.line 10
|
|
move-result v3
|
|
|
|
.line 11
|
|
if-ge v2, v3, :cond_2
|
|
|
|
.line 12
|
|
.line 13
|
|
invoke-virtual {v0, v2}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
|
|
|
|
.line 14
|
|
.line 15
|
|
.line 16
|
|
move-result-object v3
|
|
|
|
.line 17
|
|
check-cast v3, Ljava/lang/ref/Reference;
|
|
|
|
.line 18
|
|
.line 19
|
|
invoke-virtual {v3}, Ljava/lang/ref/Reference;->get()Ljava/lang/Object;
|
|
|
|
.line 20
|
|
.line 21
|
|
.line 22
|
|
move-result-object v4
|
|
|
|
.line 23
|
|
if-eqz v4, :cond_1
|
|
|
|
.line 24
|
|
.line 25
|
|
add-int/lit8 v2, v2, 0x1
|
|
|
|
.line 26
|
|
.line 27
|
|
goto :goto_0
|
|
|
|
.line 28
|
|
:cond_1
|
|
const-string v4, "null cannot be cast to non-null type okhttp3.internal.connection.RealCall.CallReference"
|
|
|
|
.line 29
|
|
.line 30
|
|
invoke-static {v3, v4}, Lkotlin/jvm/internal/Intrinsics;->checkNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
|
|
|
.line 31
|
|
.line 32
|
|
.line 33
|
|
check-cast v3, Lokhttp3/internal/connection/RealCall$CallReference;
|
|
|
|
.line 34
|
|
.line 35
|
|
new-instance v4, Ljava/lang/StringBuilder;
|
|
|
|
.line 36
|
|
.line 37
|
|
const-string v5, "A connection to "
|
|
|
|
.line 38
|
|
.line 39
|
|
invoke-direct {v4, v5}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
|
|
|
|
.line 40
|
|
.line 41
|
|
.line 42
|
|
iget-object v5, p1, Lokhttp3/internal/connection/RealConnection;->g:Lokhttp3/Route;
|
|
|
|
.line 43
|
|
.line 44
|
|
iget-object v5, v5, Lokhttp3/Route;->a:Lokhttp3/Address;
|
|
|
|
.line 45
|
|
.line 46
|
|
iget-object v5, v5, Lokhttp3/Address;->h:Lokhttp3/HttpUrl;
|
|
|
|
.line 47
|
|
.line 48
|
|
invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
|
|
|
|
.line 49
|
|
.line 50
|
|
.line 51
|
|
const-string v5, " was leaked. Did you forget to close a response body?"
|
|
|
|
.line 52
|
|
.line 53
|
|
invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
|
|
|
.line 54
|
|
.line 55
|
|
.line 56
|
|
invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
|
|
|
|
.line 57
|
|
.line 58
|
|
.line 59
|
|
move-result-object v4
|
|
|
|
.line 60
|
|
sget-object v5, Lokhttp3/internal/platform/Platform;->a:Lokhttp3/internal/platform/Platform;
|
|
|
|
.line 61
|
|
.line 62
|
|
sget-object v5, Lokhttp3/internal/platform/Platform;->a:Lokhttp3/internal/platform/Platform;
|
|
|
|
.line 63
|
|
.line 64
|
|
iget-object v3, v3, Lokhttp3/internal/connection/RealCall$CallReference;->a:Ljava/lang/Object;
|
|
|
|
.line 65
|
|
.line 66
|
|
invoke-virtual {v5, v3, v4}, Lokhttp3/internal/platform/Platform;->k(Ljava/lang/Object;Ljava/lang/String;)V
|
|
|
|
.line 67
|
|
.line 68
|
|
.line 69
|
|
invoke-virtual {v0, v2}, Ljava/util/ArrayList;->remove(I)Ljava/lang/Object;
|
|
|
|
.line 70
|
|
.line 71
|
|
.line 72
|
|
invoke-virtual {v0}, Ljava/util/ArrayList;->isEmpty()Z
|
|
|
|
.line 73
|
|
.line 74
|
|
.line 75
|
|
move-result v3
|
|
|
|
.line 76
|
|
if-eqz v3, :cond_0
|
|
|
|
.line 77
|
|
.line 78
|
|
iget-wide v2, p0, Lokhttp3/internal/connection/RealConnectionPool;->a:J
|
|
|
|
.line 79
|
|
.line 80
|
|
sub-long/2addr p2, v2
|
|
|
|
.line 81
|
|
iput-wide p2, p1, Lokhttp3/internal/connection/RealConnection;->u:J
|
|
|
|
.line 82
|
|
.line 83
|
|
return v1
|
|
|
|
.line 84
|
|
:cond_2
|
|
invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
|
|
|
|
.line 85
|
|
.line 86
|
|
.line 87
|
|
move-result p1
|
|
|
|
.line 88
|
|
return p1
|
|
.end method
|