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>
521 lines
9.9 KiB
Smali
521 lines
9.9 KiB
Smali
.class public final Lokhttp3/Route;
|
|
.super Ljava/lang/Object;
|
|
.source "SourceFile"
|
|
|
|
|
|
# annotations
|
|
.annotation runtime Lkotlin/Metadata;
|
|
d1 = {
|
|
"\u0000\n\n\u0002\u0018\u0002\n\u0002\u0010\u0000\n\u0000\u0018\u00002\u00020\u0001\u00a8\u0006\u0002"
|
|
}
|
|
d2 = {
|
|
"Lokhttp3/Route;",
|
|
"",
|
|
"okhttp"
|
|
}
|
|
k = 0x1
|
|
mv = {
|
|
0x2,
|
|
0x2,
|
|
0x0
|
|
}
|
|
xi = 0x30
|
|
.end annotation
|
|
|
|
|
|
# instance fields
|
|
.field public final a:Lokhttp3/Address;
|
|
|
|
.field public final b:Ljava/net/Proxy;
|
|
|
|
.field public final c:Ljava/net/InetSocketAddress;
|
|
|
|
|
|
# direct methods
|
|
.method public constructor <init>(Lokhttp3/Address;Ljava/net/Proxy;Ljava/net/InetSocketAddress;)V
|
|
.locals 1
|
|
|
|
.line 1
|
|
const-string v0, "address"
|
|
|
|
.line 2
|
|
.line 3
|
|
invoke-static {p1, v0}, Lkotlin/jvm/internal/Intrinsics;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
|
|
|
|
.line 4
|
|
.line 5
|
|
.line 6
|
|
const-string v0, "proxy"
|
|
|
|
.line 7
|
|
.line 8
|
|
invoke-static {p2, v0}, Lkotlin/jvm/internal/Intrinsics;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
|
|
|
|
.line 9
|
|
.line 10
|
|
.line 11
|
|
const-string v0, "socketAddress"
|
|
|
|
.line 12
|
|
.line 13
|
|
invoke-static {p3, v0}, Lkotlin/jvm/internal/Intrinsics;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
|
|
|
|
.line 14
|
|
.line 15
|
|
.line 16
|
|
invoke-direct {p0}, Ljava/lang/Object;-><init>()V
|
|
|
|
.line 17
|
|
.line 18
|
|
.line 19
|
|
iput-object p1, p0, Lokhttp3/Route;->a:Lokhttp3/Address;
|
|
|
|
.line 20
|
|
.line 21
|
|
iput-object p2, p0, Lokhttp3/Route;->b:Ljava/net/Proxy;
|
|
|
|
.line 22
|
|
.line 23
|
|
iput-object p3, p0, Lokhttp3/Route;->c:Ljava/net/InetSocketAddress;
|
|
|
|
.line 24
|
|
.line 25
|
|
return-void
|
|
.end method
|
|
|
|
|
|
# virtual methods
|
|
.method public final equals(Ljava/lang/Object;)Z
|
|
.locals 2
|
|
|
|
.line 1
|
|
instance-of v0, p1, Lokhttp3/Route;
|
|
|
|
.line 2
|
|
.line 3
|
|
if-eqz v0, :cond_0
|
|
|
|
.line 4
|
|
.line 5
|
|
check-cast p1, Lokhttp3/Route;
|
|
|
|
.line 6
|
|
.line 7
|
|
iget-object v0, p1, Lokhttp3/Route;->a:Lokhttp3/Address;
|
|
|
|
.line 8
|
|
.line 9
|
|
iget-object v1, p0, Lokhttp3/Route;->a:Lokhttp3/Address;
|
|
|
|
.line 10
|
|
.line 11
|
|
invoke-static {v0, v1}, Lkotlin/jvm/internal/Intrinsics;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
|
|
|
|
.line 12
|
|
.line 13
|
|
.line 14
|
|
move-result v0
|
|
|
|
.line 15
|
|
if-eqz v0, :cond_0
|
|
|
|
.line 16
|
|
.line 17
|
|
iget-object v0, p1, Lokhttp3/Route;->b:Ljava/net/Proxy;
|
|
|
|
.line 18
|
|
.line 19
|
|
iget-object v1, p0, Lokhttp3/Route;->b:Ljava/net/Proxy;
|
|
|
|
.line 20
|
|
.line 21
|
|
invoke-static {v0, v1}, Lkotlin/jvm/internal/Intrinsics;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
|
|
|
|
.line 22
|
|
.line 23
|
|
.line 24
|
|
move-result v0
|
|
|
|
.line 25
|
|
if-eqz v0, :cond_0
|
|
|
|
.line 26
|
|
.line 27
|
|
iget-object p1, p1, Lokhttp3/Route;->c:Ljava/net/InetSocketAddress;
|
|
|
|
.line 28
|
|
.line 29
|
|
iget-object v0, p0, Lokhttp3/Route;->c:Ljava/net/InetSocketAddress;
|
|
|
|
.line 30
|
|
.line 31
|
|
invoke-static {p1, v0}, Lkotlin/jvm/internal/Intrinsics;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
|
|
|
|
.line 32
|
|
.line 33
|
|
.line 34
|
|
move-result p1
|
|
|
|
.line 35
|
|
if-eqz p1, :cond_0
|
|
|
|
.line 36
|
|
.line 37
|
|
const/4 p1, 0x1
|
|
|
|
.line 38
|
|
return p1
|
|
|
|
.line 39
|
|
:cond_0
|
|
const/4 p1, 0x0
|
|
|
|
.line 40
|
|
return p1
|
|
.end method
|
|
|
|
.method public final hashCode()I
|
|
.locals 2
|
|
|
|
.line 1
|
|
iget-object v0, p0, Lokhttp3/Route;->a:Lokhttp3/Address;
|
|
|
|
.line 2
|
|
.line 3
|
|
invoke-virtual {v0}, Lokhttp3/Address;->hashCode()I
|
|
|
|
.line 4
|
|
.line 5
|
|
.line 6
|
|
move-result v0
|
|
|
|
.line 7
|
|
add-int/lit16 v0, v0, 0x20f
|
|
|
|
.line 8
|
|
.line 9
|
|
mul-int/lit8 v0, v0, 0x1f
|
|
|
|
.line 10
|
|
.line 11
|
|
iget-object v1, p0, Lokhttp3/Route;->b:Ljava/net/Proxy;
|
|
|
|
.line 12
|
|
.line 13
|
|
invoke-virtual {v1}, Ljava/net/Proxy;->hashCode()I
|
|
|
|
.line 14
|
|
.line 15
|
|
.line 16
|
|
move-result v1
|
|
|
|
.line 17
|
|
add-int/2addr v1, v0
|
|
|
|
.line 18
|
|
mul-int/lit8 v1, v1, 0x1f
|
|
|
|
.line 19
|
|
.line 20
|
|
iget-object v0, p0, Lokhttp3/Route;->c:Ljava/net/InetSocketAddress;
|
|
|
|
.line 21
|
|
.line 22
|
|
invoke-virtual {v0}, Ljava/net/InetSocketAddress;->hashCode()I
|
|
|
|
.line 23
|
|
.line 24
|
|
.line 25
|
|
move-result v0
|
|
|
|
.line 26
|
|
add-int/2addr v0, v1
|
|
|
|
.line 27
|
|
return v0
|
|
.end method
|
|
|
|
.method public final toString()Ljava/lang/String;
|
|
.locals 11
|
|
|
|
.line 1
|
|
new-instance v0, Ljava/lang/StringBuilder;
|
|
|
|
.line 2
|
|
.line 3
|
|
invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
|
|
|
|
.line 4
|
|
.line 5
|
|
.line 6
|
|
iget-object v1, p0, Lokhttp3/Route;->a:Lokhttp3/Address;
|
|
|
|
.line 7
|
|
.line 8
|
|
iget-object v1, v1, Lokhttp3/Address;->h:Lokhttp3/HttpUrl;
|
|
|
|
.line 9
|
|
.line 10
|
|
iget-object v2, v1, Lokhttp3/HttpUrl;->d:Ljava/lang/String;
|
|
|
|
.line 11
|
|
.line 12
|
|
iget-object v3, p0, Lokhttp3/Route;->c:Ljava/net/InetSocketAddress;
|
|
|
|
.line 13
|
|
.line 14
|
|
invoke-virtual {v3}, Ljava/net/InetSocketAddress;->getAddress()Ljava/net/InetAddress;
|
|
|
|
.line 15
|
|
.line 16
|
|
.line 17
|
|
move-result-object v4
|
|
|
|
.line 18
|
|
if-eqz v4, :cond_0
|
|
|
|
.line 19
|
|
.line 20
|
|
invoke-virtual {v4}, Ljava/net/InetAddress;->getHostAddress()Ljava/lang/String;
|
|
|
|
.line 21
|
|
.line 22
|
|
.line 23
|
|
move-result-object v4
|
|
|
|
.line 24
|
|
if-eqz v4, :cond_0
|
|
|
|
.line 25
|
|
.line 26
|
|
invoke-static {v4}, Lokhttp3/internal/_HostnamesCommonKt;->b(Ljava/lang/String;)Ljava/lang/String;
|
|
|
|
.line 27
|
|
.line 28
|
|
.line 29
|
|
move-result-object v4
|
|
|
|
.line 30
|
|
goto :goto_0
|
|
|
|
.line 31
|
|
:cond_0
|
|
const/4 v4, 0x0
|
|
|
|
.line 32
|
|
:goto_0
|
|
const/16 v5, 0x3a
|
|
|
|
.line 33
|
|
.line 34
|
|
invoke-static {v2, v5}, Lkotlin/text/StringsKt;->n(Ljava/lang/CharSequence;C)Z
|
|
|
|
.line 35
|
|
.line 36
|
|
.line 37
|
|
move-result v6
|
|
|
|
.line 38
|
|
const-string v7, "]"
|
|
|
|
.line 39
|
|
.line 40
|
|
const-string v8, "["
|
|
|
|
.line 41
|
|
.line 42
|
|
if-eqz v6, :cond_1
|
|
|
|
.line 43
|
|
.line 44
|
|
invoke-static {v0, v8, v2, v7}, Landroid/support/v4/media/a;->y(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
|
|
|
|
.line 45
|
|
.line 46
|
|
.line 47
|
|
goto :goto_1
|
|
|
|
.line 48
|
|
:cond_1
|
|
invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
|
|
|
.line 49
|
|
.line 50
|
|
.line 51
|
|
:goto_1
|
|
iget v6, v1, Lokhttp3/HttpUrl;->e:I
|
|
|
|
.line 52
|
|
.line 53
|
|
invoke-virtual {v3}, Ljava/net/InetSocketAddress;->getPort()I
|
|
|
|
.line 54
|
|
.line 55
|
|
.line 56
|
|
move-result v9
|
|
|
|
.line 57
|
|
const-string v10, ":"
|
|
|
|
.line 58
|
|
.line 59
|
|
if-ne v6, v9, :cond_2
|
|
|
|
.line 60
|
|
.line 61
|
|
invoke-static {v2, v4}, Lkotlin/jvm/internal/Intrinsics;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
|
|
|
|
.line 62
|
|
.line 63
|
|
.line 64
|
|
move-result v6
|
|
|
|
.line 65
|
|
if-eqz v6, :cond_3
|
|
|
|
.line 66
|
|
.line 67
|
|
:cond_2
|
|
invoke-virtual {v0, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
|
|
|
.line 68
|
|
.line 69
|
|
.line 70
|
|
iget v1, v1, Lokhttp3/HttpUrl;->e:I
|
|
|
|
.line 71
|
|
.line 72
|
|
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
|
|
|
|
.line 73
|
|
.line 74
|
|
.line 75
|
|
:cond_3
|
|
invoke-static {v2, v4}, Lkotlin/jvm/internal/Intrinsics;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
|
|
|
|
.line 76
|
|
.line 77
|
|
.line 78
|
|
move-result v1
|
|
|
|
.line 79
|
|
if-nez v1, :cond_7
|
|
|
|
.line 80
|
|
.line 81
|
|
iget-object v1, p0, Lokhttp3/Route;->b:Ljava/net/Proxy;
|
|
|
|
.line 82
|
|
.line 83
|
|
sget-object v2, Ljava/net/Proxy;->NO_PROXY:Ljava/net/Proxy;
|
|
|
|
.line 84
|
|
.line 85
|
|
invoke-static {v1, v2}, Lkotlin/jvm/internal/Intrinsics;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
|
|
|
|
.line 86
|
|
.line 87
|
|
.line 88
|
|
move-result v1
|
|
|
|
.line 89
|
|
if-eqz v1, :cond_4
|
|
|
|
.line 90
|
|
.line 91
|
|
const-string v1, " at "
|
|
|
|
.line 92
|
|
.line 93
|
|
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
|
|
|
.line 94
|
|
.line 95
|
|
.line 96
|
|
goto :goto_2
|
|
|
|
.line 97
|
|
:cond_4
|
|
const-string v1, " via proxy "
|
|
|
|
.line 98
|
|
.line 99
|
|
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
|
|
|
.line 100
|
|
.line 101
|
|
.line 102
|
|
:goto_2
|
|
if-nez v4, :cond_5
|
|
|
|
.line 103
|
|
.line 104
|
|
const-string v1, "<unresolved>"
|
|
|
|
.line 105
|
|
.line 106
|
|
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
|
|
|
.line 107
|
|
.line 108
|
|
.line 109
|
|
goto :goto_3
|
|
|
|
.line 110
|
|
:cond_5
|
|
invoke-static {v4, v5}, Lkotlin/text/StringsKt;->n(Ljava/lang/CharSequence;C)Z
|
|
|
|
.line 111
|
|
.line 112
|
|
.line 113
|
|
move-result v1
|
|
|
|
.line 114
|
|
if-eqz v1, :cond_6
|
|
|
|
.line 115
|
|
.line 116
|
|
invoke-static {v0, v8, v4, v7}, Landroid/support/v4/media/a;->y(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
|
|
|
|
.line 117
|
|
.line 118
|
|
.line 119
|
|
goto :goto_3
|
|
|
|
.line 120
|
|
:cond_6
|
|
invoke-virtual {v0, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
|
|
|
.line 121
|
|
.line 122
|
|
.line 123
|
|
:goto_3
|
|
invoke-virtual {v0, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
|
|
|
.line 124
|
|
.line 125
|
|
.line 126
|
|
invoke-virtual {v3}, Ljava/net/InetSocketAddress;->getPort()I
|
|
|
|
.line 127
|
|
.line 128
|
|
.line 129
|
|
move-result v1
|
|
|
|
.line 130
|
|
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
|
|
|
|
.line 131
|
|
.line 132
|
|
.line 133
|
|
:cond_7
|
|
invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
|
|
|
|
.line 134
|
|
.line 135
|
|
.line 136
|
|
move-result-object v0
|
|
|
|
.line 137
|
|
return-object v0
|
|
.end method
|