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>
273 lines
6.4 KiB
Smali
273 lines
6.4 KiB
Smali
.class public final Lokhttp3/internal/platform/android/DeferredSocketAdapter;
|
|
.super Ljava/lang/Object;
|
|
.source "SourceFile"
|
|
|
|
# interfaces
|
|
.implements Lokhttp3/internal/platform/android/SocketAdapter;
|
|
|
|
|
|
# annotations
|
|
.annotation system Ldalvik/annotation/MemberClasses;
|
|
value = {
|
|
Lokhttp3/internal/platform/android/DeferredSocketAdapter$Factory;
|
|
}
|
|
.end annotation
|
|
|
|
.annotation runtime Lkotlin/Metadata;
|
|
d1 = {
|
|
"\u0000\u000c\n\u0002\u0018\u0002\n\u0002\u0018\u0002\n\u0002\u0008\u0002\u0018\u00002\u00020\u0001:\u0001\u0002\u00a8\u0006\u0003"
|
|
}
|
|
d2 = {
|
|
"Lokhttp3/internal/platform/android/DeferredSocketAdapter;",
|
|
"Lokhttp3/internal/platform/android/SocketAdapter;",
|
|
"Factory",
|
|
"okhttp"
|
|
}
|
|
k = 0x1
|
|
mv = {
|
|
0x2,
|
|
0x2,
|
|
0x0
|
|
}
|
|
xi = 0x30
|
|
.end annotation
|
|
|
|
|
|
# instance fields
|
|
.field public final a:Lokhttp3/internal/platform/android/DeferredSocketAdapter$Factory;
|
|
|
|
.field public b:Lokhttp3/internal/platform/android/SocketAdapter;
|
|
|
|
|
|
# direct methods
|
|
.method public constructor <init>(Lokhttp3/internal/platform/android/DeferredSocketAdapter$Factory;)V
|
|
.locals 1
|
|
|
|
.line 1
|
|
const-string v0, "socketAdapterFactory"
|
|
|
|
.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-direct {p0}, Ljava/lang/Object;-><init>()V
|
|
|
|
.line 7
|
|
.line 8
|
|
.line 9
|
|
iput-object p1, p0, Lokhttp3/internal/platform/android/DeferredSocketAdapter;->a:Lokhttp3/internal/platform/android/DeferredSocketAdapter$Factory;
|
|
|
|
.line 10
|
|
.line 11
|
|
return-void
|
|
.end method
|
|
|
|
|
|
# virtual methods
|
|
.method public final a()Z
|
|
.locals 1
|
|
|
|
.line 1
|
|
const/4 v0, 0x1
|
|
|
|
return v0
|
|
.end method
|
|
|
|
.method public final b(Ljavax/net/ssl/SSLSocket;)Z
|
|
.locals 1
|
|
|
|
.line 1
|
|
const-string v0, "sslSocket"
|
|
|
|
.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/internal/platform/android/DeferredSocketAdapter;->a:Lokhttp3/internal/platform/android/DeferredSocketAdapter$Factory;
|
|
|
|
.line 7
|
|
.line 8
|
|
invoke-interface {v0, p1}, Lokhttp3/internal/platform/android/DeferredSocketAdapter$Factory;->b(Ljavax/net/ssl/SSLSocket;)Z
|
|
|
|
.line 9
|
|
.line 10
|
|
.line 11
|
|
move-result p1
|
|
|
|
.line 12
|
|
return p1
|
|
.end method
|
|
|
|
.method public final c(Ljavax/net/ssl/SSLSocket;)Ljava/lang/String;
|
|
.locals 1
|
|
|
|
.line 1
|
|
const-string v0, "sslSocket"
|
|
|
|
.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 {p0, p1}, Lokhttp3/internal/platform/android/DeferredSocketAdapter;->e(Ljavax/net/ssl/SSLSocket;)Lokhttp3/internal/platform/android/SocketAdapter;
|
|
|
|
.line 7
|
|
.line 8
|
|
.line 9
|
|
move-result-object v0
|
|
|
|
.line 10
|
|
if-eqz v0, :cond_0
|
|
|
|
.line 11
|
|
.line 12
|
|
invoke-interface {v0, p1}, Lokhttp3/internal/platform/android/SocketAdapter;->c(Ljavax/net/ssl/SSLSocket;)Ljava/lang/String;
|
|
|
|
.line 13
|
|
.line 14
|
|
.line 15
|
|
move-result-object p1
|
|
|
|
.line 16
|
|
return-object p1
|
|
|
|
.line 17
|
|
:cond_0
|
|
const/4 p1, 0x0
|
|
|
|
.line 18
|
|
return-object p1
|
|
.end method
|
|
|
|
.method public final d(Ljavax/net/ssl/SSLSocket;Ljava/lang/String;Ljava/util/List;)V
|
|
.locals 1
|
|
|
|
.line 1
|
|
const-string v0, "sslSocket"
|
|
|
|
.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, "protocols"
|
|
|
|
.line 7
|
|
.line 8
|
|
invoke-static {p3, v0}, Lkotlin/jvm/internal/Intrinsics;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
|
|
|
|
.line 9
|
|
.line 10
|
|
.line 11
|
|
invoke-virtual {p0, p1}, Lokhttp3/internal/platform/android/DeferredSocketAdapter;->e(Ljavax/net/ssl/SSLSocket;)Lokhttp3/internal/platform/android/SocketAdapter;
|
|
|
|
.line 12
|
|
.line 13
|
|
.line 14
|
|
move-result-object v0
|
|
|
|
.line 15
|
|
if-eqz v0, :cond_0
|
|
|
|
.line 16
|
|
.line 17
|
|
invoke-interface {v0, p1, p2, p3}, Lokhttp3/internal/platform/android/SocketAdapter;->d(Ljavax/net/ssl/SSLSocket;Ljava/lang/String;Ljava/util/List;)V
|
|
|
|
.line 18
|
|
.line 19
|
|
.line 20
|
|
:cond_0
|
|
return-void
|
|
.end method
|
|
|
|
.method public final declared-synchronized e(Ljavax/net/ssl/SSLSocket;)Lokhttp3/internal/platform/android/SocketAdapter;
|
|
.locals 1
|
|
|
|
.line 1
|
|
monitor-enter p0
|
|
|
|
.line 2
|
|
:try_start_0
|
|
iget-object v0, p0, Lokhttp3/internal/platform/android/DeferredSocketAdapter;->b:Lokhttp3/internal/platform/android/SocketAdapter;
|
|
|
|
.line 3
|
|
.line 4
|
|
if-nez v0, :cond_0
|
|
|
|
.line 5
|
|
.line 6
|
|
iget-object v0, p0, Lokhttp3/internal/platform/android/DeferredSocketAdapter;->a:Lokhttp3/internal/platform/android/DeferredSocketAdapter$Factory;
|
|
|
|
.line 7
|
|
.line 8
|
|
invoke-interface {v0, p1}, Lokhttp3/internal/platform/android/DeferredSocketAdapter$Factory;->b(Ljavax/net/ssl/SSLSocket;)Z
|
|
|
|
.line 9
|
|
.line 10
|
|
.line 11
|
|
move-result v0
|
|
|
|
.line 12
|
|
if-eqz v0, :cond_0
|
|
|
|
.line 13
|
|
.line 14
|
|
iget-object v0, p0, Lokhttp3/internal/platform/android/DeferredSocketAdapter;->a:Lokhttp3/internal/platform/android/DeferredSocketAdapter$Factory;
|
|
|
|
.line 15
|
|
.line 16
|
|
invoke-interface {v0, p1}, Lokhttp3/internal/platform/android/DeferredSocketAdapter$Factory;->c(Ljavax/net/ssl/SSLSocket;)Lokhttp3/internal/platform/android/SocketAdapter;
|
|
|
|
.line 17
|
|
.line 18
|
|
.line 19
|
|
move-result-object p1
|
|
|
|
.line 20
|
|
iput-object p1, p0, Lokhttp3/internal/platform/android/DeferredSocketAdapter;->b:Lokhttp3/internal/platform/android/SocketAdapter;
|
|
|
|
.line 21
|
|
.line 22
|
|
goto :goto_0
|
|
|
|
.line 23
|
|
:catchall_0
|
|
move-exception p1
|
|
|
|
.line 24
|
|
goto :goto_1
|
|
|
|
.line 25
|
|
:cond_0
|
|
:goto_0
|
|
iget-object p1, p0, Lokhttp3/internal/platform/android/DeferredSocketAdapter;->b:Lokhttp3/internal/platform/android/SocketAdapter;
|
|
:try_end_0
|
|
.catchall {:try_start_0 .. :try_end_0} :catchall_0
|
|
|
|
.line 26
|
|
.line 27
|
|
monitor-exit p0
|
|
|
|
.line 28
|
|
return-object p1
|
|
|
|
.line 29
|
|
:goto_1
|
|
:try_start_1
|
|
monitor-exit p0
|
|
:try_end_1
|
|
.catchall {:try_start_1 .. :try_end_1} :catchall_0
|
|
|
|
.line 30
|
|
throw p1
|
|
.end method
|