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>
585 lines
13 KiB
Smali
585 lines
13 KiB
Smali
.class public Lcom/google/android/gms/common/internal/LibraryVersion;
|
|
.super Ljava/lang/Object;
|
|
.source "SourceFile"
|
|
|
|
|
|
# annotations
|
|
.annotation build Lcom/google/android/gms/common/annotation/KeepForSdk;
|
|
.end annotation
|
|
|
|
.annotation runtime Ljava/lang/Deprecated;
|
|
.end annotation
|
|
|
|
|
|
# static fields
|
|
.field private static final zza:Lcom/google/android/gms/common/internal/GmsLogger;
|
|
|
|
.field private static final zzb:Lcom/google/android/gms/common/internal/LibraryVersion;
|
|
|
|
|
|
# instance fields
|
|
.field private final zzc:Lj$/util/concurrent/ConcurrentHashMap;
|
|
|
|
|
|
# direct methods
|
|
.method static constructor <clinit>()V
|
|
.locals 3
|
|
|
|
.line 1
|
|
new-instance v0, Lcom/google/android/gms/common/internal/GmsLogger;
|
|
|
|
.line 2
|
|
.line 3
|
|
const-string v1, "LibraryVersion"
|
|
|
|
.line 4
|
|
.line 5
|
|
const-string v2, ""
|
|
|
|
.line 6
|
|
.line 7
|
|
invoke-direct {v0, v1, v2}, Lcom/google/android/gms/common/internal/GmsLogger;-><init>(Ljava/lang/String;Ljava/lang/String;)V
|
|
|
|
.line 8
|
|
.line 9
|
|
.line 10
|
|
sput-object v0, Lcom/google/android/gms/common/internal/LibraryVersion;->zza:Lcom/google/android/gms/common/internal/GmsLogger;
|
|
|
|
.line 11
|
|
.line 12
|
|
new-instance v0, Lcom/google/android/gms/common/internal/LibraryVersion;
|
|
|
|
.line 13
|
|
.line 14
|
|
invoke-direct {v0}, Lcom/google/android/gms/common/internal/LibraryVersion;-><init>()V
|
|
|
|
.line 15
|
|
.line 16
|
|
.line 17
|
|
sput-object v0, Lcom/google/android/gms/common/internal/LibraryVersion;->zzb:Lcom/google/android/gms/common/internal/LibraryVersion;
|
|
|
|
.line 18
|
|
.line 19
|
|
return-void
|
|
.end method
|
|
|
|
.method public constructor <init>()V
|
|
.locals 1
|
|
.annotation build Landroidx/annotation/VisibleForTesting;
|
|
.end annotation
|
|
|
|
.line 1
|
|
invoke-direct {p0}, Ljava/lang/Object;-><init>()V
|
|
|
|
.line 2
|
|
.line 3
|
|
.line 4
|
|
new-instance v0, Lj$/util/concurrent/ConcurrentHashMap;
|
|
|
|
.line 5
|
|
.line 6
|
|
invoke-direct {v0}, Lj$/util/concurrent/ConcurrentHashMap;-><init>()V
|
|
|
|
.line 7
|
|
.line 8
|
|
.line 9
|
|
iput-object v0, p0, Lcom/google/android/gms/common/internal/LibraryVersion;->zzc:Lj$/util/concurrent/ConcurrentHashMap;
|
|
|
|
.line 10
|
|
.line 11
|
|
return-void
|
|
.end method
|
|
|
|
.method public static getInstance()Lcom/google/android/gms/common/internal/LibraryVersion;
|
|
.locals 1
|
|
.annotation build Landroidx/annotation/NonNull;
|
|
.end annotation
|
|
|
|
.annotation build Lcom/google/android/gms/common/annotation/KeepForSdk;
|
|
.end annotation
|
|
|
|
sget-object v0, Lcom/google/android/gms/common/internal/LibraryVersion;->zzb:Lcom/google/android/gms/common/internal/LibraryVersion;
|
|
|
|
return-object v0
|
|
.end method
|
|
|
|
|
|
# virtual methods
|
|
.method public getVersion(Ljava/lang/String;)Ljava/lang/String;
|
|
.locals 9
|
|
.param p1 # Ljava/lang/String;
|
|
.annotation build Landroidx/annotation/NonNull;
|
|
.end annotation
|
|
.end param
|
|
.annotation build Landroidx/annotation/NonNull;
|
|
.end annotation
|
|
|
|
.annotation build Lcom/google/android/gms/common/annotation/KeepForSdk;
|
|
.end annotation
|
|
|
|
.annotation runtime Ljava/lang/Deprecated;
|
|
.end annotation
|
|
|
|
.line 1
|
|
const-string v0, "LibraryVersion"
|
|
|
|
.line 2
|
|
.line 3
|
|
const-string v1, "/"
|
|
|
|
.line 4
|
|
.line 5
|
|
const-string v2, "Please provide a valid libraryName"
|
|
|
|
.line 6
|
|
.line 7
|
|
invoke-static {p1, v2}, Lcom/google/android/gms/common/internal/Preconditions;->checkNotEmpty(Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/String;
|
|
|
|
.line 8
|
|
.line 9
|
|
.line 10
|
|
const-string v2, " version is "
|
|
|
|
.line 11
|
|
.line 12
|
|
const-string v3, "Failed to get app version for libraryName: "
|
|
|
|
.line 13
|
|
.line 14
|
|
iget-object v4, p0, Lcom/google/android/gms/common/internal/LibraryVersion;->zzc:Lj$/util/concurrent/ConcurrentHashMap;
|
|
|
|
.line 15
|
|
.line 16
|
|
invoke-virtual {v4, p1}, Lj$/util/concurrent/ConcurrentHashMap;->containsKey(Ljava/lang/Object;)Z
|
|
|
|
.line 17
|
|
.line 18
|
|
.line 19
|
|
move-result v5
|
|
|
|
.line 20
|
|
if-eqz v5, :cond_0
|
|
|
|
.line 21
|
|
.line 22
|
|
invoke-virtual {v4, p1}, Lj$/util/concurrent/ConcurrentHashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
.line 23
|
|
.line 24
|
|
.line 25
|
|
move-result-object p1
|
|
|
|
.line 26
|
|
check-cast p1, Ljava/lang/String;
|
|
|
|
.line 27
|
|
.line 28
|
|
return-object p1
|
|
|
|
.line 29
|
|
:cond_0
|
|
new-instance v4, Ljava/util/Properties;
|
|
|
|
.line 30
|
|
.line 31
|
|
invoke-direct {v4}, Ljava/util/Properties;-><init>()V
|
|
|
|
.line 32
|
|
.line 33
|
|
.line 34
|
|
const/4 v5, 0x0
|
|
|
|
.line 35
|
|
:try_start_0
|
|
new-instance v6, Ljava/lang/StringBuilder;
|
|
|
|
.line 36
|
|
.line 37
|
|
invoke-direct {v6, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
|
|
|
|
.line 38
|
|
.line 39
|
|
.line 40
|
|
invoke-virtual {v6, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
|
|
|
.line 41
|
|
.line 42
|
|
.line 43
|
|
const-string v1, ".properties"
|
|
|
|
.line 44
|
|
.line 45
|
|
invoke-virtual {v6, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
|
|
|
.line 46
|
|
.line 47
|
|
.line 48
|
|
invoke-virtual {v6}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
|
|
|
|
.line 49
|
|
.line 50
|
|
.line 51
|
|
move-result-object v1
|
|
|
|
.line 52
|
|
const-class v6, Lcom/google/android/gms/common/internal/LibraryVersion;
|
|
|
|
.line 53
|
|
.line 54
|
|
invoke-virtual {v6, v1}, Ljava/lang/Class;->getResourceAsStream(Ljava/lang/String;)Ljava/io/InputStream;
|
|
|
|
.line 55
|
|
.line 56
|
|
.line 57
|
|
move-result-object v1
|
|
:try_end_0
|
|
.catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_1
|
|
.catchall {:try_start_0 .. :try_end_0} :catchall_1
|
|
|
|
.line 58
|
|
if-eqz v1, :cond_1
|
|
|
|
.line 59
|
|
.line 60
|
|
:try_start_1
|
|
invoke-virtual {v4, v1}, Ljava/util/Properties;->load(Ljava/io/InputStream;)V
|
|
|
|
.line 61
|
|
.line 62
|
|
.line 63
|
|
const-string v6, "version"
|
|
|
|
.line 64
|
|
.line 65
|
|
invoke-virtual {v4, v6, v5}, Ljava/util/Properties;->getProperty(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
|
|
|
|
.line 66
|
|
.line 67
|
|
.line 68
|
|
move-result-object v5
|
|
|
|
.line 69
|
|
sget-object v4, Lcom/google/android/gms/common/internal/LibraryVersion;->zza:Lcom/google/android/gms/common/internal/GmsLogger;
|
|
|
|
.line 70
|
|
.line 71
|
|
invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
|
|
|
|
.line 72
|
|
.line 73
|
|
.line 74
|
|
move-result-object v6
|
|
|
|
.line 75
|
|
invoke-virtual {v6}, Ljava/lang/String;->length()I
|
|
|
|
.line 76
|
|
.line 77
|
|
.line 78
|
|
move-result v6
|
|
|
|
.line 79
|
|
add-int/lit8 v6, v6, 0xc
|
|
|
|
.line 80
|
|
.line 81
|
|
invoke-static {v5}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
|
|
|
|
.line 82
|
|
.line 83
|
|
.line 84
|
|
move-result-object v7
|
|
|
|
.line 85
|
|
invoke-virtual {v7}, Ljava/lang/String;->length()I
|
|
|
|
.line 86
|
|
.line 87
|
|
.line 88
|
|
move-result v7
|
|
|
|
.line 89
|
|
add-int/2addr v6, v7
|
|
|
|
.line 90
|
|
new-instance v7, Ljava/lang/StringBuilder;
|
|
|
|
.line 91
|
|
.line 92
|
|
invoke-direct {v7, v6}, Ljava/lang/StringBuilder;-><init>(I)V
|
|
|
|
.line 93
|
|
.line 94
|
|
.line 95
|
|
invoke-virtual {v7, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
|
|
|
.line 96
|
|
.line 97
|
|
.line 98
|
|
invoke-virtual {v7, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
|
|
|
.line 99
|
|
.line 100
|
|
.line 101
|
|
invoke-virtual {v7, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
|
|
|
.line 102
|
|
.line 103
|
|
.line 104
|
|
invoke-virtual {v7}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
|
|
|
|
.line 105
|
|
.line 106
|
|
.line 107
|
|
move-result-object v2
|
|
|
|
.line 108
|
|
invoke-virtual {v4, v0, v2}, Lcom/google/android/gms/common/internal/GmsLogger;->v(Ljava/lang/String;Ljava/lang/String;)V
|
|
|
|
.line 109
|
|
.line 110
|
|
.line 111
|
|
goto :goto_3
|
|
|
|
.line 112
|
|
:catchall_0
|
|
move-exception p1
|
|
|
|
.line 113
|
|
goto :goto_0
|
|
|
|
.line 114
|
|
:catch_0
|
|
move-exception v2
|
|
|
|
.line 115
|
|
move-object v8, v5
|
|
|
|
.line 116
|
|
move-object v5, v1
|
|
|
|
.line 117
|
|
move-object v1, v8
|
|
|
|
.line 118
|
|
goto :goto_2
|
|
|
|
.line 119
|
|
:cond_1
|
|
sget-object v2, Lcom/google/android/gms/common/internal/LibraryVersion;->zza:Lcom/google/android/gms/common/internal/GmsLogger;
|
|
|
|
.line 120
|
|
.line 121
|
|
invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
|
|
|
|
.line 122
|
|
.line 123
|
|
.line 124
|
|
move-result-object v4
|
|
|
|
.line 125
|
|
invoke-virtual {v4}, Ljava/lang/String;->length()I
|
|
|
|
.line 126
|
|
.line 127
|
|
.line 128
|
|
move-result v4
|
|
|
|
.line 129
|
|
add-int/lit8 v4, v4, 0x2b
|
|
|
|
.line 130
|
|
.line 131
|
|
new-instance v6, Ljava/lang/StringBuilder;
|
|
|
|
.line 132
|
|
.line 133
|
|
invoke-direct {v6, v4}, Ljava/lang/StringBuilder;-><init>(I)V
|
|
|
|
.line 134
|
|
.line 135
|
|
.line 136
|
|
invoke-virtual {v6, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
|
|
|
.line 137
|
|
.line 138
|
|
.line 139
|
|
invoke-virtual {v6, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
|
|
|
.line 140
|
|
.line 141
|
|
.line 142
|
|
invoke-virtual {v6}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
|
|
|
|
.line 143
|
|
.line 144
|
|
.line 145
|
|
move-result-object v4
|
|
|
|
.line 146
|
|
invoke-virtual {v2, v0, v4}, Lcom/google/android/gms/common/internal/GmsLogger;->w(Ljava/lang/String;Ljava/lang/String;)V
|
|
:try_end_1
|
|
.catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_0
|
|
.catchall {:try_start_1 .. :try_end_1} :catchall_0
|
|
|
|
.line 147
|
|
.line 148
|
|
.line 149
|
|
goto :goto_3
|
|
|
|
.line 150
|
|
:goto_0
|
|
move-object v5, v1
|
|
|
|
.line 151
|
|
goto :goto_4
|
|
|
|
.line 152
|
|
:catch_1
|
|
move-exception v1
|
|
|
|
.line 153
|
|
move-object v2, v1
|
|
|
|
.line 154
|
|
goto :goto_1
|
|
|
|
.line 155
|
|
:catchall_1
|
|
move-exception p1
|
|
|
|
.line 156
|
|
goto :goto_4
|
|
|
|
.line 157
|
|
:goto_1
|
|
move-object v1, v5
|
|
|
|
.line 158
|
|
:goto_2
|
|
:try_start_2
|
|
sget-object v4, Lcom/google/android/gms/common/internal/LibraryVersion;->zza:Lcom/google/android/gms/common/internal/GmsLogger;
|
|
|
|
.line 159
|
|
.line 160
|
|
invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
|
|
|
|
.line 161
|
|
.line 162
|
|
.line 163
|
|
move-result-object v6
|
|
|
|
.line 164
|
|
invoke-virtual {v6}, Ljava/lang/String;->length()I
|
|
|
|
.line 165
|
|
.line 166
|
|
.line 167
|
|
move-result v6
|
|
|
|
.line 168
|
|
add-int/lit8 v6, v6, 0x2b
|
|
|
|
.line 169
|
|
.line 170
|
|
new-instance v7, Ljava/lang/StringBuilder;
|
|
|
|
.line 171
|
|
.line 172
|
|
invoke-direct {v7, v6}, Ljava/lang/StringBuilder;-><init>(I)V
|
|
|
|
.line 173
|
|
.line 174
|
|
.line 175
|
|
invoke-virtual {v7, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
|
|
|
.line 176
|
|
.line 177
|
|
.line 178
|
|
invoke-virtual {v7, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
|
|
|
.line 179
|
|
.line 180
|
|
.line 181
|
|
invoke-virtual {v7}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
|
|
|
|
.line 182
|
|
.line 183
|
|
.line 184
|
|
move-result-object v3
|
|
|
|
.line 185
|
|
invoke-virtual {v4, v0, v3, v2}, Lcom/google/android/gms/common/internal/GmsLogger;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
|
|
:try_end_2
|
|
.catchall {:try_start_2 .. :try_end_2} :catchall_1
|
|
|
|
.line 186
|
|
.line 187
|
|
.line 188
|
|
move-object v8, v5
|
|
|
|
.line 189
|
|
move-object v5, v1
|
|
|
|
.line 190
|
|
move-object v1, v8
|
|
|
|
.line 191
|
|
:goto_3
|
|
if-eqz v1, :cond_2
|
|
|
|
.line 192
|
|
.line 193
|
|
invoke-static {v1}, Lcom/google/android/gms/common/util/IOUtils;->closeQuietly(Ljava/io/Closeable;)V
|
|
|
|
.line 194
|
|
.line 195
|
|
.line 196
|
|
:cond_2
|
|
if-nez v5, :cond_3
|
|
|
|
.line 197
|
|
.line 198
|
|
sget-object v1, Lcom/google/android/gms/common/internal/LibraryVersion;->zza:Lcom/google/android/gms/common/internal/GmsLogger;
|
|
|
|
.line 199
|
|
.line 200
|
|
const-string v2, ".properties file is dropped during release process. Failure to read app version is expected during Google internal testing where locally-built libraries are used"
|
|
|
|
.line 201
|
|
.line 202
|
|
invoke-virtual {v1, v0, v2}, Lcom/google/android/gms/common/internal/GmsLogger;->d(Ljava/lang/String;Ljava/lang/String;)V
|
|
|
|
.line 203
|
|
.line 204
|
|
.line 205
|
|
const-string v5, "UNKNOWN"
|
|
|
|
.line 206
|
|
.line 207
|
|
:cond_3
|
|
iget-object v0, p0, Lcom/google/android/gms/common/internal/LibraryVersion;->zzc:Lj$/util/concurrent/ConcurrentHashMap;
|
|
|
|
.line 208
|
|
.line 209
|
|
invoke-virtual {v0, p1, v5}, Lj$/util/concurrent/ConcurrentHashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
.line 210
|
|
.line 211
|
|
.line 212
|
|
return-object v5
|
|
|
|
.line 213
|
|
:goto_4
|
|
if-eqz v5, :cond_4
|
|
|
|
.line 214
|
|
.line 215
|
|
invoke-static {v5}, Lcom/google/android/gms/common/util/IOUtils;->closeQuietly(Ljava/io/Closeable;)V
|
|
|
|
.line 216
|
|
.line 217
|
|
.line 218
|
|
:cond_4
|
|
throw p1
|
|
.end method
|