* 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>
578 lines
11 KiB
Smali
578 lines
11 KiB
Smali
.class public Lokhttp3/Request$Builder;
|
|
.super Ljava/lang/Object;
|
|
.source "SourceFile"
|
|
|
|
|
|
# annotations
|
|
.annotation system Ldalvik/annotation/EnclosingClass;
|
|
value = Lokhttp3/Request;
|
|
.end annotation
|
|
|
|
.annotation system Ldalvik/annotation/InnerClass;
|
|
accessFlags = 0x9
|
|
name = "Builder"
|
|
.end annotation
|
|
|
|
.annotation runtime Lkotlin/Metadata;
|
|
d1 = {
|
|
"\u0000\n\n\u0002\u0018\u0002\n\u0002\u0010\u0000\n\u0000\u0008\u0016\u0018\u00002\u00020\u0001\u00a8\u0006\u0002"
|
|
}
|
|
d2 = {
|
|
"Lokhttp3/Request$Builder;",
|
|
"",
|
|
"okhttp"
|
|
}
|
|
k = 0x1
|
|
mv = {
|
|
0x2,
|
|
0x2,
|
|
0x0
|
|
}
|
|
xi = 0x30
|
|
.end annotation
|
|
|
|
|
|
# instance fields
|
|
.field public a:Lokhttp3/HttpUrl;
|
|
|
|
.field public b:Ljava/lang/String;
|
|
|
|
.field public c:Lokhttp3/Headers$Builder;
|
|
|
|
.field public d:Lokhttp3/RequestBody;
|
|
|
|
.field public e:Lokhttp3/internal/EmptyTags;
|
|
|
|
|
|
# direct methods
|
|
.method public constructor <init>()V
|
|
.locals 1
|
|
|
|
.line 1
|
|
invoke-direct {p0}, Ljava/lang/Object;-><init>()V
|
|
|
|
.line 2
|
|
.line 3
|
|
.line 4
|
|
sget-object v0, Lokhttp3/internal/EmptyTags;->a:Lokhttp3/internal/EmptyTags;
|
|
|
|
.line 5
|
|
.line 6
|
|
iput-object v0, p0, Lokhttp3/Request$Builder;->e:Lokhttp3/internal/EmptyTags;
|
|
|
|
.line 7
|
|
.line 8
|
|
const-string v0, "GET"
|
|
|
|
.line 9
|
|
.line 10
|
|
iput-object v0, p0, Lokhttp3/Request$Builder;->b:Ljava/lang/String;
|
|
|
|
.line 11
|
|
.line 12
|
|
new-instance v0, Lokhttp3/Headers$Builder;
|
|
|
|
.line 13
|
|
.line 14
|
|
invoke-direct {v0}, Lokhttp3/Headers$Builder;-><init>()V
|
|
|
|
.line 15
|
|
.line 16
|
|
.line 17
|
|
iput-object v0, p0, Lokhttp3/Request$Builder;->c:Lokhttp3/Headers$Builder;
|
|
|
|
.line 18
|
|
.line 19
|
|
return-void
|
|
.end method
|
|
|
|
|
|
# virtual methods
|
|
.method public final a(Ljava/lang/String;Ljava/lang/String;)V
|
|
.locals 1
|
|
|
|
.line 1
|
|
const-string v0, "name"
|
|
|
|
.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, "value"
|
|
|
|
.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
|
|
iget-object v0, p0, Lokhttp3/Request$Builder;->c:Lokhttp3/Headers$Builder;
|
|
|
|
.line 12
|
|
.line 13
|
|
invoke-virtual {v0, p1, p2}, Lokhttp3/Headers$Builder;->d(Ljava/lang/String;Ljava/lang/String;)V
|
|
|
|
.line 14
|
|
.line 15
|
|
.line 16
|
|
return-void
|
|
.end method
|
|
|
|
.method public final b(Ljava/lang/String;Lokhttp3/RequestBody;)V
|
|
.locals 2
|
|
|
|
.line 1
|
|
const-string v0, "method"
|
|
|
|
.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
|
|
invoke-virtual {p1}, Ljava/lang/String;->length()I
|
|
|
|
.line 7
|
|
.line 8
|
|
.line 9
|
|
move-result v1
|
|
|
|
.line 10
|
|
if-lez v1, :cond_3
|
|
|
|
.line 11
|
|
.line 12
|
|
const-string v1, "method "
|
|
|
|
.line 13
|
|
.line 14
|
|
if-nez p2, :cond_1
|
|
|
|
.line 15
|
|
.line 16
|
|
invoke-static {p1, v0}, Lkotlin/jvm/internal/Intrinsics;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
|
|
|
|
.line 17
|
|
.line 18
|
|
.line 19
|
|
const-string v0, "POST"
|
|
|
|
.line 20
|
|
.line 21
|
|
invoke-static {p1, v0}, Lkotlin/jvm/internal/Intrinsics;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
|
|
|
|
.line 22
|
|
.line 23
|
|
.line 24
|
|
move-result v0
|
|
|
|
.line 25
|
|
if-nez v0, :cond_0
|
|
|
|
.line 26
|
|
.line 27
|
|
const-string v0, "PUT"
|
|
|
|
.line 28
|
|
.line 29
|
|
invoke-static {p1, v0}, Lkotlin/jvm/internal/Intrinsics;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
|
|
|
|
.line 30
|
|
.line 31
|
|
.line 32
|
|
move-result v0
|
|
|
|
.line 33
|
|
if-nez v0, :cond_0
|
|
|
|
.line 34
|
|
.line 35
|
|
const-string v0, "PATCH"
|
|
|
|
.line 36
|
|
.line 37
|
|
invoke-static {p1, v0}, Lkotlin/jvm/internal/Intrinsics;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
|
|
|
|
.line 38
|
|
.line 39
|
|
.line 40
|
|
move-result v0
|
|
|
|
.line 41
|
|
if-nez v0, :cond_0
|
|
|
|
.line 42
|
|
.line 43
|
|
const-string v0, "PROPPATCH"
|
|
|
|
.line 44
|
|
.line 45
|
|
invoke-static {p1, v0}, Lkotlin/jvm/internal/Intrinsics;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
|
|
|
|
.line 46
|
|
.line 47
|
|
.line 48
|
|
move-result v0
|
|
|
|
.line 49
|
|
if-nez v0, :cond_0
|
|
|
|
.line 50
|
|
.line 51
|
|
const-string v0, "QUERY"
|
|
|
|
.line 52
|
|
.line 53
|
|
invoke-static {p1, v0}, Lkotlin/jvm/internal/Intrinsics;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
|
|
|
|
.line 54
|
|
.line 55
|
|
.line 56
|
|
move-result v0
|
|
|
|
.line 57
|
|
if-nez v0, :cond_0
|
|
|
|
.line 58
|
|
.line 59
|
|
const-string v0, "REPORT"
|
|
|
|
.line 60
|
|
.line 61
|
|
invoke-static {p1, v0}, Lkotlin/jvm/internal/Intrinsics;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
|
|
|
|
.line 62
|
|
.line 63
|
|
.line 64
|
|
move-result v0
|
|
|
|
.line 65
|
|
if-nez v0, :cond_0
|
|
|
|
.line 66
|
|
.line 67
|
|
goto :goto_0
|
|
|
|
.line 68
|
|
:cond_0
|
|
const-string p2, " must have a request body."
|
|
|
|
.line 69
|
|
.line 70
|
|
invoke-static {v1, p1, p2}, Landroid/support/v4/media/a;->l(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
|
|
|
|
.line 71
|
|
.line 72
|
|
.line 73
|
|
move-result-object p1
|
|
|
|
.line 74
|
|
new-instance p2, Ljava/lang/IllegalArgumentException;
|
|
|
|
.line 75
|
|
.line 76
|
|
invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
|
|
|
|
.line 77
|
|
.line 78
|
|
.line 79
|
|
move-result-object p1
|
|
|
|
.line 80
|
|
invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
|
|
|
|
.line 81
|
|
.line 82
|
|
.line 83
|
|
throw p2
|
|
|
|
.line 84
|
|
:cond_1
|
|
invoke-static {p1}, Lokhttp3/internal/http/HttpMethod;->a(Ljava/lang/String;)Z
|
|
|
|
.line 85
|
|
.line 86
|
|
.line 87
|
|
move-result v0
|
|
|
|
.line 88
|
|
if-eqz v0, :cond_2
|
|
|
|
.line 89
|
|
.line 90
|
|
:goto_0
|
|
iput-object p1, p0, Lokhttp3/Request$Builder;->b:Ljava/lang/String;
|
|
|
|
.line 91
|
|
.line 92
|
|
iput-object p2, p0, Lokhttp3/Request$Builder;->d:Lokhttp3/RequestBody;
|
|
|
|
.line 93
|
|
.line 94
|
|
return-void
|
|
|
|
.line 95
|
|
:cond_2
|
|
const-string p2, " must not have a request body."
|
|
|
|
.line 96
|
|
.line 97
|
|
invoke-static {v1, p1, p2}, Landroid/support/v4/media/a;->l(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
|
|
|
|
.line 98
|
|
.line 99
|
|
.line 100
|
|
move-result-object p1
|
|
|
|
.line 101
|
|
new-instance p2, Ljava/lang/IllegalArgumentException;
|
|
|
|
.line 102
|
|
.line 103
|
|
invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
|
|
|
|
.line 104
|
|
.line 105
|
|
.line 106
|
|
move-result-object p1
|
|
|
|
.line 107
|
|
invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
|
|
|
|
.line 108
|
|
.line 109
|
|
.line 110
|
|
throw p2
|
|
|
|
.line 111
|
|
:cond_3
|
|
new-instance p1, Ljava/lang/IllegalArgumentException;
|
|
|
|
.line 112
|
|
.line 113
|
|
const-string p2, "method.isEmpty() == true"
|
|
|
|
.line 114
|
|
.line 115
|
|
invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
|
|
|
|
.line 116
|
|
.line 117
|
|
.line 118
|
|
throw p1
|
|
.end method
|
|
|
|
.method public final c(Ljava/lang/String;)V
|
|
.locals 1
|
|
|
|
.line 1
|
|
const-string v0, "name"
|
|
|
|
.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-object v0, p0, Lokhttp3/Request$Builder;->c:Lokhttp3/Headers$Builder;
|
|
|
|
.line 7
|
|
.line 8
|
|
invoke-virtual {v0, p1}, Lokhttp3/Headers$Builder;->c(Ljava/lang/String;)V
|
|
|
|
.line 9
|
|
.line 10
|
|
.line 11
|
|
return-void
|
|
.end method
|
|
|
|
.method public final d(Ljava/lang/String;)V
|
|
.locals 4
|
|
|
|
.line 1
|
|
const-string v0, "url"
|
|
|
|
.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 v1, "ws:"
|
|
|
|
.line 7
|
|
.line 8
|
|
invoke-static {p1, v1}, Lkotlin/text/StringsKt;->H(Ljava/lang/String;Ljava/lang/String;)Z
|
|
|
|
.line 9
|
|
.line 10
|
|
.line 11
|
|
move-result v1
|
|
|
|
.line 12
|
|
const-string v2, "substring(...)"
|
|
|
|
.line 13
|
|
.line 14
|
|
if-eqz v1, :cond_0
|
|
|
|
.line 15
|
|
.line 16
|
|
new-instance v1, Ljava/lang/StringBuilder;
|
|
|
|
.line 17
|
|
.line 18
|
|
const-string v3, "http:"
|
|
|
|
.line 19
|
|
.line 20
|
|
invoke-direct {v1, v3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
|
|
|
|
.line 21
|
|
.line 22
|
|
.line 23
|
|
const/4 v3, 0x3
|
|
|
|
.line 24
|
|
invoke-virtual {p1, v3}, Ljava/lang/String;->substring(I)Ljava/lang/String;
|
|
|
|
.line 25
|
|
.line 26
|
|
.line 27
|
|
move-result-object p1
|
|
|
|
.line 28
|
|
invoke-static {p1, v2}, Lkotlin/jvm/internal/Intrinsics;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
|
|
|
|
.line 29
|
|
.line 30
|
|
.line 31
|
|
invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
|
|
|
.line 32
|
|
.line 33
|
|
.line 34
|
|
invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
|
|
|
|
.line 35
|
|
.line 36
|
|
.line 37
|
|
move-result-object p1
|
|
|
|
.line 38
|
|
goto :goto_0
|
|
|
|
.line 39
|
|
:cond_0
|
|
const-string v1, "wss:"
|
|
|
|
.line 40
|
|
.line 41
|
|
invoke-static {p1, v1}, Lkotlin/text/StringsKt;->H(Ljava/lang/String;Ljava/lang/String;)Z
|
|
|
|
.line 42
|
|
.line 43
|
|
.line 44
|
|
move-result v1
|
|
|
|
.line 45
|
|
if-eqz v1, :cond_1
|
|
|
|
.line 46
|
|
.line 47
|
|
new-instance v1, Ljava/lang/StringBuilder;
|
|
|
|
.line 48
|
|
.line 49
|
|
const-string v3, "https:"
|
|
|
|
.line 50
|
|
.line 51
|
|
invoke-direct {v1, v3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
|
|
|
|
.line 52
|
|
.line 53
|
|
.line 54
|
|
const/4 v3, 0x4
|
|
|
|
.line 55
|
|
invoke-virtual {p1, v3}, Ljava/lang/String;->substring(I)Ljava/lang/String;
|
|
|
|
.line 56
|
|
.line 57
|
|
.line 58
|
|
move-result-object p1
|
|
|
|
.line 59
|
|
invoke-static {p1, v2}, Lkotlin/jvm/internal/Intrinsics;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
|
|
|
|
.line 60
|
|
.line 61
|
|
.line 62
|
|
invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
|
|
|
.line 63
|
|
.line 64
|
|
.line 65
|
|
invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
|
|
|
|
.line 66
|
|
.line 67
|
|
.line 68
|
|
move-result-object p1
|
|
|
|
.line 69
|
|
:cond_1
|
|
:goto_0
|
|
const-string v1, "<this>"
|
|
|
|
.line 70
|
|
.line 71
|
|
invoke-static {p1, v1}, Lkotlin/jvm/internal/Intrinsics;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
|
|
|
|
.line 72
|
|
.line 73
|
|
.line 74
|
|
new-instance v1, Lokhttp3/HttpUrl$Builder;
|
|
|
|
.line 75
|
|
.line 76
|
|
invoke-direct {v1}, Lokhttp3/HttpUrl$Builder;-><init>()V
|
|
|
|
.line 77
|
|
.line 78
|
|
.line 79
|
|
const/4 v2, 0x0
|
|
|
|
.line 80
|
|
invoke-virtual {v1, v2, p1}, Lokhttp3/HttpUrl$Builder;->b(Lokhttp3/HttpUrl;Ljava/lang/String;)V
|
|
|
|
.line 81
|
|
.line 82
|
|
.line 83
|
|
invoke-virtual {v1}, Lokhttp3/HttpUrl$Builder;->a()Lokhttp3/HttpUrl;
|
|
|
|
.line 84
|
|
.line 85
|
|
.line 86
|
|
move-result-object p1
|
|
|
|
.line 87
|
|
invoke-static {p1, v0}, Lkotlin/jvm/internal/Intrinsics;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
|
|
|
|
.line 88
|
|
.line 89
|
|
.line 90
|
|
iput-object p1, p0, Lokhttp3/Request$Builder;->a:Lokhttp3/HttpUrl;
|
|
|
|
.line 91
|
|
.line 92
|
|
return-void
|
|
.end method
|