* 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>
81 lines
3.2 KiB
Java
81 lines
3.2 KiB
Java
package com.google.auth.oauth2;
|
|
|
|
import com.google.api.client.http.HttpRequest;
|
|
import com.google.api.client.http.UrlEncodedContent;
|
|
import com.google.api.client.http.json.JsonHttpContent;
|
|
import com.google.api.client.util.GenericData;
|
|
import com.google.gson.Gson;
|
|
import j$.util.Map;
|
|
import java.nio.charset.StandardCharsets;
|
|
import java.security.MessageDigest;
|
|
import java.security.NoSuchAlgorithmException;
|
|
import java.util.Arrays;
|
|
import java.util.HashMap;
|
|
import java.util.TreeSet;
|
|
import kotlin.UByte;
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.event.Level;
|
|
|
|
/* JADX INFO: Access modifiers changed from: package-private */
|
|
/* loaded from: classes3.dex */
|
|
public class Slf4jLoggingHelpers {
|
|
|
|
/* renamed from: a, reason: collision with root package name */
|
|
public static final Gson f12140a = new Gson();
|
|
public static final TreeSet b;
|
|
|
|
static {
|
|
TreeSet treeSet = new TreeSet(String.CASE_INSENSITIVE_ORDER);
|
|
b = treeSet;
|
|
treeSet.addAll(Arrays.asList("token", "assertion", "access_token", "client_secret", "refresh_token", "signedBlob", "authorization"));
|
|
}
|
|
|
|
public static String a(String str) {
|
|
try {
|
|
byte[] digest = MessageDigest.getInstance("SHA-256").digest(str.getBytes(StandardCharsets.UTF_8));
|
|
StringBuilder sb = new StringBuilder(digest.length * 2);
|
|
for (byte b2 : digest) {
|
|
String hexString = Integer.toHexString(b2 & UByte.MAX_VALUE);
|
|
if (hexString.length() == 1) {
|
|
sb.append('0');
|
|
}
|
|
sb.append(hexString);
|
|
}
|
|
return sb.toString();
|
|
} catch (NoSuchAlgorithmException unused) {
|
|
return "Error calculating SHA-256 hash.";
|
|
}
|
|
}
|
|
|
|
public static void b(HttpRequest httpRequest, LoggerProvider loggerProvider, String str) {
|
|
try {
|
|
Logger a2 = loggerProvider.a();
|
|
if (a2.c()) {
|
|
HashMap hashMap = new HashMap();
|
|
hashMap.put("request.method", httpRequest.getRequestMethod());
|
|
hashMap.put("request.url", httpRequest.getUrl().toString());
|
|
HashMap hashMap2 = new HashMap();
|
|
Map.EL.forEach(httpRequest.getHeaders(), new b(hashMap2, 1));
|
|
Gson gson = f12140a;
|
|
hashMap.put("request.headers", gson.e(hashMap2));
|
|
if (httpRequest.getContent() != null && a2.a()) {
|
|
if (httpRequest.getContent() instanceof UrlEncodedContent) {
|
|
hashMap.put("request.payload", gson.e(c((GenericData) ((UrlEncodedContent) httpRequest.getContent()).getData())));
|
|
} else if (httpRequest.getContent() instanceof JsonHttpContent) {
|
|
hashMap.put("request.payload", gson.e(((JsonHttpContent) httpRequest.getContent()).getData()));
|
|
}
|
|
Slf4jUtils.a(a2, Level.DEBUG, hashMap, str);
|
|
return;
|
|
}
|
|
Slf4jUtils.a(a2, Level.INFO, hashMap, str);
|
|
}
|
|
} catch (Exception unused) {
|
|
}
|
|
}
|
|
|
|
public static HashMap c(GenericData genericData) {
|
|
HashMap hashMap = new HashMap();
|
|
Map.EL.forEach(genericData, new b(hashMap, 0));
|
|
return hashMap;
|
|
}
|
|
}
|