* 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>
168 lines
5.3 KiB
Java
168 lines
5.3 KiB
Java
package com.google.auth.oauth2;
|
|
|
|
import com.google.gson.Gson;
|
|
import j$.util.Map;
|
|
import j$.util.function.BiConsumer$CC;
|
|
import java.util.Map;
|
|
import java.util.function.BiConsumer;
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.MDC;
|
|
import org.slf4j.event.Level;
|
|
import org.slf4j.spi.LoggingEventBuilder;
|
|
import org.slf4j.spi.MDCAdapter;
|
|
|
|
/* JADX INFO: Access modifiers changed from: package-private */
|
|
/* loaded from: classes3.dex */
|
|
public class Slf4jUtils {
|
|
|
|
/* renamed from: a, reason: collision with root package name */
|
|
public static final Gson f12141a = new Gson();
|
|
public static final boolean b;
|
|
|
|
/* renamed from: com.google.auth.oauth2.Slf4jUtils$1, reason: invalid class name */
|
|
/* loaded from: classes3.dex */
|
|
public static /* synthetic */ class AnonymousClass1 {
|
|
|
|
/* renamed from: a, reason: collision with root package name */
|
|
public static final /* synthetic */ int[] f12142a;
|
|
|
|
static {
|
|
int[] iArr = new int[Level.values().length];
|
|
f12142a = iArr;
|
|
try {
|
|
iArr[4] = 1;
|
|
} catch (NoSuchFieldError unused) {
|
|
}
|
|
try {
|
|
f12142a[3] = 2;
|
|
} catch (NoSuchFieldError unused2) {
|
|
}
|
|
try {
|
|
f12142a[2] = 3;
|
|
} catch (NoSuchFieldError unused3) {
|
|
}
|
|
try {
|
|
f12142a[1] = 4;
|
|
} catch (NoSuchFieldError unused4) {
|
|
}
|
|
try {
|
|
f12142a[0] = 5;
|
|
} catch (NoSuchFieldError unused5) {
|
|
}
|
|
}
|
|
}
|
|
|
|
/* loaded from: classes3.dex */
|
|
public static class DefaultLoggerFactoryProvider implements LoggerFactoryProvider {
|
|
}
|
|
|
|
/* loaded from: classes3.dex */
|
|
public interface LoggerFactoryProvider {
|
|
}
|
|
|
|
static {
|
|
boolean z;
|
|
try {
|
|
Class.forName("org.slf4j.event.KeyValuePair");
|
|
z = true;
|
|
} catch (ClassNotFoundException unused) {
|
|
z = false;
|
|
}
|
|
b = z;
|
|
}
|
|
|
|
public static void a(Logger logger, Level level, Map map, String str) {
|
|
if (b) {
|
|
b(logger, level, map, str);
|
|
return;
|
|
}
|
|
if (!map.isEmpty()) {
|
|
for (Map.Entry entry : map.entrySet()) {
|
|
String str2 = (String) entry.getKey();
|
|
Object value = entry.getValue();
|
|
if (!(value instanceof String)) {
|
|
f12141a.e(value);
|
|
}
|
|
if (str2 != null) {
|
|
MDCAdapter mDCAdapter = MDC.f22687a;
|
|
if (mDCAdapter != null) {
|
|
mDCAdapter.a(str2);
|
|
} else {
|
|
throw new IllegalStateException("MDCAdapter cannot be null. See also http://www.slf4j.org/codes.html#null_MDCA");
|
|
}
|
|
} else {
|
|
MDCAdapter mDCAdapter2 = MDC.f22687a;
|
|
throw new IllegalArgumentException("key parameter cannot be null");
|
|
}
|
|
}
|
|
}
|
|
int ordinal = level.ordinal();
|
|
if (ordinal != 0) {
|
|
if (ordinal != 1) {
|
|
if (ordinal != 2) {
|
|
if (ordinal != 3) {
|
|
if (ordinal != 4) {
|
|
logger.e(str);
|
|
} else {
|
|
logger.i(str);
|
|
}
|
|
} else {
|
|
logger.e(str);
|
|
}
|
|
} else {
|
|
logger.g(str);
|
|
}
|
|
} else {
|
|
logger.h(str);
|
|
}
|
|
} else {
|
|
logger.b(str);
|
|
}
|
|
if (!map.isEmpty()) {
|
|
MDCAdapter mDCAdapter3 = MDC.f22687a;
|
|
if (mDCAdapter3 != null) {
|
|
mDCAdapter3.clear();
|
|
return;
|
|
}
|
|
throw new IllegalStateException("MDCAdapter cannot be null. See also http://www.slf4j.org/codes.html#null_MDCA");
|
|
}
|
|
}
|
|
|
|
public static void b(Logger logger, Level level, Map map, String str) {
|
|
final LoggingEventBuilder atError;
|
|
int ordinal = level.ordinal();
|
|
if (ordinal != 0) {
|
|
if (ordinal != 1) {
|
|
if (ordinal != 2) {
|
|
if (ordinal != 3) {
|
|
if (ordinal != 4) {
|
|
atError = logger.atDebug();
|
|
} else {
|
|
atError = logger.atTrace();
|
|
}
|
|
} else {
|
|
atError = logger.atDebug();
|
|
}
|
|
} else {
|
|
atError = logger.atInfo();
|
|
}
|
|
} else {
|
|
atError = logger.atWarn();
|
|
}
|
|
} else {
|
|
atError = logger.atError();
|
|
}
|
|
atError.getClass();
|
|
Map.EL.forEach(map, new BiConsumer() { // from class: com.google.auth.oauth2.c
|
|
@Override // java.util.function.BiConsumer
|
|
public final void accept(Object obj, Object obj2) {
|
|
atError.addKeyValue((String) obj, obj2);
|
|
}
|
|
|
|
public /* synthetic */ BiConsumer andThen(BiConsumer biConsumer) {
|
|
return BiConsumer$CC.$default$andThen(this, biConsumer);
|
|
}
|
|
});
|
|
atError.log(str);
|
|
}
|
|
}
|