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>
534 lines
10 KiB
Smali
534 lines
10 KiB
Smali
.class public final Lokhttp3/ConnectionSpec$Builder;
|
|
.super Ljava/lang/Object;
|
|
.source "SourceFile"
|
|
|
|
|
|
# annotations
|
|
.annotation system Ldalvik/annotation/EnclosingClass;
|
|
value = Lokhttp3/ConnectionSpec;
|
|
.end annotation
|
|
|
|
.annotation system Ldalvik/annotation/InnerClass;
|
|
accessFlags = 0x19
|
|
name = "Builder"
|
|
.end annotation
|
|
|
|
.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/ConnectionSpec$Builder;",
|
|
"",
|
|
"okhttp"
|
|
}
|
|
k = 0x1
|
|
mv = {
|
|
0x2,
|
|
0x2,
|
|
0x0
|
|
}
|
|
xi = 0x30
|
|
.end annotation
|
|
|
|
.annotation build Lkotlin/jvm/internal/SourceDebugExtension;
|
|
value = {
|
|
"SMAP\nConnectionSpec.kt\nKotlin\n*S Kotlin\n*F\n+ 1 ConnectionSpec.kt\nokhttp3/ConnectionSpec$Builder\n+ 2 fake.kt\nkotlin/jvm/internal/FakeKt\n+ 3 _Arrays.kt\nkotlin/collections/ArraysKt___ArraysKt\n+ 4 ArraysJVM.kt\nkotlin/collections/ArraysKt__ArraysJVMKt\n*L\n1#1,384:1\n1#2:385\n11561#3:386\n11896#3,3:387\n11561#3:392\n11896#3,3:393\n37#4,2:390\n37#4,2:396\n*S KotlinDebug\n*F\n+ 1 ConnectionSpec.kt\nokhttp3/ConnectionSpec$Builder\n*L\n247#1:386\n247#1:387,3\n269#1:392\n269#1:393,3\n247#1:390,2\n269#1:396,2\n*E\n"
|
|
}
|
|
.end annotation
|
|
|
|
|
|
# instance fields
|
|
.field public a:Z
|
|
|
|
.field public b:[Ljava/lang/String;
|
|
|
|
.field public c:[Ljava/lang/String;
|
|
|
|
.field public d:Z
|
|
|
|
|
|
# direct methods
|
|
.method public constructor <init>(Z)V
|
|
.locals 0
|
|
|
|
.line 1
|
|
invoke-direct {p0}, Ljava/lang/Object;-><init>()V
|
|
|
|
.line 2
|
|
.line 3
|
|
.line 4
|
|
iput-boolean p1, p0, Lokhttp3/ConnectionSpec$Builder;->a:Z
|
|
|
|
.line 5
|
|
.line 6
|
|
return-void
|
|
.end method
|
|
|
|
|
|
# virtual methods
|
|
.method public final a()Lokhttp3/ConnectionSpec;
|
|
.locals 5
|
|
|
|
.line 1
|
|
new-instance v0, Lokhttp3/ConnectionSpec;
|
|
|
|
.line 2
|
|
.line 3
|
|
iget-boolean v1, p0, Lokhttp3/ConnectionSpec$Builder;->a:Z
|
|
|
|
.line 4
|
|
.line 5
|
|
iget-boolean v2, p0, Lokhttp3/ConnectionSpec$Builder;->d:Z
|
|
|
|
.line 6
|
|
.line 7
|
|
iget-object v3, p0, Lokhttp3/ConnectionSpec$Builder;->b:[Ljava/lang/String;
|
|
|
|
.line 8
|
|
.line 9
|
|
iget-object v4, p0, Lokhttp3/ConnectionSpec$Builder;->c:[Ljava/lang/String;
|
|
|
|
.line 10
|
|
.line 11
|
|
invoke-direct {v0, v1, v2, v3, v4}, Lokhttp3/ConnectionSpec;-><init>(ZZ[Ljava/lang/String;[Ljava/lang/String;)V
|
|
|
|
.line 12
|
|
.line 13
|
|
.line 14
|
|
return-object v0
|
|
.end method
|
|
|
|
.method public final varargs b([Ljava/lang/String;)V
|
|
.locals 1
|
|
|
|
.line 1
|
|
const-string v0, "cipherSuites"
|
|
|
|
.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
|
|
iget-boolean v0, p0, Lokhttp3/ConnectionSpec$Builder;->a:Z
|
|
|
|
.line 7
|
|
.line 8
|
|
if-eqz v0, :cond_1
|
|
|
|
.line 9
|
|
.line 10
|
|
array-length v0, p1
|
|
|
|
.line 11
|
|
if-eqz v0, :cond_0
|
|
|
|
.line 12
|
|
.line 13
|
|
array-length v0, p1
|
|
|
|
.line 14
|
|
invoke-static {p1, v0}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
|
|
|
|
.line 15
|
|
.line 16
|
|
.line 17
|
|
move-result-object p1
|
|
|
|
.line 18
|
|
const-string v0, "copyOf(...)"
|
|
|
|
.line 19
|
|
.line 20
|
|
invoke-static {p1, v0}, Lkotlin/jvm/internal/Intrinsics;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
|
|
|
|
.line 21
|
|
.line 22
|
|
.line 23
|
|
check-cast p1, [Ljava/lang/String;
|
|
|
|
.line 24
|
|
.line 25
|
|
iput-object p1, p0, Lokhttp3/ConnectionSpec$Builder;->b:[Ljava/lang/String;
|
|
|
|
.line 26
|
|
.line 27
|
|
return-void
|
|
|
|
.line 28
|
|
:cond_0
|
|
new-instance p1, Ljava/lang/IllegalArgumentException;
|
|
|
|
.line 29
|
|
.line 30
|
|
const-string v0, "At least one cipher suite is required"
|
|
|
|
.line 31
|
|
.line 32
|
|
invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
|
|
|
|
.line 33
|
|
.line 34
|
|
.line 35
|
|
throw p1
|
|
|
|
.line 36
|
|
:cond_1
|
|
new-instance p1, Ljava/lang/IllegalArgumentException;
|
|
|
|
.line 37
|
|
.line 38
|
|
const-string v0, "no cipher suites for cleartext connections"
|
|
|
|
.line 39
|
|
.line 40
|
|
invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
|
|
|
|
.line 41
|
|
.line 42
|
|
.line 43
|
|
throw p1
|
|
.end method
|
|
|
|
.method public final varargs c([Lokhttp3/CipherSuite;)V
|
|
.locals 5
|
|
|
|
.line 1
|
|
const-string v0, "cipherSuites"
|
|
|
|
.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
|
|
iget-boolean v0, p0, Lokhttp3/ConnectionSpec$Builder;->a:Z
|
|
|
|
.line 7
|
|
.line 8
|
|
if-eqz v0, :cond_1
|
|
|
|
.line 9
|
|
.line 10
|
|
new-instance v0, Ljava/util/ArrayList;
|
|
|
|
.line 11
|
|
.line 12
|
|
array-length v1, p1
|
|
|
|
.line 13
|
|
invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(I)V
|
|
|
|
.line 14
|
|
.line 15
|
|
.line 16
|
|
array-length v1, p1
|
|
|
|
.line 17
|
|
const/4 v2, 0x0
|
|
|
|
.line 18
|
|
move v3, v2
|
|
|
|
.line 19
|
|
:goto_0
|
|
if-ge v3, v1, :cond_0
|
|
|
|
.line 20
|
|
.line 21
|
|
aget-object v4, p1, v3
|
|
|
|
.line 22
|
|
.line 23
|
|
iget-object v4, v4, Lokhttp3/CipherSuite;->a:Ljava/lang/String;
|
|
|
|
.line 24
|
|
.line 25
|
|
invoke-virtual {v0, v4}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
|
|
|
|
.line 26
|
|
.line 27
|
|
.line 28
|
|
add-int/lit8 v3, v3, 0x1
|
|
|
|
.line 29
|
|
.line 30
|
|
goto :goto_0
|
|
|
|
.line 31
|
|
:cond_0
|
|
new-array p1, v2, [Ljava/lang/String;
|
|
|
|
.line 32
|
|
.line 33
|
|
invoke-virtual {v0, p1}, Ljava/util/ArrayList;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
|
|
|
|
.line 34
|
|
.line 35
|
|
.line 36
|
|
move-result-object p1
|
|
|
|
.line 37
|
|
check-cast p1, [Ljava/lang/String;
|
|
|
|
.line 38
|
|
.line 39
|
|
array-length v0, p1
|
|
|
|
.line 40
|
|
invoke-static {p1, v0}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
|
|
|
|
.line 41
|
|
.line 42
|
|
.line 43
|
|
move-result-object p1
|
|
|
|
.line 44
|
|
check-cast p1, [Ljava/lang/String;
|
|
|
|
.line 45
|
|
.line 46
|
|
invoke-virtual {p0, p1}, Lokhttp3/ConnectionSpec$Builder;->b([Ljava/lang/String;)V
|
|
|
|
.line 47
|
|
.line 48
|
|
.line 49
|
|
return-void
|
|
|
|
.line 50
|
|
:cond_1
|
|
new-instance p1, Ljava/lang/IllegalArgumentException;
|
|
|
|
.line 51
|
|
.line 52
|
|
const-string v0, "no cipher suites for cleartext connections"
|
|
|
|
.line 53
|
|
.line 54
|
|
invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
|
|
|
|
.line 55
|
|
.line 56
|
|
.line 57
|
|
throw p1
|
|
.end method
|
|
|
|
.method public final varargs d([Ljava/lang/String;)V
|
|
.locals 1
|
|
|
|
.line 1
|
|
const-string v0, "tlsVersions"
|
|
|
|
.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
|
|
iget-boolean v0, p0, Lokhttp3/ConnectionSpec$Builder;->a:Z
|
|
|
|
.line 7
|
|
.line 8
|
|
if-eqz v0, :cond_1
|
|
|
|
.line 9
|
|
.line 10
|
|
array-length v0, p1
|
|
|
|
.line 11
|
|
if-eqz v0, :cond_0
|
|
|
|
.line 12
|
|
.line 13
|
|
array-length v0, p1
|
|
|
|
.line 14
|
|
invoke-static {p1, v0}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
|
|
|
|
.line 15
|
|
.line 16
|
|
.line 17
|
|
move-result-object p1
|
|
|
|
.line 18
|
|
const-string v0, "copyOf(...)"
|
|
|
|
.line 19
|
|
.line 20
|
|
invoke-static {p1, v0}, Lkotlin/jvm/internal/Intrinsics;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
|
|
|
|
.line 21
|
|
.line 22
|
|
.line 23
|
|
check-cast p1, [Ljava/lang/String;
|
|
|
|
.line 24
|
|
.line 25
|
|
iput-object p1, p0, Lokhttp3/ConnectionSpec$Builder;->c:[Ljava/lang/String;
|
|
|
|
.line 26
|
|
.line 27
|
|
return-void
|
|
|
|
.line 28
|
|
:cond_0
|
|
new-instance p1, Ljava/lang/IllegalArgumentException;
|
|
|
|
.line 29
|
|
.line 30
|
|
const-string v0, "At least one TLS version is required"
|
|
|
|
.line 31
|
|
.line 32
|
|
invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
|
|
|
|
.line 33
|
|
.line 34
|
|
.line 35
|
|
throw p1
|
|
|
|
.line 36
|
|
:cond_1
|
|
new-instance p1, Ljava/lang/IllegalArgumentException;
|
|
|
|
.line 37
|
|
.line 38
|
|
const-string v0, "no TLS versions for cleartext connections"
|
|
|
|
.line 39
|
|
.line 40
|
|
invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
|
|
|
|
.line 41
|
|
.line 42
|
|
.line 43
|
|
throw p1
|
|
.end method
|
|
|
|
.method public final varargs e([Lokhttp3/TlsVersion;)V
|
|
.locals 5
|
|
|
|
.line 1
|
|
const-string v0, "tlsVersions"
|
|
|
|
.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
|
|
iget-boolean v0, p0, Lokhttp3/ConnectionSpec$Builder;->a:Z
|
|
|
|
.line 7
|
|
.line 8
|
|
if-eqz v0, :cond_1
|
|
|
|
.line 9
|
|
.line 10
|
|
new-instance v0, Ljava/util/ArrayList;
|
|
|
|
.line 11
|
|
.line 12
|
|
array-length v1, p1
|
|
|
|
.line 13
|
|
invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(I)V
|
|
|
|
.line 14
|
|
.line 15
|
|
.line 16
|
|
array-length v1, p1
|
|
|
|
.line 17
|
|
const/4 v2, 0x0
|
|
|
|
.line 18
|
|
move v3, v2
|
|
|
|
.line 19
|
|
:goto_0
|
|
if-ge v3, v1, :cond_0
|
|
|
|
.line 20
|
|
.line 21
|
|
aget-object v4, p1, v3
|
|
|
|
.line 22
|
|
.line 23
|
|
iget-object v4, v4, Lokhttp3/TlsVersion;->c:Ljava/lang/String;
|
|
|
|
.line 24
|
|
.line 25
|
|
invoke-virtual {v0, v4}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
|
|
|
|
.line 26
|
|
.line 27
|
|
.line 28
|
|
add-int/lit8 v3, v3, 0x1
|
|
|
|
.line 29
|
|
.line 30
|
|
goto :goto_0
|
|
|
|
.line 31
|
|
:cond_0
|
|
new-array p1, v2, [Ljava/lang/String;
|
|
|
|
.line 32
|
|
.line 33
|
|
invoke-virtual {v0, p1}, Ljava/util/ArrayList;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
|
|
|
|
.line 34
|
|
.line 35
|
|
.line 36
|
|
move-result-object p1
|
|
|
|
.line 37
|
|
check-cast p1, [Ljava/lang/String;
|
|
|
|
.line 38
|
|
.line 39
|
|
array-length v0, p1
|
|
|
|
.line 40
|
|
invoke-static {p1, v0}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
|
|
|
|
.line 41
|
|
.line 42
|
|
.line 43
|
|
move-result-object p1
|
|
|
|
.line 44
|
|
check-cast p1, [Ljava/lang/String;
|
|
|
|
.line 45
|
|
.line 46
|
|
invoke-virtual {p0, p1}, Lokhttp3/ConnectionSpec$Builder;->d([Ljava/lang/String;)V
|
|
|
|
.line 47
|
|
.line 48
|
|
.line 49
|
|
return-void
|
|
|
|
.line 50
|
|
:cond_1
|
|
new-instance p1, Ljava/lang/IllegalArgumentException;
|
|
|
|
.line 51
|
|
.line 52
|
|
const-string v0, "no TLS versions for cleartext connections"
|
|
|
|
.line 53
|
|
.line 54
|
|
invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
|
|
|
|
.line 55
|
|
.line 56
|
|
.line 57
|
|
throw p1
|
|
.end method
|