* 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>
427 lines
10 KiB
Smali
427 lines
10 KiB
Smali
.class public final Lcom/google/android/gms/identitycredentials/CredentialOption;
|
|
.super Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;
|
|
.source "SourceFile"
|
|
|
|
|
|
# annotations
|
|
.annotation runtime Lcom/google/android/gms/common/internal/safeparcel/SafeParcelable$Class;
|
|
creator = "CredentialOptionCreator"
|
|
.end annotation
|
|
|
|
.annotation system Ldalvik/annotation/MemberClasses;
|
|
value = {
|
|
Lcom/google/android/gms/identitycredentials/CredentialOption$Companion;
|
|
}
|
|
.end annotation
|
|
|
|
.annotation runtime Lkotlin/Metadata;
|
|
d1 = {
|
|
"\u0000\u000c\n\u0002\u0018\u0002\n\u0002\u0018\u0002\n\u0002\u0008\u0002\u0008\u0007\u0018\u00002\u00020\u0001:\u0001\u0002\u00a8\u0006\u0003"
|
|
}
|
|
d2 = {
|
|
"Lcom/google/android/gms/identitycredentials/CredentialOption;",
|
|
"Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;",
|
|
"Companion",
|
|
"java.com.google.android.gmscore.integ.client.identity_credentials_identity_credentials"
|
|
}
|
|
k = 0x1
|
|
mv = {
|
|
0x2,
|
|
0x0,
|
|
0x0
|
|
}
|
|
xi = 0x30
|
|
.end annotation
|
|
|
|
|
|
# static fields
|
|
.field public static final CREATOR:Landroid/os/Parcelable$Creator;
|
|
.annotation system Ldalvik/annotation/Signature;
|
|
value = {
|
|
"Landroid/os/Parcelable$Creator<",
|
|
"Lcom/google/android/gms/identitycredentials/CredentialOption;",
|
|
">;"
|
|
}
|
|
.end annotation
|
|
|
|
.annotation build Lkotlin/jvm/JvmField;
|
|
.end annotation
|
|
|
|
.annotation build Lorg/jetbrains/annotations/NotNull;
|
|
.end annotation
|
|
.end field
|
|
|
|
|
|
# instance fields
|
|
.field public final c:Ljava/lang/String;
|
|
|
|
.field public final f:Landroid/os/Bundle;
|
|
|
|
.field public final g:Landroid/os/Bundle;
|
|
|
|
.field public final h:Ljava/lang/String;
|
|
|
|
.field public final i:Ljava/lang/String;
|
|
|
|
.field public final j:Ljava/lang/String;
|
|
|
|
|
|
# direct methods
|
|
.method static constructor <clinit>()V
|
|
.locals 1
|
|
|
|
.line 1
|
|
new-instance v0, Lcom/google/android/gms/identitycredentials/CredentialOptionCreator;
|
|
|
|
.line 2
|
|
.line 3
|
|
invoke-direct {v0}, Ljava/lang/Object;-><init>()V
|
|
|
|
.line 4
|
|
.line 5
|
|
.line 6
|
|
sput-object v0, Lcom/google/android/gms/identitycredentials/CredentialOption;->CREATOR:Landroid/os/Parcelable$Creator;
|
|
|
|
.line 7
|
|
.line 8
|
|
return-void
|
|
.end method
|
|
|
|
.method public constructor <init>(Ljava/lang/String;Landroid/os/Bundle;Landroid/os/Bundle;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
|
|
.locals 1
|
|
|
|
.line 1
|
|
const-string v0, "type"
|
|
|
|
.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, "credentialRetrievalData"
|
|
|
|
.line 7
|
|
.line 8
|
|
invoke-static {p2, v0}, Lkotlin/jvm/internal/Intrinsics;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
|
|
|
|
.line 9
|
|
.line 10
|
|
.line 11
|
|
const-string v0, "candidateQueryData"
|
|
|
|
.line 12
|
|
.line 13
|
|
invoke-static {p3, v0}, Lkotlin/jvm/internal/Intrinsics;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
|
|
|
|
.line 14
|
|
.line 15
|
|
.line 16
|
|
const-string v0, "requestMatcher"
|
|
|
|
.line 17
|
|
.line 18
|
|
invoke-static {p4, v0}, Lkotlin/jvm/internal/Intrinsics;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
|
|
|
|
.line 19
|
|
.line 20
|
|
.line 21
|
|
const-string v0, "requestType"
|
|
|
|
.line 22
|
|
.line 23
|
|
invoke-static {p5, v0}, Lkotlin/jvm/internal/Intrinsics;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
|
|
|
|
.line 24
|
|
.line 25
|
|
.line 26
|
|
const-string v0, "protocolType"
|
|
|
|
.line 27
|
|
.line 28
|
|
invoke-static {p6, v0}, Lkotlin/jvm/internal/Intrinsics;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
|
|
|
|
.line 29
|
|
.line 30
|
|
.line 31
|
|
invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
|
|
|
|
.line 32
|
|
.line 33
|
|
.line 34
|
|
iput-object p1, p0, Lcom/google/android/gms/identitycredentials/CredentialOption;->c:Ljava/lang/String;
|
|
|
|
.line 35
|
|
.line 36
|
|
iput-object p2, p0, Lcom/google/android/gms/identitycredentials/CredentialOption;->f:Landroid/os/Bundle;
|
|
|
|
.line 37
|
|
.line 38
|
|
iput-object p3, p0, Lcom/google/android/gms/identitycredentials/CredentialOption;->g:Landroid/os/Bundle;
|
|
|
|
.line 39
|
|
.line 40
|
|
iput-object p4, p0, Lcom/google/android/gms/identitycredentials/CredentialOption;->h:Ljava/lang/String;
|
|
|
|
.line 41
|
|
.line 42
|
|
iput-object p5, p0, Lcom/google/android/gms/identitycredentials/CredentialOption;->i:Ljava/lang/String;
|
|
|
|
.line 43
|
|
.line 44
|
|
iput-object p6, p0, Lcom/google/android/gms/identitycredentials/CredentialOption;->j:Ljava/lang/String;
|
|
|
|
.line 45
|
|
.line 46
|
|
invoke-static {p5}, Lkotlin/text/StringsKt;->isBlank(Ljava/lang/CharSequence;)Z
|
|
|
|
.line 47
|
|
.line 48
|
|
.line 49
|
|
move-result p2
|
|
|
|
.line 50
|
|
const/4 p3, 0x1
|
|
|
|
.line 51
|
|
const/4 p4, 0x0
|
|
|
|
.line 52
|
|
if-nez p2, :cond_0
|
|
|
|
.line 53
|
|
.line 54
|
|
invoke-static {p6}, Lkotlin/text/StringsKt;->isBlank(Ljava/lang/CharSequence;)Z
|
|
|
|
.line 55
|
|
.line 56
|
|
.line 57
|
|
move-result p2
|
|
|
|
.line 58
|
|
if-nez p2, :cond_0
|
|
|
|
.line 59
|
|
.line 60
|
|
move p2, p3
|
|
|
|
.line 61
|
|
goto :goto_0
|
|
|
|
.line 62
|
|
:cond_0
|
|
move p2, p4
|
|
|
|
.line 63
|
|
:goto_0
|
|
invoke-static {p1}, Lkotlin/text/StringsKt;->isBlank(Ljava/lang/CharSequence;)Z
|
|
|
|
.line 64
|
|
.line 65
|
|
.line 66
|
|
move-result v0
|
|
|
|
.line 67
|
|
if-nez v0, :cond_1
|
|
|
|
.line 68
|
|
.line 69
|
|
invoke-interface {p5}, Ljava/lang/CharSequence;->length()I
|
|
|
|
.line 70
|
|
.line 71
|
|
.line 72
|
|
move-result v0
|
|
|
|
.line 73
|
|
if-nez v0, :cond_1
|
|
|
|
.line 74
|
|
.line 75
|
|
invoke-interface {p6}, Ljava/lang/CharSequence;->length()I
|
|
|
|
.line 76
|
|
.line 77
|
|
.line 78
|
|
move-result v0
|
|
|
|
.line 79
|
|
if-nez v0, :cond_1
|
|
|
|
.line 80
|
|
.line 81
|
|
goto :goto_1
|
|
|
|
.line 82
|
|
:cond_1
|
|
move p3, p4
|
|
|
|
.line 83
|
|
:goto_1
|
|
if-nez p2, :cond_3
|
|
|
|
.line 84
|
|
.line 85
|
|
if-eqz p3, :cond_2
|
|
|
|
.line 86
|
|
.line 87
|
|
goto :goto_2
|
|
|
|
.line 88
|
|
:cond_2
|
|
const-string p2, ", or requestType: "
|
|
|
|
.line 89
|
|
.line 90
|
|
const-string p3, " and protocolType: "
|
|
|
|
.line 91
|
|
.line 92
|
|
const-string p4, "Either type: "
|
|
|
|
.line 93
|
|
.line 94
|
|
invoke-static {p4, p1, p2, p5, p3}, Landroidx/work/impl/workers/a;->u(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;
|
|
|
|
.line 95
|
|
.line 96
|
|
.line 97
|
|
move-result-object p1
|
|
|
|
.line 98
|
|
const-string p2, " must be specified, but at least one contains an invalid blank value."
|
|
|
|
.line 99
|
|
.line 100
|
|
invoke-static {p1, p6, p2}, Landroid/support/v4/media/a;->p(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
|
|
|
|
.line 101
|
|
.line 102
|
|
.line 103
|
|
move-result-object p1
|
|
|
|
.line 104
|
|
new-instance p2, Ljava/lang/IllegalArgumentException;
|
|
|
|
.line 105
|
|
.line 106
|
|
invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
|
|
|
|
.line 107
|
|
.line 108
|
|
.line 109
|
|
throw p2
|
|
|
|
.line 110
|
|
:cond_3
|
|
:goto_2
|
|
return-void
|
|
.end method
|
|
|
|
|
|
# virtual methods
|
|
.method public final writeToParcel(Landroid/os/Parcel;I)V
|
|
.locals 3
|
|
|
|
.line 1
|
|
const-string p2, "dest"
|
|
|
|
.line 2
|
|
.line 3
|
|
invoke-static {p1, p2}, Lkotlin/jvm/internal/Intrinsics;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
|
|
|
|
.line 4
|
|
.line 5
|
|
.line 6
|
|
invoke-static {p1}, Lcom/google/android/gms/common/internal/safeparcel/SafeParcelWriter;->beginObjectHeader(Landroid/os/Parcel;)I
|
|
|
|
.line 7
|
|
.line 8
|
|
.line 9
|
|
move-result p2
|
|
|
|
.line 10
|
|
const/4 v0, 0x1
|
|
|
|
.line 11
|
|
iget-object v1, p0, Lcom/google/android/gms/identitycredentials/CredentialOption;->c:Ljava/lang/String;
|
|
|
|
.line 12
|
|
.line 13
|
|
const/4 v2, 0x0
|
|
|
|
.line 14
|
|
invoke-static {p1, v0, v1, v2}, Lcom/google/android/gms/common/internal/safeparcel/SafeParcelWriter;->writeString(Landroid/os/Parcel;ILjava/lang/String;Z)V
|
|
|
|
.line 15
|
|
.line 16
|
|
.line 17
|
|
const/4 v0, 0x2
|
|
|
|
.line 18
|
|
iget-object v1, p0, Lcom/google/android/gms/identitycredentials/CredentialOption;->f:Landroid/os/Bundle;
|
|
|
|
.line 19
|
|
.line 20
|
|
invoke-static {p1, v0, v1, v2}, Lcom/google/android/gms/common/internal/safeparcel/SafeParcelWriter;->writeBundle(Landroid/os/Parcel;ILandroid/os/Bundle;Z)V
|
|
|
|
.line 21
|
|
.line 22
|
|
.line 23
|
|
const/4 v0, 0x3
|
|
|
|
.line 24
|
|
iget-object v1, p0, Lcom/google/android/gms/identitycredentials/CredentialOption;->g:Landroid/os/Bundle;
|
|
|
|
.line 25
|
|
.line 26
|
|
invoke-static {p1, v0, v1, v2}, Lcom/google/android/gms/common/internal/safeparcel/SafeParcelWriter;->writeBundle(Landroid/os/Parcel;ILandroid/os/Bundle;Z)V
|
|
|
|
.line 27
|
|
.line 28
|
|
.line 29
|
|
const/4 v0, 0x4
|
|
|
|
.line 30
|
|
iget-object v1, p0, Lcom/google/android/gms/identitycredentials/CredentialOption;->h:Ljava/lang/String;
|
|
|
|
.line 31
|
|
.line 32
|
|
invoke-static {p1, v0, v1, v2}, Lcom/google/android/gms/common/internal/safeparcel/SafeParcelWriter;->writeString(Landroid/os/Parcel;ILjava/lang/String;Z)V
|
|
|
|
.line 33
|
|
.line 34
|
|
.line 35
|
|
const/4 v0, 0x5
|
|
|
|
.line 36
|
|
iget-object v1, p0, Lcom/google/android/gms/identitycredentials/CredentialOption;->i:Ljava/lang/String;
|
|
|
|
.line 37
|
|
.line 38
|
|
invoke-static {p1, v0, v1, v2}, Lcom/google/android/gms/common/internal/safeparcel/SafeParcelWriter;->writeString(Landroid/os/Parcel;ILjava/lang/String;Z)V
|
|
|
|
.line 39
|
|
.line 40
|
|
.line 41
|
|
const/4 v0, 0x6
|
|
|
|
.line 42
|
|
iget-object v1, p0, Lcom/google/android/gms/identitycredentials/CredentialOption;->j:Ljava/lang/String;
|
|
|
|
.line 43
|
|
.line 44
|
|
invoke-static {p1, v0, v1, v2}, Lcom/google/android/gms/common/internal/safeparcel/SafeParcelWriter;->writeString(Landroid/os/Parcel;ILjava/lang/String;Z)V
|
|
|
|
.line 45
|
|
.line 46
|
|
.line 47
|
|
invoke-static {p1, p2}, Lcom/google/android/gms/common/internal/safeparcel/SafeParcelWriter;->finishObjectHeader(Landroid/os/Parcel;I)V
|
|
|
|
.line 48
|
|
.line 49
|
|
.line 50
|
|
return-void
|
|
.end method
|