soul-browser/app/smali_classes3/com/google/auth/oauth2/MetricsUtils.smali
KaKi87 550ddb0413
Decompile and recreate Soul Browser v1.4.85 with APK CI builds (#1)
* 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>
2026-08-10 16:07:14 +02:00

267 lines
5.6 KiB
Smali

.class Lcom/google/auth/oauth2/MetricsUtils;
.super Ljava/lang/Object;
.source "SourceFile"
# annotations
.annotation system Ldalvik/annotation/MemberClasses;
value = {
Lcom/google/auth/oauth2/MetricsUtils$RequestType;
}
.end annotation
# static fields
.field public static final a:Ljava/lang/String;
.field public static final b:Ljava/lang/String;
# direct methods
.method static constructor <clinit>()V
.locals 4
.line 1
const-string v0, "unknown-version"
.line 2
.line 3
:try_start_0
const-class v1, Lcom/google/auth/oauth2/MetricsUtils;
.line 4
.line 5
const-string v2, "/com/google/auth/oauth2/google-auth-library.properties"
.line 6
.line 7
invoke-virtual {v1, v2}, Ljava/lang/Class;->getResourceAsStream(Ljava/lang/String;)Ljava/io/InputStream;
.line 8
.line 9
.line 10
move-result-object v1
:try_end_0
.catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
.line 11
if-eqz v1, :cond_0
.line 12
.line 13
:try_start_1
new-instance v2, Ljava/util/Properties;
.line 14
.line 15
invoke-direct {v2}, Ljava/util/Properties;-><init>()V
.line 16
.line 17
.line 18
invoke-virtual {v2, v1}, Ljava/util/Properties;->load(Ljava/io/InputStream;)V
.line 19
.line 20
.line 21
const-string v3, "google-auth-library.version"
.line 22
.line 23
invoke-virtual {v2, v3}, Ljava/util/Properties;->getProperty(Ljava/lang/String;)Ljava/lang/String;
.line 24
.line 25
.line 26
move-result-object v0
:try_end_1
.catchall {:try_start_1 .. :try_end_1} :catchall_0
.line 27
goto :goto_1
.line 28
:catchall_0
move-exception v2
.line 29
:try_start_2
throw v2
:try_end_2
.catchall {:try_start_2 .. :try_end_2} :catchall_1
.line 30
:catchall_1
move-exception v3
.line 31
:try_start_3
invoke-virtual {v1}, Ljava/io/InputStream;->close()V
:try_end_3
.catchall {:try_start_3 .. :try_end_3} :catchall_2
.line 32
.line 33
.line 34
goto :goto_0
.line 35
:catchall_2
move-exception v1
.line 36
:try_start_4
invoke-virtual {v2, v1}, Ljava/lang/Throwable;->addSuppressed(Ljava/lang/Throwable;)V
.line 37
.line 38
.line 39
:goto_0
throw v3
.line 40
:cond_0
:goto_1
if-eqz v1, :cond_1
.line 41
.line 42
invoke-virtual {v1}, Ljava/io/InputStream;->close()V
:try_end_4
.catch Ljava/io/IOException; {:try_start_4 .. :try_end_4} :catch_0
.line 43
.line 44
.line 45
:catch_0
:cond_1
sput-object v0, Lcom/google/auth/oauth2/MetricsUtils;->a:Ljava/lang/String;
.line 46
.line 47
const-string v0, "java.version"
.line 48
.line 49
invoke-static {v0}, Ljava/lang/System;->getProperty(Ljava/lang/String;)Ljava/lang/String;
.line 50
.line 51
.line 52
move-result-object v0
.line 53
sput-object v0, Lcom/google/auth/oauth2/MetricsUtils;->b:Ljava/lang/String;
.line 54
.line 55
return-void
.end method
.method public static a(Lcom/google/auth/oauth2/MetricsUtils$RequestType;Lcom/google/auth/CredentialTypeForMetrics;)Ljava/lang/String;
.locals 5
.line 1
new-instance v0, Ljava/lang/StringBuilder;
.line 2
.line 3
const-string v1, "gl-java/"
.line 4
.line 5
const-string v2, " auth/"
.line 6
.line 7
sget-object v3, Lcom/google/auth/oauth2/MetricsUtils;->b:Ljava/lang/String;
.line 8
.line 9
sget-object v4, Lcom/google/auth/oauth2/MetricsUtils;->a:Ljava/lang/String;
.line 10
.line 11
invoke-static {v1, v3, v2, v4}, Landroid/support/v4/media/a;->m(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
.line 12
.line 13
.line 14
move-result-object v1
.line 15
invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
.line 16
.line 17
.line 18
sget-object v1, Lcom/google/auth/oauth2/MetricsUtils$RequestType;->h:Lcom/google/auth/oauth2/MetricsUtils$RequestType;
.line 19
.line 20
if-eq p0, v1, :cond_0
.line 21
.line 22
iget-object p0, p0, Lcom/google/auth/oauth2/MetricsUtils$RequestType;->c:Ljava/lang/String;
.line 23
.line 24
const-string v1, " auth-request-type/"
.line 25
.line 26
invoke-virtual {v1, p0}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
.line 27
.line 28
.line 29
move-result-object p0
.line 30
invoke-virtual {v0, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
.line 31
.line 32
.line 33
:cond_0
sget-object p0, Lcom/google/auth/CredentialTypeForMetrics;->j:Lcom/google/auth/CredentialTypeForMetrics;
.line 34
.line 35
if-eq p1, p0, :cond_1
.line 36
.line 37
iget-object p0, p1, Lcom/google/auth/CredentialTypeForMetrics;->c:Ljava/lang/String;
.line 38
.line 39
const-string p1, " cred-type/"
.line 40
.line 41
invoke-virtual {p1, p0}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
.line 42
.line 43
.line 44
move-result-object p0
.line 45
invoke-virtual {v0, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
.line 46
.line 47
.line 48
:cond_1
invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
.line 49
.line 50
.line 51
move-result-object p0
.line 52
return-object p0
.end method