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>
379 lines
10 KiB
Smali
379 lines
10 KiB
Smali
.class Lkotlin/collections/MapsKt__MapWithDefaultKt;
|
|
.super Ljava/lang/Object;
|
|
.source "SourceFile"
|
|
|
|
|
|
# annotations
|
|
.annotation runtime Lkotlin/Metadata;
|
|
d1 = {
|
|
"\u0000\u001e\n\u0002\u0008\u0003\n\u0002\u0010$\n\u0002\u0008\u0005\n\u0002\u0018\u0002\n\u0002\u0018\u0002\n\u0000\n\u0002\u0010%\n\u0002\u0008\u0002\u001a3\u0010\u0000\u001a\u0002H\u0001\"\u0004\u0008\u0000\u0010\u0002\"\u0004\u0008\u0001\u0010\u0001*\u000e\u0012\u0004\u0012\u0002H\u0002\u0012\u0004\u0012\u0002H\u00010\u00032\u0006\u0010\u0004\u001a\u0002H\u0002H\u0001\u00a2\u0006\u0004\u0008\u0005\u0010\u0006\u001aQ\u0010\u0007\u001a\u000e\u0012\u0004\u0012\u0002H\u0002\u0012\u0004\u0012\u0002H\u00010\u0003\"\u0004\u0008\u0000\u0010\u0002\"\u0004\u0008\u0001\u0010\u0001*\u000e\u0012\u0004\u0012\u0002H\u0002\u0012\u0004\u0012\u0002H\u00010\u00032!\u0010\u0008\u001a\u001d\u0012\u0013\u0012\u0011H\u0002\u00a2\u0006\u000c\u0008\n\u0012\u0008\u0008\u000b\u0012\u0004\u0008\u0008(\u0004\u0012\u0004\u0012\u0002H\u00010\t\u001aX\u0010\u0007\u001a\u000e\u0012\u0004\u0012\u0002H\u0002\u0012\u0004\u0012\u0002H\u00010\u000c\"\u0004\u0008\u0000\u0010\u0002\"\u0004\u0008\u0001\u0010\u0001*\u000e\u0012\u0004\u0012\u0002H\u0002\u0012\u0004\u0012\u0002H\u00010\u000c2!\u0010\u0008\u001a\u001d\u0012\u0013\u0012\u0011H\u0002\u00a2\u0006\u000c\u0008\n\u0012\u0008\u0008\u000b\u0012\u0004\u0008\u0008(\u0004\u0012\u0004\u0012\u0002H\u00010\tH\u0007\u00a2\u0006\u0002\u0008\r\u00a8\u0006\u000e"
|
|
}
|
|
d2 = {
|
|
"getOrImplicitDefault",
|
|
"V",
|
|
"K",
|
|
"",
|
|
"key",
|
|
"getOrImplicitDefaultNullable",
|
|
"(Ljava/util/Map;Ljava/lang/Object;)Ljava/lang/Object;",
|
|
"withDefault",
|
|
"defaultValue",
|
|
"Lkotlin/Function1;",
|
|
"Lkotlin/ParameterName;",
|
|
"name",
|
|
"",
|
|
"withDefaultMutable",
|
|
"kotlin-stdlib"
|
|
}
|
|
k = 0x5
|
|
mv = {
|
|
0x2,
|
|
0x2,
|
|
0x0
|
|
}
|
|
xi = 0x31
|
|
xs = "kotlin/collections/MapsKt"
|
|
.end annotation
|
|
|
|
.annotation build Lkotlin/jvm/internal/SourceDebugExtension;
|
|
value = {
|
|
"SMAP\nMapWithDefault.kt\nKotlin\n*S Kotlin\n*F\n+ 1 MapWithDefault.kt\nkotlin/collections/MapsKt__MapWithDefaultKt\n+ 2 Maps.kt\nkotlin/collections/MapsKt__MapsKt\n*L\n1#1,111:1\n348#2,6:112\n*S KotlinDebug\n*F\n+ 1 MapWithDefault.kt\nkotlin/collections/MapsKt__MapWithDefaultKt\n*L\n24#1:112,6\n*E\n"
|
|
}
|
|
.end annotation
|
|
|
|
|
|
# direct methods
|
|
.method public constructor <init>()V
|
|
.locals 0
|
|
|
|
invoke-direct {p0}, Ljava/lang/Object;-><init>()V
|
|
|
|
return-void
|
|
.end method
|
|
|
|
.method public static final getOrImplicitDefaultNullable(Ljava/util/Map;Ljava/lang/Object;)Ljava/lang/Object;
|
|
.locals 2
|
|
.param p0 # Ljava/util/Map;
|
|
.annotation build Lorg/jetbrains/annotations/NotNull;
|
|
.end annotation
|
|
.end param
|
|
.annotation system Ldalvik/annotation/Signature;
|
|
value = {
|
|
"<K:",
|
|
"Ljava/lang/Object;",
|
|
"V:",
|
|
"Ljava/lang/Object;",
|
|
">(",
|
|
"Ljava/util/Map<",
|
|
"TK;+TV;>;TK;)TV;"
|
|
}
|
|
.end annotation
|
|
|
|
.annotation build Lkotlin/PublishedApi;
|
|
.end annotation
|
|
|
|
.annotation build Lkotlin/jvm/JvmName;
|
|
name = "getOrImplicitDefaultNullable"
|
|
.end annotation
|
|
|
|
.line 1
|
|
const-string v0, "<this>"
|
|
|
|
.line 2
|
|
.line 3
|
|
invoke-static {p0, v0}, Lkotlin/jvm/internal/Intrinsics;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
|
|
|
|
.line 4
|
|
.line 5
|
|
.line 6
|
|
instance-of v0, p0, Lkotlin/collections/MapWithDefault;
|
|
|
|
.line 7
|
|
.line 8
|
|
if-eqz v0, :cond_0
|
|
|
|
.line 9
|
|
.line 10
|
|
check-cast p0, Lkotlin/collections/MapWithDefault;
|
|
|
|
.line 11
|
|
.line 12
|
|
invoke-interface {p0, p1}, Lkotlin/collections/MapWithDefault;->getOrImplicitDefault(Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
.line 13
|
|
.line 14
|
|
.line 15
|
|
move-result-object p0
|
|
|
|
.line 16
|
|
return-object p0
|
|
|
|
.line 17
|
|
:cond_0
|
|
invoke-interface {p0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
.line 18
|
|
.line 19
|
|
.line 20
|
|
move-result-object v0
|
|
|
|
.line 21
|
|
if-nez v0, :cond_2
|
|
|
|
.line 22
|
|
.line 23
|
|
invoke-interface {p0, p1}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
|
|
|
|
.line 24
|
|
.line 25
|
|
.line 26
|
|
move-result p0
|
|
|
|
.line 27
|
|
if-eqz p0, :cond_1
|
|
|
|
.line 28
|
|
.line 29
|
|
goto :goto_0
|
|
|
|
.line 30
|
|
:cond_1
|
|
new-instance p0, Ljava/util/NoSuchElementException;
|
|
|
|
.line 31
|
|
.line 32
|
|
new-instance v0, Ljava/lang/StringBuilder;
|
|
|
|
.line 33
|
|
.line 34
|
|
const-string v1, "Key "
|
|
|
|
.line 35
|
|
.line 36
|
|
invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
|
|
|
|
.line 37
|
|
.line 38
|
|
.line 39
|
|
invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
|
|
|
|
.line 40
|
|
.line 41
|
|
.line 42
|
|
const-string p1, " is missing in the map."
|
|
|
|
.line 43
|
|
.line 44
|
|
invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
|
|
|
.line 45
|
|
.line 46
|
|
.line 47
|
|
invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
|
|
|
|
.line 48
|
|
.line 49
|
|
.line 50
|
|
move-result-object p1
|
|
|
|
.line 51
|
|
invoke-direct {p0, p1}, Ljava/util/NoSuchElementException;-><init>(Ljava/lang/String;)V
|
|
|
|
.line 52
|
|
.line 53
|
|
.line 54
|
|
throw p0
|
|
|
|
.line 55
|
|
:cond_2
|
|
:goto_0
|
|
return-object v0
|
|
.end method
|
|
|
|
.method public static final withDefault(Ljava/util/Map;Lkotlin/jvm/functions/Function1;)Ljava/util/Map;
|
|
.locals 1
|
|
.param p0 # Ljava/util/Map;
|
|
.annotation build Lorg/jetbrains/annotations/NotNull;
|
|
.end annotation
|
|
.end param
|
|
.param p1 # Lkotlin/jvm/functions/Function1;
|
|
.annotation build Lorg/jetbrains/annotations/NotNull;
|
|
.end annotation
|
|
.end param
|
|
.annotation system Ldalvik/annotation/Signature;
|
|
value = {
|
|
"<K:",
|
|
"Ljava/lang/Object;",
|
|
"V:",
|
|
"Ljava/lang/Object;",
|
|
">(",
|
|
"Ljava/util/Map<",
|
|
"TK;+TV;>;",
|
|
"Lkotlin/jvm/functions/Function1<",
|
|
"-TK;+TV;>;)",
|
|
"Ljava/util/Map<",
|
|
"TK;TV;>;"
|
|
}
|
|
.end annotation
|
|
|
|
.annotation build Lorg/jetbrains/annotations/NotNull;
|
|
.end annotation
|
|
|
|
.line 1
|
|
const-string v0, "<this>"
|
|
|
|
.line 2
|
|
.line 3
|
|
invoke-static {p0, v0}, Lkotlin/jvm/internal/Intrinsics;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
|
|
|
|
.line 4
|
|
.line 5
|
|
.line 6
|
|
const-string v0, "defaultValue"
|
|
|
|
.line 7
|
|
.line 8
|
|
invoke-static {p1, v0}, Lkotlin/jvm/internal/Intrinsics;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
|
|
|
|
.line 9
|
|
.line 10
|
|
.line 11
|
|
instance-of v0, p0, Lkotlin/collections/MapWithDefault;
|
|
|
|
.line 12
|
|
.line 13
|
|
if-eqz v0, :cond_0
|
|
|
|
.line 14
|
|
.line 15
|
|
check-cast p0, Lkotlin/collections/MapWithDefault;
|
|
|
|
.line 16
|
|
.line 17
|
|
invoke-interface {p0}, Lkotlin/collections/MapWithDefault;->getMap()Ljava/util/Map;
|
|
|
|
.line 18
|
|
.line 19
|
|
.line 20
|
|
move-result-object p0
|
|
|
|
.line 21
|
|
invoke-static {p0, p1}, Lkotlin/collections/MapsKt__MapWithDefaultKt;->withDefault(Ljava/util/Map;Lkotlin/jvm/functions/Function1;)Ljava/util/Map;
|
|
|
|
.line 22
|
|
.line 23
|
|
.line 24
|
|
move-result-object p0
|
|
|
|
.line 25
|
|
return-object p0
|
|
|
|
.line 26
|
|
:cond_0
|
|
new-instance v0, Lkotlin/collections/MapWithDefaultImpl;
|
|
|
|
.line 27
|
|
.line 28
|
|
invoke-direct {v0, p0, p1}, Lkotlin/collections/MapWithDefaultImpl;-><init>(Ljava/util/Map;Lkotlin/jvm/functions/Function1;)V
|
|
|
|
.line 29
|
|
.line 30
|
|
.line 31
|
|
return-object v0
|
|
.end method
|
|
|
|
.method public static final withDefaultMutable(Ljava/util/Map;Lkotlin/jvm/functions/Function1;)Ljava/util/Map;
|
|
.locals 1
|
|
.param p0 # Ljava/util/Map;
|
|
.annotation build Lorg/jetbrains/annotations/NotNull;
|
|
.end annotation
|
|
.end param
|
|
.param p1 # Lkotlin/jvm/functions/Function1;
|
|
.annotation build Lorg/jetbrains/annotations/NotNull;
|
|
.end annotation
|
|
.end param
|
|
.annotation system Ldalvik/annotation/Signature;
|
|
value = {
|
|
"<K:",
|
|
"Ljava/lang/Object;",
|
|
"V:",
|
|
"Ljava/lang/Object;",
|
|
">(",
|
|
"Ljava/util/Map<",
|
|
"TK;TV;>;",
|
|
"Lkotlin/jvm/functions/Function1<",
|
|
"-TK;+TV;>;)",
|
|
"Ljava/util/Map<",
|
|
"TK;TV;>;"
|
|
}
|
|
.end annotation
|
|
|
|
.annotation build Lkotlin/jvm/JvmName;
|
|
name = "withDefaultMutable"
|
|
.end annotation
|
|
|
|
.annotation build Lorg/jetbrains/annotations/NotNull;
|
|
.end annotation
|
|
|
|
.line 1
|
|
const-string v0, "<this>"
|
|
|
|
.line 2
|
|
.line 3
|
|
invoke-static {p0, v0}, Lkotlin/jvm/internal/Intrinsics;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
|
|
|
|
.line 4
|
|
.line 5
|
|
.line 6
|
|
const-string v0, "defaultValue"
|
|
|
|
.line 7
|
|
.line 8
|
|
invoke-static {p1, v0}, Lkotlin/jvm/internal/Intrinsics;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
|
|
|
|
.line 9
|
|
.line 10
|
|
.line 11
|
|
instance-of v0, p0, Lkotlin/collections/MutableMapWithDefault;
|
|
|
|
.line 12
|
|
.line 13
|
|
if-eqz v0, :cond_0
|
|
|
|
.line 14
|
|
.line 15
|
|
check-cast p0, Lkotlin/collections/MutableMapWithDefault;
|
|
|
|
.line 16
|
|
.line 17
|
|
invoke-interface {p0}, Lkotlin/collections/MutableMapWithDefault;->getMap()Ljava/util/Map;
|
|
|
|
.line 18
|
|
.line 19
|
|
.line 20
|
|
move-result-object p0
|
|
|
|
.line 21
|
|
invoke-static {p0, p1}, Lkotlin/collections/MapsKt__MapWithDefaultKt;->withDefaultMutable(Ljava/util/Map;Lkotlin/jvm/functions/Function1;)Ljava/util/Map;
|
|
|
|
.line 22
|
|
.line 23
|
|
.line 24
|
|
move-result-object p0
|
|
|
|
.line 25
|
|
return-object p0
|
|
|
|
.line 26
|
|
:cond_0
|
|
new-instance v0, Lkotlin/collections/MutableMapWithDefaultImpl;
|
|
|
|
.line 27
|
|
.line 28
|
|
invoke-direct {v0, p0, p1}, Lkotlin/collections/MutableMapWithDefaultImpl;-><init>(Ljava/util/Map;Lkotlin/jvm/functions/Function1;)V
|
|
|
|
.line 29
|
|
.line 30
|
|
.line 31
|
|
return-object v0
|
|
.end method
|