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>
576 lines
12 KiB
Smali
576 lines
12 KiB
Smali
.class Lcom/google/auth/oauth2/Slf4jLoggingHelpers;
|
|
.super Ljava/lang/Object;
|
|
.source "SourceFile"
|
|
|
|
|
|
# static fields
|
|
.field public static final a:Lcom/google/gson/Gson;
|
|
|
|
.field public static final b:Ljava/util/TreeSet;
|
|
|
|
|
|
# direct methods
|
|
.method static constructor <clinit>()V
|
|
.locals 9
|
|
|
|
.line 1
|
|
new-instance v0, Lcom/google/gson/Gson;
|
|
|
|
.line 2
|
|
.line 3
|
|
invoke-direct {v0}, Lcom/google/gson/Gson;-><init>()V
|
|
|
|
.line 4
|
|
.line 5
|
|
.line 6
|
|
sput-object v0, Lcom/google/auth/oauth2/Slf4jLoggingHelpers;->a:Lcom/google/gson/Gson;
|
|
|
|
.line 7
|
|
.line 8
|
|
new-instance v0, Ljava/util/TreeSet;
|
|
|
|
.line 9
|
|
.line 10
|
|
sget-object v1, Ljava/lang/String;->CASE_INSENSITIVE_ORDER:Ljava/util/Comparator;
|
|
|
|
.line 11
|
|
.line 12
|
|
invoke-direct {v0, v1}, Ljava/util/TreeSet;-><init>(Ljava/util/Comparator;)V
|
|
|
|
.line 13
|
|
.line 14
|
|
.line 15
|
|
sput-object v0, Lcom/google/auth/oauth2/Slf4jLoggingHelpers;->b:Ljava/util/TreeSet;
|
|
|
|
.line 16
|
|
.line 17
|
|
const-string v7, "signedBlob"
|
|
|
|
.line 18
|
|
.line 19
|
|
const-string v8, "authorization"
|
|
|
|
.line 20
|
|
.line 21
|
|
const-string v2, "token"
|
|
|
|
.line 22
|
|
.line 23
|
|
const-string v3, "assertion"
|
|
|
|
.line 24
|
|
.line 25
|
|
const-string v4, "access_token"
|
|
|
|
.line 26
|
|
.line 27
|
|
const-string v5, "client_secret"
|
|
|
|
.line 28
|
|
.line 29
|
|
const-string v6, "refresh_token"
|
|
|
|
.line 30
|
|
.line 31
|
|
filled-new-array/range {v2 .. v8}, [Ljava/lang/String;
|
|
|
|
.line 32
|
|
.line 33
|
|
.line 34
|
|
move-result-object v1
|
|
|
|
.line 35
|
|
invoke-static {v1}, Ljava/util/Arrays;->asList([Ljava/lang/Object;)Ljava/util/List;
|
|
|
|
.line 36
|
|
.line 37
|
|
.line 38
|
|
move-result-object v1
|
|
|
|
.line 39
|
|
invoke-virtual {v0, v1}, Ljava/util/TreeSet;->addAll(Ljava/util/Collection;)Z
|
|
|
|
.line 40
|
|
.line 41
|
|
.line 42
|
|
return-void
|
|
.end method
|
|
|
|
.method public static a(Ljava/lang/String;)Ljava/lang/String;
|
|
.locals 6
|
|
|
|
.line 1
|
|
:try_start_0
|
|
const-string v0, "SHA-256"
|
|
|
|
.line 2
|
|
.line 3
|
|
invoke-static {v0}, Ljava/security/MessageDigest;->getInstance(Ljava/lang/String;)Ljava/security/MessageDigest;
|
|
|
|
.line 4
|
|
.line 5
|
|
.line 6
|
|
move-result-object v0
|
|
|
|
.line 7
|
|
sget-object v1, Ljava/nio/charset/StandardCharsets;->UTF_8:Ljava/nio/charset/Charset;
|
|
|
|
.line 8
|
|
.line 9
|
|
invoke-virtual {p0, v1}, Ljava/lang/String;->getBytes(Ljava/nio/charset/Charset;)[B
|
|
|
|
.line 10
|
|
.line 11
|
|
.line 12
|
|
move-result-object p0
|
|
|
|
.line 13
|
|
invoke-virtual {v0, p0}, Ljava/security/MessageDigest;->digest([B)[B
|
|
|
|
.line 14
|
|
.line 15
|
|
.line 16
|
|
move-result-object p0
|
|
|
|
.line 17
|
|
new-instance v0, Ljava/lang/StringBuilder;
|
|
|
|
.line 18
|
|
.line 19
|
|
array-length v1, p0
|
|
|
|
.line 20
|
|
mul-int/lit8 v1, v1, 0x2
|
|
|
|
.line 21
|
|
.line 22
|
|
invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(I)V
|
|
|
|
.line 23
|
|
.line 24
|
|
.line 25
|
|
array-length v1, p0
|
|
|
|
.line 26
|
|
const/4 v2, 0x0
|
|
|
|
.line 27
|
|
:goto_0
|
|
if-ge v2, v1, :cond_1
|
|
|
|
.line 28
|
|
.line 29
|
|
aget-byte v3, p0, v2
|
|
|
|
.line 30
|
|
.line 31
|
|
and-int/lit16 v3, v3, 0xff
|
|
|
|
.line 32
|
|
.line 33
|
|
invoke-static {v3}, Ljava/lang/Integer;->toHexString(I)Ljava/lang/String;
|
|
|
|
.line 34
|
|
.line 35
|
|
.line 36
|
|
move-result-object v3
|
|
|
|
.line 37
|
|
invoke-virtual {v3}, Ljava/lang/String;->length()I
|
|
|
|
.line 38
|
|
.line 39
|
|
.line 40
|
|
move-result v4
|
|
|
|
.line 41
|
|
const/4 v5, 0x1
|
|
|
|
.line 42
|
|
if-ne v4, v5, :cond_0
|
|
|
|
.line 43
|
|
.line 44
|
|
const/16 v4, 0x30
|
|
|
|
.line 45
|
|
.line 46
|
|
invoke-virtual {v0, v4}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
|
|
|
|
.line 47
|
|
.line 48
|
|
.line 49
|
|
:cond_0
|
|
invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
|
|
|
.line 50
|
|
.line 51
|
|
.line 52
|
|
add-int/lit8 v2, v2, 0x1
|
|
|
|
.line 53
|
|
.line 54
|
|
goto :goto_0
|
|
|
|
.line 55
|
|
:cond_1
|
|
invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
|
|
|
|
.line 56
|
|
.line 57
|
|
.line 58
|
|
move-result-object p0
|
|
:try_end_0
|
|
.catch Ljava/security/NoSuchAlgorithmException; {:try_start_0 .. :try_end_0} :catch_0
|
|
|
|
.line 59
|
|
return-object p0
|
|
|
|
.line 60
|
|
:catch_0
|
|
const-string p0, "Error calculating SHA-256 hash."
|
|
|
|
.line 61
|
|
.line 62
|
|
return-object p0
|
|
.end method
|
|
|
|
.method public static b(Lcom/google/api/client/http/HttpRequest;Lcom/google/auth/oauth2/LoggerProvider;Ljava/lang/String;)V
|
|
.locals 5
|
|
|
|
.line 1
|
|
:try_start_0
|
|
invoke-virtual {p1}, Lcom/google/auth/oauth2/LoggerProvider;->a()Lorg/slf4j/Logger;
|
|
|
|
.line 2
|
|
.line 3
|
|
.line 4
|
|
move-result-object p1
|
|
|
|
.line 5
|
|
invoke-interface {p1}, Lorg/slf4j/Logger;->c()Z
|
|
|
|
.line 6
|
|
.line 7
|
|
.line 8
|
|
move-result v0
|
|
|
|
.line 9
|
|
if-eqz v0, :cond_3
|
|
|
|
.line 10
|
|
.line 11
|
|
new-instance v0, Ljava/util/HashMap;
|
|
|
|
.line 12
|
|
.line 13
|
|
invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
|
|
|
|
.line 14
|
|
.line 15
|
|
.line 16
|
|
const-string v1, "request.method"
|
|
|
|
.line 17
|
|
.line 18
|
|
invoke-virtual {p0}, Lcom/google/api/client/http/HttpRequest;->getRequestMethod()Ljava/lang/String;
|
|
|
|
.line 19
|
|
.line 20
|
|
.line 21
|
|
move-result-object v2
|
|
|
|
.line 22
|
|
invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
.line 23
|
|
.line 24
|
|
.line 25
|
|
const-string v1, "request.url"
|
|
|
|
.line 26
|
|
.line 27
|
|
invoke-virtual {p0}, Lcom/google/api/client/http/HttpRequest;->getUrl()Lcom/google/api/client/http/GenericUrl;
|
|
|
|
.line 28
|
|
.line 29
|
|
.line 30
|
|
move-result-object v2
|
|
|
|
.line 31
|
|
invoke-virtual {v2}, Lcom/google/api/client/http/GenericUrl;->toString()Ljava/lang/String;
|
|
|
|
.line 32
|
|
.line 33
|
|
.line 34
|
|
move-result-object v2
|
|
|
|
.line 35
|
|
invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
.line 36
|
|
.line 37
|
|
.line 38
|
|
new-instance v1, Ljava/util/HashMap;
|
|
|
|
.line 39
|
|
.line 40
|
|
invoke-direct {v1}, Ljava/util/HashMap;-><init>()V
|
|
|
|
.line 41
|
|
.line 42
|
|
.line 43
|
|
invoke-virtual {p0}, Lcom/google/api/client/http/HttpRequest;->getHeaders()Lcom/google/api/client/http/HttpHeaders;
|
|
|
|
.line 44
|
|
.line 45
|
|
.line 46
|
|
move-result-object v2
|
|
|
|
.line 47
|
|
new-instance v3, Lcom/google/auth/oauth2/b;
|
|
|
|
.line 48
|
|
.line 49
|
|
const/4 v4, 0x1
|
|
|
|
.line 50
|
|
invoke-direct {v3, v1, v4}, Lcom/google/auth/oauth2/b;-><init>(Ljava/util/HashMap;I)V
|
|
|
|
.line 51
|
|
.line 52
|
|
.line 53
|
|
invoke-static {v2, v3}, Lj$/util/Map$-EL;->forEach(Ljava/util/Map;Ljava/util/function/BiConsumer;)V
|
|
|
|
.line 54
|
|
.line 55
|
|
.line 56
|
|
const-string v2, "request.headers"
|
|
|
|
.line 57
|
|
.line 58
|
|
sget-object v3, Lcom/google/auth/oauth2/Slf4jLoggingHelpers;->a:Lcom/google/gson/Gson;
|
|
|
|
.line 59
|
|
.line 60
|
|
invoke-virtual {v3, v1}, Lcom/google/gson/Gson;->e(Ljava/lang/Object;)Ljava/lang/String;
|
|
|
|
.line 61
|
|
.line 62
|
|
.line 63
|
|
move-result-object v1
|
|
|
|
.line 64
|
|
invoke-virtual {v0, v2, v1}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
.line 65
|
|
.line 66
|
|
.line 67
|
|
invoke-virtual {p0}, Lcom/google/api/client/http/HttpRequest;->getContent()Lcom/google/api/client/http/HttpContent;
|
|
|
|
.line 68
|
|
.line 69
|
|
.line 70
|
|
move-result-object v1
|
|
|
|
.line 71
|
|
if-eqz v1, :cond_2
|
|
|
|
.line 72
|
|
.line 73
|
|
invoke-interface {p1}, Lorg/slf4j/Logger;->a()Z
|
|
|
|
.line 74
|
|
.line 75
|
|
.line 76
|
|
move-result v1
|
|
|
|
.line 77
|
|
if-eqz v1, :cond_2
|
|
|
|
.line 78
|
|
.line 79
|
|
invoke-virtual {p0}, Lcom/google/api/client/http/HttpRequest;->getContent()Lcom/google/api/client/http/HttpContent;
|
|
|
|
.line 80
|
|
.line 81
|
|
.line 82
|
|
move-result-object v1
|
|
|
|
.line 83
|
|
instance-of v1, v1, Lcom/google/api/client/http/UrlEncodedContent;
|
|
:try_end_0
|
|
.catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
|
|
|
|
.line 84
|
|
.line 85
|
|
const-string v2, "request.payload"
|
|
|
|
.line 86
|
|
.line 87
|
|
if-eqz v1, :cond_0
|
|
|
|
.line 88
|
|
.line 89
|
|
:try_start_1
|
|
invoke-virtual {p0}, Lcom/google/api/client/http/HttpRequest;->getContent()Lcom/google/api/client/http/HttpContent;
|
|
|
|
.line 90
|
|
.line 91
|
|
.line 92
|
|
move-result-object p0
|
|
|
|
.line 93
|
|
check-cast p0, Lcom/google/api/client/http/UrlEncodedContent;
|
|
|
|
.line 94
|
|
.line 95
|
|
invoke-virtual {p0}, Lcom/google/api/client/http/UrlEncodedContent;->getData()Ljava/lang/Object;
|
|
|
|
.line 96
|
|
.line 97
|
|
.line 98
|
|
move-result-object p0
|
|
|
|
.line 99
|
|
check-cast p0, Lcom/google/api/client/util/GenericData;
|
|
|
|
.line 100
|
|
.line 101
|
|
invoke-static {p0}, Lcom/google/auth/oauth2/Slf4jLoggingHelpers;->c(Lcom/google/api/client/util/GenericData;)Ljava/util/HashMap;
|
|
|
|
.line 102
|
|
.line 103
|
|
.line 104
|
|
move-result-object p0
|
|
|
|
.line 105
|
|
invoke-virtual {v3, p0}, Lcom/google/gson/Gson;->e(Ljava/lang/Object;)Ljava/lang/String;
|
|
|
|
.line 106
|
|
.line 107
|
|
.line 108
|
|
move-result-object p0
|
|
|
|
.line 109
|
|
invoke-virtual {v0, v2, p0}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
.line 110
|
|
.line 111
|
|
.line 112
|
|
goto :goto_0
|
|
|
|
.line 113
|
|
:cond_0
|
|
invoke-virtual {p0}, Lcom/google/api/client/http/HttpRequest;->getContent()Lcom/google/api/client/http/HttpContent;
|
|
|
|
.line 114
|
|
.line 115
|
|
.line 116
|
|
move-result-object v1
|
|
|
|
.line 117
|
|
instance-of v1, v1, Lcom/google/api/client/http/json/JsonHttpContent;
|
|
|
|
.line 118
|
|
.line 119
|
|
if-eqz v1, :cond_1
|
|
|
|
.line 120
|
|
.line 121
|
|
invoke-virtual {p0}, Lcom/google/api/client/http/HttpRequest;->getContent()Lcom/google/api/client/http/HttpContent;
|
|
|
|
.line 122
|
|
.line 123
|
|
.line 124
|
|
move-result-object p0
|
|
|
|
.line 125
|
|
check-cast p0, Lcom/google/api/client/http/json/JsonHttpContent;
|
|
|
|
.line 126
|
|
.line 127
|
|
invoke-virtual {p0}, Lcom/google/api/client/http/json/JsonHttpContent;->getData()Ljava/lang/Object;
|
|
|
|
.line 128
|
|
.line 129
|
|
.line 130
|
|
move-result-object p0
|
|
|
|
.line 131
|
|
invoke-virtual {v3, p0}, Lcom/google/gson/Gson;->e(Ljava/lang/Object;)Ljava/lang/String;
|
|
|
|
.line 132
|
|
.line 133
|
|
.line 134
|
|
move-result-object p0
|
|
|
|
.line 135
|
|
invoke-virtual {v0, v2, p0}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
.line 136
|
|
.line 137
|
|
.line 138
|
|
:cond_1
|
|
:goto_0
|
|
sget-object p0, Lorg/slf4j/event/Level;->g:Lorg/slf4j/event/Level;
|
|
|
|
.line 139
|
|
.line 140
|
|
invoke-static {p1, p0, v0, p2}, Lcom/google/auth/oauth2/Slf4jUtils;->a(Lorg/slf4j/Logger;Lorg/slf4j/event/Level;Ljava/util/Map;Ljava/lang/String;)V
|
|
|
|
.line 141
|
|
.line 142
|
|
.line 143
|
|
return-void
|
|
|
|
.line 144
|
|
:cond_2
|
|
sget-object p0, Lorg/slf4j/event/Level;->f:Lorg/slf4j/event/Level;
|
|
|
|
.line 145
|
|
.line 146
|
|
invoke-static {p1, p0, v0, p2}, Lcom/google/auth/oauth2/Slf4jUtils;->a(Lorg/slf4j/Logger;Lorg/slf4j/event/Level;Ljava/util/Map;Ljava/lang/String;)V
|
|
:try_end_1
|
|
.catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_0
|
|
|
|
.line 147
|
|
.line 148
|
|
.line 149
|
|
:catch_0
|
|
:cond_3
|
|
return-void
|
|
.end method
|
|
|
|
.method public static c(Lcom/google/api/client/util/GenericData;)Ljava/util/HashMap;
|
|
.locals 3
|
|
|
|
.line 1
|
|
new-instance v0, Ljava/util/HashMap;
|
|
|
|
.line 2
|
|
.line 3
|
|
invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
|
|
|
|
.line 4
|
|
.line 5
|
|
.line 6
|
|
new-instance v1, Lcom/google/auth/oauth2/b;
|
|
|
|
.line 7
|
|
.line 8
|
|
const/4 v2, 0x0
|
|
|
|
.line 9
|
|
invoke-direct {v1, v0, v2}, Lcom/google/auth/oauth2/b;-><init>(Ljava/util/HashMap;I)V
|
|
|
|
.line 10
|
|
.line 11
|
|
.line 12
|
|
invoke-static {p0, v1}, Lj$/util/Map$-EL;->forEach(Ljava/util/Map;Ljava/util/function/BiConsumer;)V
|
|
|
|
.line 13
|
|
.line 14
|
|
.line 15
|
|
return-object v0
|
|
.end method
|