soul-browser/sources/java/org/slf4j/helpers/SubstituteLogger.java
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

129 lines
3.2 KiB
Java

package org.slf4j.helpers;
import java.lang.reflect.Method;
import java.util.Queue;
import java.util.concurrent.LinkedBlockingQueue;
import org.slf4j.Logger;
import org.slf4j.event.EventRecodingLogger;
import org.slf4j.event.LoggingEvent;
/* loaded from: classes4.dex */
public class SubstituteLogger implements Logger {
/* renamed from: c, reason: collision with root package name */
public final String f22693c;
public volatile Logger f;
public Boolean g;
public Method h;
public EventRecodingLogger i;
public final Queue j;
public final boolean k;
public SubstituteLogger(String str, LinkedBlockingQueue linkedBlockingQueue, boolean z) {
this.f22693c = str;
this.j = linkedBlockingQueue;
this.k = z;
}
@Override // org.slf4j.Logger
public final boolean a() {
return k().a();
}
@Override // org.slf4j.Logger
public final void b(String str) {
k().b(str);
}
@Override // org.slf4j.Logger
public final boolean c() {
return k().c();
}
@Override // org.slf4j.Logger
public final void d(Exception exc, String str) {
k().d(exc, str);
}
@Override // org.slf4j.Logger
public final void e(String str) {
k().e(str);
}
public final boolean equals(Object obj) {
if (this == obj) {
return true;
}
if (obj != null && getClass() == obj.getClass() && this.f22693c.equals(((SubstituteLogger) obj).f22693c)) {
return true;
}
return false;
}
@Override // org.slf4j.Logger
public final void f(Object obj, Object obj2, String str) {
k().f(obj, obj2, str);
}
@Override // org.slf4j.Logger
public final void g(String str) {
k().g(str);
}
@Override // org.slf4j.Logger
public final String getName() {
return this.f22693c;
}
@Override // org.slf4j.Logger
public final void h(String str) {
k().h(str);
}
public final int hashCode() {
return this.f22693c.hashCode();
}
@Override // org.slf4j.Logger
public final void i(String str) {
k().i(str);
}
@Override // org.slf4j.Logger
public final void j(Object obj, String str) {
k().j(obj, str);
}
/* JADX WARN: Type inference failed for: r0v4, types: [org.slf4j.event.EventRecodingLogger, java.lang.Object] */
public final Logger k() {
if (this.f != null) {
return this.f;
}
if (this.k) {
return NOPLogger.f22692c;
}
if (this.i == null) {
Queue queue = this.j;
?? obj = new Object();
obj.f = this;
obj.f22689c = this.f22693c;
obj.g = queue;
this.i = obj;
}
return this.i;
}
public final boolean l() {
Boolean bool = this.g;
if (bool != null) {
return bool.booleanValue();
}
try {
this.h = this.f.getClass().getMethod("log", LoggingEvent.class);
this.g = Boolean.TRUE;
} catch (NoSuchMethodException unused) {
this.g = Boolean.FALSE;
}
return this.g.booleanValue();
}
}