* 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>
317 lines
6.5 KiB
Smali
317 lines
6.5 KiB
Smali
.class public abstract Lokhttp3/internal/publicsuffix/BasePublicSuffixList;
|
|
.super Ljava/lang/Object;
|
|
.source "SourceFile"
|
|
|
|
# interfaces
|
|
.implements Lokhttp3/internal/publicsuffix/PublicSuffixList;
|
|
|
|
|
|
# annotations
|
|
.annotation runtime Lkotlin/Metadata;
|
|
d1 = {
|
|
"\u0000\n\n\u0002\u0018\u0002\n\u0002\u0018\u0002\n\u0000\u0008 \u0018\u00002\u00020\u0001\u00a8\u0006\u0002"
|
|
}
|
|
d2 = {
|
|
"Lokhttp3/internal/publicsuffix/BasePublicSuffixList;",
|
|
"Lokhttp3/internal/publicsuffix/PublicSuffixList;",
|
|
"okhttp"
|
|
}
|
|
k = 0x1
|
|
mv = {
|
|
0x2,
|
|
0x2,
|
|
0x0
|
|
}
|
|
xi = 0x30
|
|
.end annotation
|
|
|
|
|
|
# instance fields
|
|
.field public final a:Ljava/util/concurrent/atomic/AtomicBoolean;
|
|
|
|
.field public final b:Ljava/util/concurrent/CountDownLatch;
|
|
|
|
.field public c:Lokio/ByteString;
|
|
|
|
.field public d:Lokio/ByteString;
|
|
|
|
.field public e:Ljava/io/IOException;
|
|
|
|
|
|
# direct methods
|
|
.method public constructor <init>()V
|
|
.locals 2
|
|
|
|
.line 1
|
|
invoke-direct {p0}, Ljava/lang/Object;-><init>()V
|
|
|
|
.line 2
|
|
.line 3
|
|
.line 4
|
|
new-instance v0, Ljava/util/concurrent/atomic/AtomicBoolean;
|
|
|
|
.line 5
|
|
.line 6
|
|
const/4 v1, 0x0
|
|
|
|
.line 7
|
|
invoke-direct {v0, v1}, Ljava/util/concurrent/atomic/AtomicBoolean;-><init>(Z)V
|
|
|
|
.line 8
|
|
.line 9
|
|
.line 10
|
|
iput-object v0, p0, Lokhttp3/internal/publicsuffix/BasePublicSuffixList;->a:Ljava/util/concurrent/atomic/AtomicBoolean;
|
|
|
|
.line 11
|
|
.line 12
|
|
new-instance v0, Ljava/util/concurrent/CountDownLatch;
|
|
|
|
.line 13
|
|
.line 14
|
|
const/4 v1, 0x1
|
|
|
|
.line 15
|
|
invoke-direct {v0, v1}, Ljava/util/concurrent/CountDownLatch;-><init>(I)V
|
|
|
|
.line 16
|
|
.line 17
|
|
.line 18
|
|
iput-object v0, p0, Lokhttp3/internal/publicsuffix/BasePublicSuffixList;->b:Ljava/util/concurrent/CountDownLatch;
|
|
|
|
.line 19
|
|
.line 20
|
|
return-void
|
|
.end method
|
|
|
|
|
|
# virtual methods
|
|
.method public final a()Lokio/ByteString;
|
|
.locals 1
|
|
|
|
.line 1
|
|
iget-object v0, p0, Lokhttp3/internal/publicsuffix/BasePublicSuffixList;->c:Lokio/ByteString;
|
|
|
|
.line 2
|
|
.line 3
|
|
if-eqz v0, :cond_0
|
|
|
|
.line 4
|
|
.line 5
|
|
return-object v0
|
|
|
|
.line 6
|
|
:cond_0
|
|
const-string v0, "bytes"
|
|
|
|
.line 7
|
|
.line 8
|
|
invoke-static {v0}, Lkotlin/jvm/internal/Intrinsics;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
|
|
|
|
.line 9
|
|
.line 10
|
|
.line 11
|
|
const/4 v0, 0x0
|
|
|
|
.line 12
|
|
return-object v0
|
|
.end method
|
|
|
|
.method public abstract b()Lokio/Source;
|
|
.end method
|
|
|
|
.method public final c()V
|
|
.locals 4
|
|
|
|
.line 1
|
|
:try_start_0
|
|
invoke-virtual {p0}, Lokhttp3/internal/publicsuffix/BasePublicSuffixList;->b()Lokio/Source;
|
|
|
|
.line 2
|
|
.line 3
|
|
.line 4
|
|
move-result-object v0
|
|
|
|
.line 5
|
|
invoke-static {v0}, Lokio/Okio;->b(Lokio/Source;)Lokio/RealBufferedSource;
|
|
|
|
.line 6
|
|
.line 7
|
|
.line 8
|
|
move-result-object v0
|
|
:try_end_0
|
|
.catchall {:try_start_0 .. :try_end_0} :catchall_0
|
|
|
|
.line 9
|
|
:try_start_1
|
|
invoke-virtual {v0}, Lokio/RealBufferedSource;->readInt()I
|
|
|
|
.line 10
|
|
.line 11
|
|
.line 12
|
|
move-result v1
|
|
|
|
.line 13
|
|
int-to-long v1, v1
|
|
|
|
.line 14
|
|
invoke-virtual {v0, v1, v2}, Lokio/RealBufferedSource;->r(J)Lokio/ByteString;
|
|
|
|
.line 15
|
|
.line 16
|
|
.line 17
|
|
move-result-object v1
|
|
|
|
.line 18
|
|
invoke-virtual {v0}, Lokio/RealBufferedSource;->readInt()I
|
|
|
|
.line 19
|
|
.line 20
|
|
.line 21
|
|
move-result v2
|
|
|
|
.line 22
|
|
int-to-long v2, v2
|
|
|
|
.line 23
|
|
invoke-virtual {v0, v2, v3}, Lokio/RealBufferedSource;->r(J)Lokio/ByteString;
|
|
|
|
.line 24
|
|
.line 25
|
|
.line 26
|
|
move-result-object v2
|
|
|
|
.line 27
|
|
sget-object v3, Lkotlin/Unit;->INSTANCE:Lkotlin/Unit;
|
|
:try_end_1
|
|
.catchall {:try_start_1 .. :try_end_1} :catchall_2
|
|
|
|
.line 28
|
|
.line 29
|
|
const/4 v3, 0x0
|
|
|
|
.line 30
|
|
:try_start_2
|
|
invoke-static {v0, v3}, Lkotlin/io/CloseableKt;->closeFinally(Ljava/io/Closeable;Ljava/lang/Throwable;)V
|
|
|
|
.line 31
|
|
.line 32
|
|
.line 33
|
|
monitor-enter p0
|
|
:try_end_2
|
|
.catchall {:try_start_2 .. :try_end_2} :catchall_0
|
|
|
|
.line 34
|
|
:try_start_3
|
|
invoke-static {v1}, Lkotlin/jvm/internal/Intrinsics;->checkNotNull(Ljava/lang/Object;)V
|
|
|
|
.line 35
|
|
.line 36
|
|
.line 37
|
|
const-string v0, "<set-?>"
|
|
|
|
.line 38
|
|
.line 39
|
|
invoke-static {v1, v0}, Lkotlin/jvm/internal/Intrinsics;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
|
|
|
|
.line 40
|
|
.line 41
|
|
.line 42
|
|
iput-object v1, p0, Lokhttp3/internal/publicsuffix/BasePublicSuffixList;->c:Lokio/ByteString;
|
|
|
|
.line 43
|
|
.line 44
|
|
invoke-static {v2}, Lkotlin/jvm/internal/Intrinsics;->checkNotNull(Ljava/lang/Object;)V
|
|
|
|
.line 45
|
|
.line 46
|
|
.line 47
|
|
const-string v0, "<set-?>"
|
|
|
|
.line 48
|
|
.line 49
|
|
invoke-static {v2, v0}, Lkotlin/jvm/internal/Intrinsics;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
|
|
|
|
.line 50
|
|
.line 51
|
|
.line 52
|
|
iput-object v2, p0, Lokhttp3/internal/publicsuffix/BasePublicSuffixList;->d:Lokio/ByteString;
|
|
:try_end_3
|
|
.catchall {:try_start_3 .. :try_end_3} :catchall_1
|
|
|
|
.line 53
|
|
.line 54
|
|
:try_start_4
|
|
monitor-exit p0
|
|
:try_end_4
|
|
.catchall {:try_start_4 .. :try_end_4} :catchall_0
|
|
|
|
.line 55
|
|
iget-object v0, p0, Lokhttp3/internal/publicsuffix/BasePublicSuffixList;->b:Ljava/util/concurrent/CountDownLatch;
|
|
|
|
.line 56
|
|
.line 57
|
|
invoke-virtual {v0}, Ljava/util/concurrent/CountDownLatch;->countDown()V
|
|
|
|
.line 58
|
|
.line 59
|
|
.line 60
|
|
return-void
|
|
|
|
.line 61
|
|
:catchall_0
|
|
move-exception v0
|
|
|
|
.line 62
|
|
goto :goto_0
|
|
|
|
.line 63
|
|
:catchall_1
|
|
move-exception v0
|
|
|
|
.line 64
|
|
:try_start_5
|
|
monitor-exit p0
|
|
|
|
.line 65
|
|
throw v0
|
|
:try_end_5
|
|
.catchall {:try_start_5 .. :try_end_5} :catchall_0
|
|
|
|
.line 66
|
|
:catchall_2
|
|
move-exception v1
|
|
|
|
.line 67
|
|
:try_start_6
|
|
throw v1
|
|
:try_end_6
|
|
.catchall {:try_start_6 .. :try_end_6} :catchall_3
|
|
|
|
.line 68
|
|
:catchall_3
|
|
move-exception v2
|
|
|
|
.line 69
|
|
:try_start_7
|
|
invoke-static {v0, v1}, Lkotlin/io/CloseableKt;->closeFinally(Ljava/io/Closeable;Ljava/lang/Throwable;)V
|
|
|
|
.line 70
|
|
.line 71
|
|
.line 72
|
|
throw v2
|
|
:try_end_7
|
|
.catchall {:try_start_7 .. :try_end_7} :catchall_0
|
|
|
|
.line 73
|
|
:goto_0
|
|
iget-object v1, p0, Lokhttp3/internal/publicsuffix/BasePublicSuffixList;->b:Ljava/util/concurrent/CountDownLatch;
|
|
|
|
.line 74
|
|
.line 75
|
|
invoke-virtual {v1}, Ljava/util/concurrent/CountDownLatch;->countDown()V
|
|
|
|
.line 76
|
|
.line 77
|
|
.line 78
|
|
throw v0
|
|
.end method
|