soul-browser/sources/java/okhttp3/internal/platform/android/AndroidLog.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

100 lines
3.8 KiB
Java

package okhttp3.internal.platform.android;
import android.util.Log;
import com.google.android.gms.ads.RequestConfiguration;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.concurrent.CopyOnWriteArraySet;
import java.util.logging.Level;
import java.util.logging.Logger;
import kotlin.Metadata;
import kotlin.collections.MapsKt;
import kotlin.jvm.internal.Intrinsics;
import kotlin.text.StringsKt;
import kotlin.text.StringsKt__StringsKt;
import okhttp3.OkHttpClient;
import okhttp3.internal.SuppressSignatureCheck;
import okhttp3.internal.concurrent.TaskRunner;
import okhttp3.internal.http2.Http2;
@SuppressSignatureCheck
@Metadata(d1 = {"\u0000\n\n\u0002\u0018\u0002\n\u0002\u0010\u0000\n\u0000\\u0002\u0018\u00002\u00020\u0001¨\u0006\u0002"}, d2 = {"Lokhttp3/internal/platform/android/AndroidLog;", RequestConfiguration.MAX_AD_CONTENT_RATING_UNSPECIFIED, "okhttp"}, k = 1, mv = {2, 2, 0}, xi = 48)
/* loaded from: classes4.dex */
public final class AndroidLog {
/* renamed from: a, reason: collision with root package name */
public static final CopyOnWriteArraySet f22175a = new CopyOnWriteArraySet();
public static final Map b;
static {
String str;
LinkedHashMap linkedHashMap = new LinkedHashMap();
Package r2 = OkHttpClient.class.getPackage();
if (r2 != null) {
str = r2.getName();
} else {
str = null;
}
if (str != null) {
linkedHashMap.put(str, "OkHttp");
}
linkedHashMap.put(OkHttpClient.class.getName(), "okhttp.OkHttpClient");
linkedHashMap.put(Http2.class.getName(), "okhttp.Http2");
linkedHashMap.put(TaskRunner.class.getName(), "okhttp.TaskRunner");
linkedHashMap.put("okhttp3.mockwebserver.MockWebServer", "okhttp.MockWebServer");
b = MapsKt.toMap(linkedHashMap);
}
public static void a(String loggerName, int i, String message, Throwable th) {
int indexOf$default;
int min;
Intrinsics.checkNotNullParameter(loggerName, "loggerName");
Intrinsics.checkNotNullParameter(message, "message");
String str = (String) b.get(loggerName);
if (str == null) {
str = StringsKt.take(loggerName, 23);
}
if (Log.isLoggable(str, i)) {
if (th != null) {
message = message + '\n' + Log.getStackTraceString(th);
}
int length = message.length();
int i2 = 0;
while (i2 < length) {
indexOf$default = StringsKt__StringsKt.indexOf$default((CharSequence) message, '\n', i2, false, 4, (Object) null);
if (indexOf$default == -1) {
indexOf$default = length;
}
while (true) {
min = Math.min(indexOf$default, i2 + 4000);
String substring = message.substring(i2, min);
Intrinsics.checkNotNullExpressionValue(substring, "substring(...)");
Log.println(i, str, substring);
if (min >= indexOf$default) {
break;
} else {
i2 = min;
}
}
i2 = min + 1;
}
}
}
public static void b(String str, String str2) {
Level level;
Logger logger = Logger.getLogger(str);
if (f22175a.add(logger)) {
logger.setUseParentHandlers(false);
if (Log.isLoggable(str2, 3)) {
level = Level.FINE;
} else if (Log.isLoggable(str2, 4)) {
level = Level.INFO;
} else {
level = Level.WARNING;
}
logger.setLevel(level);
logger.addHandler(AndroidLogHandler.f22176a);
}
}
}