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>
460 lines
11 KiB
Smali
460 lines
11 KiB
Smali
.class public Lcom/google/android/gms/common/api/AvailabilityException;
|
|
.super Ljava/lang/Exception;
|
|
.source "SourceFile"
|
|
|
|
|
|
# instance fields
|
|
.field private final zaa:Landroidx/collection/ArrayMap;
|
|
|
|
|
|
# direct methods
|
|
.method public constructor <init>(Landroidx/collection/ArrayMap;)V
|
|
.locals 0
|
|
.param p1 # Landroidx/collection/ArrayMap;
|
|
.annotation build Landroidx/annotation/NonNull;
|
|
.end annotation
|
|
.end param
|
|
|
|
.line 1
|
|
invoke-direct {p0}, Ljava/lang/Exception;-><init>()V
|
|
|
|
.line 2
|
|
.line 3
|
|
.line 4
|
|
iput-object p1, p0, Lcom/google/android/gms/common/api/AvailabilityException;->zaa:Landroidx/collection/ArrayMap;
|
|
|
|
.line 5
|
|
.line 6
|
|
return-void
|
|
.end method
|
|
|
|
|
|
# virtual methods
|
|
.method public getConnectionResult(Lcom/google/android/gms/common/api/GoogleApi;)Lcom/google/android/gms/common/ConnectionResult;
|
|
.locals 6
|
|
.param p1 # Lcom/google/android/gms/common/api/GoogleApi;
|
|
.annotation build Landroidx/annotation/NonNull;
|
|
.end annotation
|
|
.end param
|
|
.annotation build Landroidx/annotation/NonNull;
|
|
.end annotation
|
|
|
|
.annotation system Ldalvik/annotation/Signature;
|
|
value = {
|
|
"(",
|
|
"Lcom/google/android/gms/common/api/GoogleApi<",
|
|
"+",
|
|
"Lcom/google/android/gms/common/api/Api$ApiOptions;",
|
|
">;)",
|
|
"Lcom/google/android/gms/common/ConnectionResult;"
|
|
}
|
|
.end annotation
|
|
|
|
.line 1
|
|
iget-object v0, p0, Lcom/google/android/gms/common/api/AvailabilityException;->zaa:Landroidx/collection/ArrayMap;
|
|
|
|
invoke-virtual {p1}, Lcom/google/android/gms/common/api/GoogleApi;->getApiKey()Lcom/google/android/gms/common/api/internal/ApiKey;
|
|
|
|
move-result-object p1
|
|
|
|
.line 2
|
|
invoke-virtual {v0, p1}, Landroidx/collection/SimpleArrayMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
move-result-object v1
|
|
|
|
.line 3
|
|
invoke-virtual {p1}, Lcom/google/android/gms/common/api/internal/ApiKey;->zaa()Ljava/lang/String;
|
|
|
|
move-result-object v2
|
|
|
|
invoke-static {v2}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
|
|
|
|
move-result-object v3
|
|
|
|
invoke-virtual {v3}, Ljava/lang/String;->length()I
|
|
|
|
move-result v3
|
|
|
|
new-instance v4, Ljava/lang/StringBuilder;
|
|
|
|
add-int/lit8 v3, v3, 0x3a
|
|
|
|
invoke-direct {v4, v3}, Ljava/lang/StringBuilder;-><init>(I)V
|
|
|
|
const-string v3, "The given API ("
|
|
|
|
const-string v5, ") was not part of the availability request."
|
|
|
|
.line 4
|
|
invoke-static {v4, v3, v2, v5}, Landroid/support/v4/media/a;->q(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
|
|
|
|
move-result-object v2
|
|
|
|
if-eqz v1, :cond_0
|
|
|
|
const/4 v1, 0x1
|
|
|
|
goto :goto_0
|
|
|
|
:cond_0
|
|
const/4 v1, 0x0
|
|
|
|
.line 5
|
|
:goto_0
|
|
invoke-static {v1, v2}, Lcom/google/android/gms/common/internal/Preconditions;->checkArgument(ZLjava/lang/Object;)V
|
|
|
|
.line 6
|
|
invoke-virtual {v0, p1}, Landroidx/collection/SimpleArrayMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
move-result-object p1
|
|
|
|
check-cast p1, Lcom/google/android/gms/common/ConnectionResult;
|
|
|
|
invoke-static {p1}, Lcom/google/android/gms/common/internal/Preconditions;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
move-result-object p1
|
|
|
|
check-cast p1, Lcom/google/android/gms/common/ConnectionResult;
|
|
|
|
return-object p1
|
|
.end method
|
|
|
|
.method public getConnectionResult(Lcom/google/android/gms/common/api/HasApiKey;)Lcom/google/android/gms/common/ConnectionResult;
|
|
.locals 6
|
|
.param p1 # Lcom/google/android/gms/common/api/HasApiKey;
|
|
.annotation build Landroidx/annotation/NonNull;
|
|
.end annotation
|
|
.end param
|
|
.annotation build Landroidx/annotation/NonNull;
|
|
.end annotation
|
|
|
|
.annotation system Ldalvik/annotation/Signature;
|
|
value = {
|
|
"(",
|
|
"Lcom/google/android/gms/common/api/HasApiKey<",
|
|
"+",
|
|
"Lcom/google/android/gms/common/api/Api$ApiOptions;",
|
|
">;)",
|
|
"Lcom/google/android/gms/common/ConnectionResult;"
|
|
}
|
|
.end annotation
|
|
|
|
.line 11
|
|
iget-object v0, p0, Lcom/google/android/gms/common/api/AvailabilityException;->zaa:Landroidx/collection/ArrayMap;
|
|
|
|
invoke-interface {p1}, Lcom/google/android/gms/common/api/HasApiKey;->getApiKey()Lcom/google/android/gms/common/api/internal/ApiKey;
|
|
|
|
move-result-object p1
|
|
|
|
.line 12
|
|
invoke-virtual {v0, p1}, Landroidx/collection/SimpleArrayMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
move-result-object v1
|
|
|
|
.line 13
|
|
invoke-virtual {p1}, Lcom/google/android/gms/common/api/internal/ApiKey;->zaa()Ljava/lang/String;
|
|
|
|
move-result-object v2
|
|
|
|
invoke-static {v2}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
|
|
|
|
move-result-object v3
|
|
|
|
invoke-virtual {v3}, Ljava/lang/String;->length()I
|
|
|
|
move-result v3
|
|
|
|
new-instance v4, Ljava/lang/StringBuilder;
|
|
|
|
add-int/lit8 v3, v3, 0x3a
|
|
|
|
invoke-direct {v4, v3}, Ljava/lang/StringBuilder;-><init>(I)V
|
|
|
|
const-string v3, "The given API ("
|
|
|
|
const-string v5, ") was not part of the availability request."
|
|
|
|
.line 14
|
|
invoke-static {v4, v3, v2, v5}, Landroid/support/v4/media/a;->q(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
|
|
|
|
move-result-object v2
|
|
|
|
if-eqz v1, :cond_0
|
|
|
|
const/4 v1, 0x1
|
|
|
|
goto :goto_0
|
|
|
|
:cond_0
|
|
const/4 v1, 0x0
|
|
|
|
.line 15
|
|
:goto_0
|
|
invoke-static {v1, v2}, Lcom/google/android/gms/common/internal/Preconditions;->checkArgument(ZLjava/lang/Object;)V
|
|
|
|
.line 16
|
|
invoke-virtual {v0, p1}, Landroidx/collection/SimpleArrayMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
move-result-object p1
|
|
|
|
check-cast p1, Lcom/google/android/gms/common/ConnectionResult;
|
|
|
|
invoke-static {p1}, Lcom/google/android/gms/common/internal/Preconditions;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
move-result-object p1
|
|
|
|
check-cast p1, Lcom/google/android/gms/common/ConnectionResult;
|
|
|
|
return-object p1
|
|
.end method
|
|
|
|
.method public getMessage()Ljava/lang/String;
|
|
.locals 10
|
|
.annotation build Landroidx/annotation/NonNull;
|
|
.end annotation
|
|
|
|
.line 1
|
|
new-instance v0, Ljava/util/ArrayList;
|
|
|
|
.line 2
|
|
.line 3
|
|
invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
|
|
|
|
.line 4
|
|
.line 5
|
|
.line 6
|
|
iget-object v1, p0, Lcom/google/android/gms/common/api/AvailabilityException;->zaa:Landroidx/collection/ArrayMap;
|
|
|
|
.line 7
|
|
.line 8
|
|
invoke-virtual {v1}, Landroidx/collection/ArrayMap;->keySet()Ljava/util/Set;
|
|
|
|
.line 9
|
|
.line 10
|
|
.line 11
|
|
move-result-object v2
|
|
|
|
.line 12
|
|
invoke-interface {v2}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
|
|
|
|
.line 13
|
|
.line 14
|
|
.line 15
|
|
move-result-object v2
|
|
|
|
.line 16
|
|
const/4 v3, 0x1
|
|
|
|
.line 17
|
|
move v4, v3
|
|
|
|
.line 18
|
|
:goto_0
|
|
invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
|
|
|
|
.line 19
|
|
.line 20
|
|
.line 21
|
|
move-result v5
|
|
|
|
.line 22
|
|
if-eqz v5, :cond_0
|
|
|
|
.line 23
|
|
.line 24
|
|
invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
|
|
|
|
.line 25
|
|
.line 26
|
|
.line 27
|
|
move-result-object v5
|
|
|
|
.line 28
|
|
check-cast v5, Lcom/google/android/gms/common/api/internal/ApiKey;
|
|
|
|
.line 29
|
|
.line 30
|
|
invoke-virtual {v1, v5}, Landroidx/collection/SimpleArrayMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
.line 31
|
|
.line 32
|
|
.line 33
|
|
move-result-object v6
|
|
|
|
.line 34
|
|
check-cast v6, Lcom/google/android/gms/common/ConnectionResult;
|
|
|
|
.line 35
|
|
.line 36
|
|
invoke-static {v6}, Lcom/google/android/gms/common/internal/Preconditions;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
.line 37
|
|
.line 38
|
|
.line 39
|
|
move-result-object v6
|
|
|
|
.line 40
|
|
check-cast v6, Lcom/google/android/gms/common/ConnectionResult;
|
|
|
|
.line 41
|
|
.line 42
|
|
invoke-virtual {v6}, Lcom/google/android/gms/common/ConnectionResult;->isSuccess()Z
|
|
|
|
.line 43
|
|
.line 44
|
|
.line 45
|
|
move-result v7
|
|
|
|
.line 46
|
|
xor-int/2addr v7, v3
|
|
|
|
.line 47
|
|
and-int/2addr v4, v7
|
|
|
|
.line 48
|
|
invoke-virtual {v5}, Lcom/google/android/gms/common/api/internal/ApiKey;->zaa()Ljava/lang/String;
|
|
|
|
.line 49
|
|
.line 50
|
|
.line 51
|
|
move-result-object v5
|
|
|
|
.line 52
|
|
invoke-static {v6}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
|
|
|
|
.line 53
|
|
.line 54
|
|
.line 55
|
|
move-result-object v6
|
|
|
|
.line 56
|
|
const/4 v7, 0x2
|
|
|
|
.line 57
|
|
invoke-static {v7, v5}, Landroidx/work/impl/workers/a;->e(ILjava/lang/String;)I
|
|
|
|
.line 58
|
|
.line 59
|
|
.line 60
|
|
move-result v7
|
|
|
|
.line 61
|
|
invoke-virtual {v6}, Ljava/lang/String;->length()I
|
|
|
|
.line 62
|
|
.line 63
|
|
.line 64
|
|
move-result v8
|
|
|
|
.line 65
|
|
new-instance v9, Ljava/lang/StringBuilder;
|
|
|
|
.line 66
|
|
.line 67
|
|
add-int/2addr v7, v8
|
|
|
|
.line 68
|
|
invoke-direct {v9, v7}, Ljava/lang/StringBuilder;-><init>(I)V
|
|
|
|
.line 69
|
|
.line 70
|
|
.line 71
|
|
invoke-virtual {v9, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
|
|
|
.line 72
|
|
.line 73
|
|
.line 74
|
|
const-string v5, ": "
|
|
|
|
.line 75
|
|
.line 76
|
|
invoke-virtual {v9, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
|
|
|
.line 77
|
|
.line 78
|
|
.line 79
|
|
invoke-virtual {v9, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
|
|
|
.line 80
|
|
.line 81
|
|
.line 82
|
|
invoke-virtual {v9}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
|
|
|
|
.line 83
|
|
.line 84
|
|
.line 85
|
|
move-result-object v5
|
|
|
|
.line 86
|
|
invoke-virtual {v0, v5}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
|
|
|
|
.line 87
|
|
.line 88
|
|
.line 89
|
|
goto :goto_0
|
|
|
|
.line 90
|
|
:cond_0
|
|
new-instance v1, Ljava/lang/StringBuilder;
|
|
|
|
.line 91
|
|
.line 92
|
|
invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
|
|
|
|
.line 93
|
|
.line 94
|
|
.line 95
|
|
if-eqz v4, :cond_1
|
|
|
|
.line 96
|
|
.line 97
|
|
const-string v2, "None of the queried APIs are available. "
|
|
|
|
.line 98
|
|
.line 99
|
|
invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
|
|
|
.line 100
|
|
.line 101
|
|
.line 102
|
|
goto :goto_1
|
|
|
|
.line 103
|
|
:cond_1
|
|
const-string v2, "Some of the queried APIs are unavailable. "
|
|
|
|
.line 104
|
|
.line 105
|
|
invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
|
|
|
.line 106
|
|
.line 107
|
|
.line 108
|
|
:goto_1
|
|
const-string v2, "; "
|
|
|
|
.line 109
|
|
.line 110
|
|
invoke-static {v2, v0}, Landroid/text/TextUtils;->join(Ljava/lang/CharSequence;Ljava/lang/Iterable;)Ljava/lang/String;
|
|
|
|
.line 111
|
|
.line 112
|
|
.line 113
|
|
move-result-object v0
|
|
|
|
.line 114
|
|
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
|
|
|
.line 115
|
|
.line 116
|
|
.line 117
|
|
invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
|
|
|
|
.line 118
|
|
.line 119
|
|
.line 120
|
|
move-result-object v0
|
|
|
|
.line 121
|
|
return-object v0
|
|
.end method
|