soul-browser/sources/java/net/dankito/readability4j/processor/ProcessorBase.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

101 lines
4.6 KiB
Java

package net.dankito.readability4j.processor;
import com.google.android.gms.ads.RequestConfiguration;
import java.util.List;
import kotlin.Metadata;
import kotlin.TypeCastException;
import kotlin.collections.CollectionsKt___CollectionsKt;
import kotlin.jvm.functions.Function1;
import kotlin.jvm.internal.Intrinsics;
import kotlin.text.StringsKt__StringsKt;
import net.dankito.readability4j.util.RegExUtil;
import org.jsoup.nodes.Element;
import org.jsoup.nodes.Node;
import org.jsoup.nodes.TextNode;
import org.jsoup.select.Elements;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Metadata(d1 = {"\u0000\f\n\u0002\u0018\u0002\n\u0002\u0010\u0000\n\u0002\b\u0002\b&\u0018\u00002\u00020\u0001:\u0001\u0002¨\u0006\u0003"}, d2 = {"Lnet/dankito/readability4j/processor/ProcessorBase;", RequestConfiguration.MAX_AD_CONTENT_RATING_UNSPECIFIED, "Companion", "Readability4J"}, k = 1, mv = {1, 4, 0})
/* loaded from: classes4.dex */
public abstract class ProcessorBase {
/* renamed from: a */
public static final Logger f21972a = LoggerFactory.e(ProcessorBase.class);
@Metadata(d1 = {"\u0000\u0018\n\u0002\u0018\u0002\n\u0002\u0010\u0000\n\u0002\u0010\u000b\n\u0002\b\u0002\n\u0002\u0018\u0002\n\u0002\b\u0004\b\u0086\u0003\u0018\u00002\u00020\u0001R\u0014\u0010\u0003\u001a\u00020\u00028\u0004X\u0084T¢\u0006\u0006\n\u0004\b\u0003\u0010\u0004R\u001c\u0010\u0007\u001a\n \u0006*\u0004\u0018\u00010\u00050\u00058\u0002X\u0082\u0004¢\u0006\u0006\n\u0004\b\u0007\u0010\\u0006\t"}, d2 = {"Lnet/dankito/readability4j/processor/ProcessorBase$Companion;", RequestConfiguration.MAX_AD_CONTENT_RATING_UNSPECIFIED, RequestConfiguration.MAX_AD_CONTENT_RATING_UNSPECIFIED, "TruncateLogOutput", "Z", "Lorg/slf4j/Logger;", "kotlin.jvm.PlatformType", "log", "Lorg/slf4j/Logger;", "Readability4J"}, k = 1, mv = {1, 4, 0})
/* loaded from: classes4.dex */
public static final class Companion {
}
public static String a(Element element, RegExUtil regExUtil, boolean z) {
CharSequence trim;
String text = element.text();
Intrinsics.checkExpressionValueIsNotNull(text, "e.text()");
if (text != null) {
trim = StringsKt__StringsKt.trim((CharSequence) text);
String obj = trim.toString();
if (z && regExUtil != null) {
String replaceAll = regExUtil.f.matcher(obj).replaceAll(" ");
Intrinsics.checkExpressionValueIsNotNull(replaceAll, "normalize.matcher(text).replaceAll(\" \")");
return replaceAll;
}
return obj;
}
throw new TypeCastException("null cannot be cast to non-null type kotlin.CharSequence");
}
public static /* synthetic */ String b(ProcessorBase processorBase, Element element, RegExUtil regExUtil, int i) {
boolean z;
if ((i & 2) != 0) {
regExUtil = null;
}
if ((i & 4) != 0) {
z = true;
} else {
z = false;
}
processorBase.getClass();
return a(element, regExUtil, z);
}
public static Element c(Node node, RegExUtil regExUtil) {
while (node != null && !(node instanceof Element) && (node instanceof TextNode)) {
String text = ((TextNode) node).text();
Intrinsics.checkExpressionValueIsNotNull(text, "next.text()");
if (!regExUtil.h.matcher(text).find()) {
break;
}
node = node.nextSibling();
}
if (!(node instanceof Element)) {
node = null;
}
return (Element) node;
}
public static void d(Node node, String str) {
if (node.parent() != null) {
f21972a.f(str, "\n------\n" + node.outerHtml() + "\n------\n", "{} [{}]");
node.remove();
}
}
public static void e(Element element, String str, Function1 function1) {
List<Element> reversed;
Elements elementsByTag = element.getElementsByTag(str);
Intrinsics.checkExpressionValueIsNotNull(elementsByTag, "element.getElementsByTag(tagName)");
reversed = CollectionsKt___CollectionsKt.reversed(elementsByTag);
for (Element childElement : reversed) {
if (childElement.parentNode() != null) {
if (function1 != null) {
Intrinsics.checkExpressionValueIsNotNull(childElement, "childElement");
if (((Boolean) function1.invoke(childElement)).booleanValue()) {
}
}
Intrinsics.checkExpressionValueIsNotNull(childElement, "childElement");
d(childElement, "removeNode('" + str + "')");
}
}
}
}