* 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>
191 lines
4.6 KiB
Smali
191 lines
4.6 KiB
Smali
.class public final Lkotlin/io/CloseableKt;
|
|
.super Ljava/lang/Object;
|
|
.source "SourceFile"
|
|
|
|
|
|
# annotations
|
|
.annotation runtime Lkotlin/Metadata;
|
|
d1 = {
|
|
"\u0000\u001e\n\u0002\u0008\u0003\n\u0002\u0018\u0002\n\u0000\n\u0002\u0018\u0002\n\u0002\u0008\u0002\n\u0002\u0010\u0002\n\u0000\n\u0002\u0010\u0003\n\u0000\u001aH\u0010\u0000\u001a\u0002H\u0001\"\n\u0008\u0000\u0010\u0002*\u0004\u0018\u00010\u0003\"\u0004\u0008\u0001\u0010\u0001*\u0002H\u00022\u0012\u0010\u0004\u001a\u000e\u0012\u0004\u0012\u0002H\u0002\u0012\u0004\u0012\u0002H\u00010\u0005H\u0087\u0008\u00f8\u0001\u0000\u0082\u0002\n\n\u0008\u0008\u0001\u0012\u0002\u0010\u0001 \u0001\u00a2\u0006\u0002\u0010\u0006\u001a\u0018\u0010\u0007\u001a\u00020\u0008*\u0004\u0018\u00010\u00032\u0008\u0010\t\u001a\u0004\u0018\u00010\nH\u0001\u0082\u0002\u0007\n\u0005\u0008\u009920\u0001\u00a8\u0006\u000b"
|
|
}
|
|
d2 = {
|
|
"use",
|
|
"R",
|
|
"T",
|
|
"Ljava/io/Closeable;",
|
|
"block",
|
|
"Lkotlin/Function1;",
|
|
"(Ljava/io/Closeable;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;",
|
|
"closeFinally",
|
|
"",
|
|
"cause",
|
|
"",
|
|
"kotlin-stdlib"
|
|
}
|
|
k = 0x2
|
|
mv = {
|
|
0x2,
|
|
0x2,
|
|
0x0
|
|
}
|
|
xi = 0x30
|
|
.end annotation
|
|
|
|
.annotation build Lkotlin/jvm/JvmName;
|
|
name = "CloseableKt"
|
|
.end annotation
|
|
|
|
|
|
# direct methods
|
|
.method public static final closeFinally(Ljava/io/Closeable;Ljava/lang/Throwable;)V
|
|
.locals 0
|
|
.param p0 # Ljava/io/Closeable;
|
|
.annotation build Lorg/jetbrains/annotations/Nullable;
|
|
.end annotation
|
|
.end param
|
|
.param p1 # Ljava/lang/Throwable;
|
|
.annotation build Lorg/jetbrains/annotations/Nullable;
|
|
.end annotation
|
|
.end param
|
|
.annotation build Lkotlin/PublishedApi;
|
|
.end annotation
|
|
|
|
.annotation build Lkotlin/SinceKotlin;
|
|
version = "1.1"
|
|
.end annotation
|
|
|
|
.line 1
|
|
if-eqz p0, :cond_1
|
|
|
|
.line 2
|
|
.line 3
|
|
if-nez p1, :cond_0
|
|
|
|
.line 4
|
|
.line 5
|
|
invoke-interface {p0}, Ljava/io/Closeable;->close()V
|
|
|
|
.line 6
|
|
.line 7
|
|
.line 8
|
|
return-void
|
|
|
|
.line 9
|
|
:cond_0
|
|
:try_start_0
|
|
invoke-interface {p0}, Ljava/io/Closeable;->close()V
|
|
:try_end_0
|
|
.catchall {:try_start_0 .. :try_end_0} :catchall_0
|
|
|
|
.line 10
|
|
.line 11
|
|
.line 12
|
|
return-void
|
|
|
|
.line 13
|
|
:catchall_0
|
|
move-exception p0
|
|
|
|
.line 14
|
|
invoke-static {p1, p0}, Lkotlin/ExceptionsKt;->addSuppressed(Ljava/lang/Throwable;Ljava/lang/Throwable;)V
|
|
|
|
.line 15
|
|
.line 16
|
|
.line 17
|
|
:cond_1
|
|
return-void
|
|
.end method
|
|
|
|
.method private static final use(Ljava/io/Closeable;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
|
|
.locals 2
|
|
.annotation system Ldalvik/annotation/Signature;
|
|
value = {
|
|
"<T::",
|
|
"Ljava/io/Closeable;",
|
|
"R:",
|
|
"Ljava/lang/Object;",
|
|
">(TT;",
|
|
"Lkotlin/jvm/functions/Function1<",
|
|
"-TT;+TR;>;)TR;"
|
|
}
|
|
.end annotation
|
|
|
|
.annotation build Lkotlin/internal/InlineOnly;
|
|
.end annotation
|
|
|
|
.line 1
|
|
const-string v0, "block"
|
|
|
|
.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/4 v0, 0x1
|
|
|
|
.line 7
|
|
:try_start_0
|
|
invoke-interface {p1, p0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
.line 8
|
|
.line 9
|
|
.line 10
|
|
move-result-object p1
|
|
:try_end_0
|
|
.catchall {:try_start_0 .. :try_end_0} :catchall_0
|
|
|
|
.line 11
|
|
invoke-static {v0}, Lkotlin/jvm/internal/InlineMarker;->finallyStart(I)V
|
|
|
|
.line 12
|
|
.line 13
|
|
.line 14
|
|
const/4 v1, 0x0
|
|
|
|
.line 15
|
|
invoke-static {p0, v1}, Lkotlin/io/CloseableKt;->closeFinally(Ljava/io/Closeable;Ljava/lang/Throwable;)V
|
|
|
|
.line 16
|
|
.line 17
|
|
.line 18
|
|
invoke-static {v0}, Lkotlin/jvm/internal/InlineMarker;->finallyEnd(I)V
|
|
|
|
.line 19
|
|
.line 20
|
|
.line 21
|
|
return-object p1
|
|
|
|
.line 22
|
|
:catchall_0
|
|
move-exception p1
|
|
|
|
.line 23
|
|
:try_start_1
|
|
throw p1
|
|
:try_end_1
|
|
.catchall {:try_start_1 .. :try_end_1} :catchall_1
|
|
|
|
.line 24
|
|
:catchall_1
|
|
move-exception v1
|
|
|
|
.line 25
|
|
invoke-static {v0}, Lkotlin/jvm/internal/InlineMarker;->finallyStart(I)V
|
|
|
|
.line 26
|
|
.line 27
|
|
.line 28
|
|
invoke-static {p0, p1}, Lkotlin/io/CloseableKt;->closeFinally(Ljava/io/Closeable;Ljava/lang/Throwable;)V
|
|
|
|
.line 29
|
|
.line 30
|
|
.line 31
|
|
invoke-static {v0}, Lkotlin/jvm/internal/InlineMarker;->finallyEnd(I)V
|
|
|
|
.line 32
|
|
.line 33
|
|
.line 34
|
|
throw v1
|
|
.end method
|