* 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>
484 lines
11 KiB
Smali
484 lines
11 KiB
Smali
.class public final Lkotlin/collections/builders/SerializedCollection;
|
|
.super Ljava/lang/Object;
|
|
.source "SourceFile"
|
|
|
|
# interfaces
|
|
.implements Ljava/io/Externalizable;
|
|
|
|
|
|
# annotations
|
|
.annotation system Ldalvik/annotation/MemberClasses;
|
|
value = {
|
|
Lkotlin/collections/builders/SerializedCollection$Companion;
|
|
}
|
|
.end annotation
|
|
|
|
.annotation runtime Lkotlin/Metadata;
|
|
d1 = {
|
|
"\u00004\n\u0002\u0018\u0002\n\u0002\u0018\u0002\n\u0000\n\u0002\u0010\u001e\n\u0000\n\u0002\u0010\u0008\n\u0002\u0008\u0004\n\u0002\u0010\u0002\n\u0000\n\u0002\u0018\u0002\n\u0002\u0008\u0002\n\u0002\u0018\u0002\n\u0000\n\u0002\u0010\u0000\n\u0002\u0008\u0002\u0008\u0000\u0018\u0000 \u00122\u00020\u0001:\u0001\u0012B\u001b\u0012\n\u0010\u0002\u001a\u0006\u0012\u0002\u0008\u00030\u0003\u0012\u0006\u0010\u0004\u001a\u00020\u0005\u00a2\u0006\u0004\u0008\u0006\u0010\u0007B\t\u0008\u0016\u00a2\u0006\u0004\u0008\u0006\u0010\u0008J\u0010\u0010\t\u001a\u00020\n2\u0006\u0010\u000b\u001a\u00020\u000cH\u0016J\u0010\u0010\r\u001a\u00020\n2\u0006\u0010\u000e\u001a\u00020\u000fH\u0016J\u0008\u0010\u0010\u001a\u00020\u0011H\u0002R\u0012\u0010\u0002\u001a\u0006\u0012\u0002\u0008\u00030\u0003X\u0082\u000e\u00a2\u0006\u0002\n\u0000R\u000e\u0010\u0004\u001a\u00020\u0005X\u0082\u0004\u00a2\u0006\u0002\n\u0000\u00a8\u0006\u0013"
|
|
}
|
|
d2 = {
|
|
"Lkotlin/collections/builders/SerializedCollection;",
|
|
"Ljava/io/Externalizable;",
|
|
"collection",
|
|
"",
|
|
"tag",
|
|
"",
|
|
"<init>",
|
|
"(Ljava/util/Collection;I)V",
|
|
"()V",
|
|
"writeExternal",
|
|
"",
|
|
"output",
|
|
"Ljava/io/ObjectOutput;",
|
|
"readExternal",
|
|
"input",
|
|
"Ljava/io/ObjectInput;",
|
|
"readResolve",
|
|
"",
|
|
"Companion",
|
|
"kotlin-stdlib"
|
|
}
|
|
k = 0x1
|
|
mv = {
|
|
0x2,
|
|
0x2,
|
|
0x0
|
|
}
|
|
xi = 0x30
|
|
.end annotation
|
|
|
|
.annotation build Lkotlin/jvm/internal/SourceDebugExtension;
|
|
value = {
|
|
"SMAP\nListBuilder.kt\nKotlin\n*S Kotlin\n*F\n+ 1 ListBuilder.kt\nkotlin/collections/builders/SerializedCollection\n+ 2 fake.kt\nkotlin/jvm/internal/FakeKt\n*L\n1#1,722:1\n1#2:723\n*E\n"
|
|
}
|
|
.end annotation
|
|
|
|
|
|
# static fields
|
|
.field public static final Companion:Lkotlin/collections/builders/SerializedCollection$Companion;
|
|
.annotation build Lorg/jetbrains/annotations/NotNull;
|
|
.end annotation
|
|
.end field
|
|
|
|
.field private static final serialVersionUID:J = 0x0L
|
|
|
|
.field public static final tagList:I = 0x0
|
|
|
|
.field public static final tagSet:I = 0x1
|
|
|
|
|
|
# instance fields
|
|
.field private collection:Ljava/util/Collection;
|
|
.annotation system Ldalvik/annotation/Signature;
|
|
value = {
|
|
"Ljava/util/Collection<",
|
|
"*>;"
|
|
}
|
|
.end annotation
|
|
|
|
.annotation build Lorg/jetbrains/annotations/NotNull;
|
|
.end annotation
|
|
.end field
|
|
|
|
.field private final tag:I
|
|
|
|
|
|
# direct methods
|
|
.method static constructor <clinit>()V
|
|
.locals 2
|
|
|
|
new-instance v0, Lkotlin/collections/builders/SerializedCollection$Companion;
|
|
|
|
const/4 v1, 0x0
|
|
|
|
invoke-direct {v0, v1}, Lkotlin/collections/builders/SerializedCollection$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
|
|
|
|
sput-object v0, Lkotlin/collections/builders/SerializedCollection;->Companion:Lkotlin/collections/builders/SerializedCollection$Companion;
|
|
|
|
return-void
|
|
.end method
|
|
|
|
.method public constructor <init>()V
|
|
.locals 2
|
|
|
|
.line 4
|
|
invoke-static {}, Lkotlin/collections/CollectionsKt;->emptyList()Ljava/util/List;
|
|
|
|
move-result-object v0
|
|
|
|
const/4 v1, 0x0
|
|
|
|
invoke-direct {p0, v0, v1}, Lkotlin/collections/builders/SerializedCollection;-><init>(Ljava/util/Collection;I)V
|
|
|
|
return-void
|
|
.end method
|
|
|
|
.method public constructor <init>(Ljava/util/Collection;I)V
|
|
.locals 1
|
|
.param p1 # Ljava/util/Collection;
|
|
.annotation build Lorg/jetbrains/annotations/NotNull;
|
|
.end annotation
|
|
.end param
|
|
.annotation system Ldalvik/annotation/Signature;
|
|
value = {
|
|
"(",
|
|
"Ljava/util/Collection<",
|
|
"*>;I)V"
|
|
}
|
|
.end annotation
|
|
|
|
const-string v0, "collection"
|
|
|
|
invoke-static {p1, v0}, Lkotlin/jvm/internal/Intrinsics;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
|
|
|
|
.line 1
|
|
invoke-direct {p0}, Ljava/lang/Object;-><init>()V
|
|
|
|
.line 2
|
|
iput-object p1, p0, Lkotlin/collections/builders/SerializedCollection;->collection:Ljava/util/Collection;
|
|
|
|
.line 3
|
|
iput p2, p0, Lkotlin/collections/builders/SerializedCollection;->tag:I
|
|
|
|
return-void
|
|
.end method
|
|
|
|
.method private final readResolve()Ljava/lang/Object;
|
|
.locals 1
|
|
|
|
.line 1
|
|
iget-object v0, p0, Lkotlin/collections/builders/SerializedCollection;->collection:Ljava/util/Collection;
|
|
|
|
.line 2
|
|
.line 3
|
|
return-object v0
|
|
.end method
|
|
|
|
|
|
# virtual methods
|
|
.method public readExternal(Ljava/io/ObjectInput;)V
|
|
.locals 5
|
|
.param p1 # Ljava/io/ObjectInput;
|
|
.annotation build Lorg/jetbrains/annotations/NotNull;
|
|
.end annotation
|
|
.end param
|
|
|
|
.line 1
|
|
const-string v0, "input"
|
|
|
|
.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-interface {p1}, Ljava/io/DataInput;->readByte()B
|
|
|
|
.line 7
|
|
.line 8
|
|
.line 9
|
|
move-result v0
|
|
|
|
.line 10
|
|
and-int/lit8 v1, v0, 0x1
|
|
|
|
.line 11
|
|
.line 12
|
|
and-int/lit8 v2, v0, -0x2
|
|
|
|
.line 13
|
|
.line 14
|
|
const/16 v3, 0x2e
|
|
|
|
.line 15
|
|
.line 16
|
|
if-nez v2, :cond_5
|
|
|
|
.line 17
|
|
.line 18
|
|
invoke-interface {p1}, Ljava/io/DataInput;->readInt()I
|
|
|
|
.line 19
|
|
.line 20
|
|
.line 21
|
|
move-result v0
|
|
|
|
.line 22
|
|
if-ltz v0, :cond_4
|
|
|
|
.line 23
|
|
.line 24
|
|
const/4 v2, 0x0
|
|
|
|
.line 25
|
|
if-eqz v1, :cond_2
|
|
|
|
.line 26
|
|
.line 27
|
|
const/4 v4, 0x1
|
|
|
|
.line 28
|
|
if-ne v1, v4, :cond_1
|
|
|
|
.line 29
|
|
.line 30
|
|
invoke-static {v0}, Lkotlin/collections/SetsKt;->createSetBuilder(I)Ljava/util/Set;
|
|
|
|
.line 31
|
|
.line 32
|
|
.line 33
|
|
move-result-object v1
|
|
|
|
.line 34
|
|
:goto_0
|
|
if-ge v2, v0, :cond_0
|
|
|
|
.line 35
|
|
.line 36
|
|
invoke-interface {p1}, Ljava/io/ObjectInput;->readObject()Ljava/lang/Object;
|
|
|
|
.line 37
|
|
.line 38
|
|
.line 39
|
|
move-result-object v3
|
|
|
|
.line 40
|
|
invoke-interface {v1, v3}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
|
|
|
|
.line 41
|
|
.line 42
|
|
.line 43
|
|
add-int/lit8 v2, v2, 0x1
|
|
|
|
.line 44
|
|
.line 45
|
|
goto :goto_0
|
|
|
|
.line 46
|
|
:cond_0
|
|
invoke-static {v1}, Lkotlin/collections/SetsKt;->build(Ljava/util/Set;)Ljava/util/Set;
|
|
|
|
.line 47
|
|
.line 48
|
|
.line 49
|
|
move-result-object p1
|
|
|
|
.line 50
|
|
goto :goto_2
|
|
|
|
.line 51
|
|
:cond_1
|
|
new-instance p1, Ljava/io/InvalidObjectException;
|
|
|
|
.line 52
|
|
.line 53
|
|
const-string v0, "Unsupported collection type tag: "
|
|
|
|
.line 54
|
|
.line 55
|
|
invoke-static {v0, v1, v3}, Lcom/mycompany/app/dialog/a;->l(Ljava/lang/String;IC)Ljava/lang/String;
|
|
|
|
.line 56
|
|
.line 57
|
|
.line 58
|
|
move-result-object v0
|
|
|
|
.line 59
|
|
invoke-direct {p1, v0}, Ljava/io/InvalidObjectException;-><init>(Ljava/lang/String;)V
|
|
|
|
.line 60
|
|
.line 61
|
|
.line 62
|
|
throw p1
|
|
|
|
.line 63
|
|
:cond_2
|
|
invoke-static {v0}, Lkotlin/collections/CollectionsKt;->createListBuilder(I)Ljava/util/List;
|
|
|
|
.line 64
|
|
.line 65
|
|
.line 66
|
|
move-result-object v1
|
|
|
|
.line 67
|
|
:goto_1
|
|
if-ge v2, v0, :cond_3
|
|
|
|
.line 68
|
|
.line 69
|
|
invoke-interface {p1}, Ljava/io/ObjectInput;->readObject()Ljava/lang/Object;
|
|
|
|
.line 70
|
|
.line 71
|
|
.line 72
|
|
move-result-object v3
|
|
|
|
.line 73
|
|
invoke-interface {v1, v3}, Ljava/util/List;->add(Ljava/lang/Object;)Z
|
|
|
|
.line 74
|
|
.line 75
|
|
.line 76
|
|
add-int/lit8 v2, v2, 0x1
|
|
|
|
.line 77
|
|
.line 78
|
|
goto :goto_1
|
|
|
|
.line 79
|
|
:cond_3
|
|
invoke-static {v1}, Lkotlin/collections/CollectionsKt;->build(Ljava/util/List;)Ljava/util/List;
|
|
|
|
.line 80
|
|
.line 81
|
|
.line 82
|
|
move-result-object p1
|
|
|
|
.line 83
|
|
:goto_2
|
|
iput-object p1, p0, Lkotlin/collections/builders/SerializedCollection;->collection:Ljava/util/Collection;
|
|
|
|
.line 84
|
|
.line 85
|
|
return-void
|
|
|
|
.line 86
|
|
:cond_4
|
|
new-instance p1, Ljava/io/InvalidObjectException;
|
|
|
|
.line 87
|
|
.line 88
|
|
const-string v1, "Illegal size value: "
|
|
|
|
.line 89
|
|
.line 90
|
|
invoke-static {v1, v0, v3}, Lcom/mycompany/app/dialog/a;->l(Ljava/lang/String;IC)Ljava/lang/String;
|
|
|
|
.line 91
|
|
.line 92
|
|
.line 93
|
|
move-result-object v0
|
|
|
|
.line 94
|
|
invoke-direct {p1, v0}, Ljava/io/InvalidObjectException;-><init>(Ljava/lang/String;)V
|
|
|
|
.line 95
|
|
.line 96
|
|
.line 97
|
|
throw p1
|
|
|
|
.line 98
|
|
:cond_5
|
|
new-instance p1, Ljava/io/InvalidObjectException;
|
|
|
|
.line 99
|
|
.line 100
|
|
const-string v1, "Unsupported flags value: "
|
|
|
|
.line 101
|
|
.line 102
|
|
invoke-static {v1, v0, v3}, Lcom/mycompany/app/dialog/a;->l(Ljava/lang/String;IC)Ljava/lang/String;
|
|
|
|
.line 103
|
|
.line 104
|
|
.line 105
|
|
move-result-object v0
|
|
|
|
.line 106
|
|
invoke-direct {p1, v0}, Ljava/io/InvalidObjectException;-><init>(Ljava/lang/String;)V
|
|
|
|
.line 107
|
|
.line 108
|
|
.line 109
|
|
throw p1
|
|
.end method
|
|
|
|
.method public writeExternal(Ljava/io/ObjectOutput;)V
|
|
.locals 2
|
|
.param p1 # Ljava/io/ObjectOutput;
|
|
.annotation build Lorg/jetbrains/annotations/NotNull;
|
|
.end annotation
|
|
.end param
|
|
|
|
.line 1
|
|
const-string v0, "output"
|
|
|
|
.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 v0, p0, Lkotlin/collections/builders/SerializedCollection;->tag:I
|
|
|
|
.line 7
|
|
.line 8
|
|
invoke-interface {p1, v0}, Ljava/io/DataOutput;->writeByte(I)V
|
|
|
|
.line 9
|
|
.line 10
|
|
.line 11
|
|
iget-object v0, p0, Lkotlin/collections/builders/SerializedCollection;->collection:Ljava/util/Collection;
|
|
|
|
.line 12
|
|
.line 13
|
|
invoke-interface {v0}, Ljava/util/Collection;->size()I
|
|
|
|
.line 14
|
|
.line 15
|
|
.line 16
|
|
move-result v0
|
|
|
|
.line 17
|
|
invoke-interface {p1, v0}, Ljava/io/DataOutput;->writeInt(I)V
|
|
|
|
.line 18
|
|
.line 19
|
|
.line 20
|
|
iget-object v0, p0, Lkotlin/collections/builders/SerializedCollection;->collection:Ljava/util/Collection;
|
|
|
|
.line 21
|
|
.line 22
|
|
invoke-interface {v0}, Ljava/util/Collection;->iterator()Ljava/util/Iterator;
|
|
|
|
.line 23
|
|
.line 24
|
|
.line 25
|
|
move-result-object v0
|
|
|
|
.line 26
|
|
:goto_0
|
|
invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
|
|
|
|
.line 27
|
|
.line 28
|
|
.line 29
|
|
move-result v1
|
|
|
|
.line 30
|
|
if-eqz v1, :cond_0
|
|
|
|
.line 31
|
|
.line 32
|
|
invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
|
|
|
|
.line 33
|
|
.line 34
|
|
.line 35
|
|
move-result-object v1
|
|
|
|
.line 36
|
|
invoke-interface {p1, v1}, Ljava/io/ObjectOutput;->writeObject(Ljava/lang/Object;)V
|
|
|
|
.line 37
|
|
.line 38
|
|
.line 39
|
|
goto :goto_0
|
|
|
|
.line 40
|
|
:cond_0
|
|
return-void
|
|
.end method
|