* 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>
173 lines
12 KiB
Java
173 lines
12 KiB
Java
package kotlin;
|
|
|
|
import com.google.android.gms.ads.RequestConfiguration;
|
|
import kotlin.Result;
|
|
import kotlin.internal.InlineOnly;
|
|
import kotlin.jvm.functions.Function0;
|
|
import kotlin.jvm.functions.Function1;
|
|
import kotlin.jvm.internal.Intrinsics;
|
|
import kotlin.jvm.internal.SourceDebugExtension;
|
|
import org.jetbrains.annotations.NotNull;
|
|
|
|
@Metadata(d1 = {"\u00006\n\u0000\n\u0002\u0010\u0000\n\u0000\n\u0002\u0010\u0003\n\u0000\n\u0002\u0010\u0002\n\u0002\u0018\u0002\n\u0002\b\u0004\n\u0002\u0018\u0002\n\u0002\b\u0002\n\u0002\u0018\u0002\n\u0002\u0018\u0002\n\u0002\b\u0005\n\u0002\u0018\u0002\n\u0002\b\u000f\u001a\u0010\u0010\u0000\u001a\u00020\u00012\u0006\u0010\u0002\u001a\u00020\u0003H\u0001\u001a\u0015\u0010\u0004\u001a\u00020\u0005*\u0006\u0012\u0002\b\u00030\u0006H\u0001¢\u0006\u0002\u0010\u0007\u001a+\u0010\b\u001a\b\u0012\u0004\u0012\u0002H\t0\u0006\"\u0004\b\u0000\u0010\t2\f\u0010\n\u001a\b\u0012\u0004\u0012\u0002H\t0\u000bH\u0087\bø\u0001\u0000¢\u0006\u0002\u0010\f\u001a@\u0010\b\u001a\b\u0012\u0004\u0012\u0002H\t0\u0006\"\u0004\b\u0000\u0010\r\"\u0004\b\u0001\u0010\t*\u0002H\r2\u0017\u0010\n\u001a\u0013\u0012\u0004\u0012\u0002H\r\u0012\u0004\u0012\u0002H\t0\u000e¢\u0006\u0002\b\u000fH\u0087\bø\u0001\u0000¢\u0006\u0002\u0010\u0010\u001a\u001e\u0010\u0011\u001a\u0002H\r\"\u0004\b\u0000\u0010\r*\b\u0012\u0004\u0012\u0002H\r0\u0006H\u0087\b¢\u0006\u0002\u0010\u0012\u001a[\u0010\u0013\u001a\u0002H\t\"\u0004\b\u0000\u0010\t\"\b\b\u0001\u0010\r*\u0002H\t*\b\u0012\u0004\u0012\u0002H\r0\u00062!\u0010\u0014\u001a\u001d\u0012\u0013\u0012\u00110\u0003¢\u0006\f\b\u0015\u0012\b\b\u0016\u0012\u0004\b\b(\u0002\u0012\u0004\u0012\u0002H\t0\u000eH\u0087\bø\u0001\u0000\u0082\u0002\n\n\b\b\u0001\u0012\u0002\u0010\u0001 \u0000¢\u0006\u0002\u0010\u0010\u001a0\u0010\u0017\u001a\u0002H\t\"\u0004\b\u0000\u0010\t\"\b\b\u0001\u0010\r*\u0002H\t*\b\u0012\u0004\u0012\u0002H\r0\u00062\u0006\u0010\u0018\u001a\u0002H\tH\u0087\b¢\u0006\u0002\u0010\u0019\u001a\u0084\u0001\u0010\u001a\u001a\u0002H\t\"\u0004\b\u0000\u0010\t\"\u0004\b\u0001\u0010\r*\b\u0012\u0004\u0012\u0002H\r0\u00062!\u0010\u001b\u001a\u001d\u0012\u0013\u0012\u0011H\r¢\u0006\f\b\u0015\u0012\b\b\u0016\u0012\u0004\b\b(\u001c\u0012\u0004\u0012\u0002H\t0\u000e2!\u0010\u0014\u001a\u001d\u0012\u0013\u0012\u00110\u0003¢\u0006\f\b\u0015\u0012\b\b\u0016\u0012\u0004\b\b(\u0002\u0012\u0004\u0012\u0002H\t0\u000eH\u0087\bø\u0001\u0000\u0082\u0002\u0014\n\b\b\u0001\u0012\u0002\u0010\u0001 \u0000\n\b\b\u0001\u0012\u0002\u0010\u0002 \u0000¢\u0006\u0002\u0010\u001d\u001a]\u0010\u001e\u001a\b\u0012\u0004\u0012\u0002H\t0\u0006\"\u0004\b\u0000\u0010\t\"\u0004\b\u0001\u0010\r*\b\u0012\u0004\u0012\u0002H\r0\u00062!\u0010\u001f\u001a\u001d\u0012\u0013\u0012\u0011H\r¢\u0006\f\b\u0015\u0012\b\b\u0016\u0012\u0004\b\b(\u001c\u0012\u0004\u0012\u0002H\t0\u000eH\u0087\bø\u0001\u0000\u0082\u0002\n\n\b\b\u0001\u0012\u0002\u0010\u0001 \u0000¢\u0006\u0002\u0010\u0010\u001aP\u0010 \u001a\b\u0012\u0004\u0012\u0002H\t0\u0006\"\u0004\b\u0000\u0010\t\"\u0004\b\u0001\u0010\r*\b\u0012\u0004\u0012\u0002H\r0\u00062!\u0010\u001f\u001a\u001d\u0012\u0013\u0012\u0011H\r¢\u0006\f\b\u0015\u0012\b\b\u0016\u0012\u0004\b\b(\u001c\u0012\u0004\u0012\u0002H\t0\u000eH\u0087\bø\u0001\u0000¢\u0006\u0002\u0010\u0010\u001aa\u0010!\u001a\b\u0012\u0004\u0012\u0002H\t0\u0006\"\u0004\b\u0000\u0010\t\"\b\b\u0001\u0010\r*\u0002H\t*\b\u0012\u0004\u0012\u0002H\r0\u00062!\u0010\u001f\u001a\u001d\u0012\u0013\u0012\u00110\u0003¢\u0006\f\b\u0015\u0012\b\b\u0016\u0012\u0004\b\b(\u0002\u0012\u0004\u0012\u0002H\t0\u000eH\u0087\bø\u0001\u0000\u0082\u0002\n\n\b\b\u0001\u0012\u0002\u0010\u0001 \u0000¢\u0006\u0002\u0010\u0010\u001aT\u0010\"\u001a\b\u0012\u0004\u0012\u0002H\t0\u0006\"\u0004\b\u0000\u0010\t\"\b\b\u0001\u0010\r*\u0002H\t*\b\u0012\u0004\u0012\u0002H\r0\u00062!\u0010\u001f\u001a\u001d\u0012\u0013\u0012\u00110\u0003¢\u0006\f\b\u0015\u0012\b\b\u0016\u0012\u0004\b\b(\u0002\u0012\u0004\u0012\u0002H\t0\u000eH\u0087\bø\u0001\u0000¢\u0006\u0002\u0010\u0010\u001aW\u0010\u0014\u001a\b\u0012\u0004\u0012\u0002H\r0\u0006\"\u0004\b\u0000\u0010\r*\b\u0012\u0004\u0012\u0002H\r0\u00062!\u0010#\u001a\u001d\u0012\u0013\u0012\u00110\u0003¢\u0006\f\b\u0015\u0012\b\b\u0016\u0012\u0004\b\b(\u0002\u0012\u0004\u0012\u00020\u00050\u000eH\u0087\bø\u0001\u0000\u0082\u0002\n\n\b\b\u0001\u0012\u0002\u0010\u0001 \u0000¢\u0006\u0002\u0010\u0010\u001aW\u0010\u001b\u001a\b\u0012\u0004\u0012\u0002H\r0\u0006\"\u0004\b\u0000\u0010\r*\b\u0012\u0004\u0012\u0002H\r0\u00062!\u0010#\u001a\u001d\u0012\u0013\u0012\u0011H\r¢\u0006\f\b\u0015\u0012\b\b\u0016\u0012\u0004\b\b(\u001c\u0012\u0004\u0012\u00020\u00050\u000eH\u0087\bø\u0001\u0000\u0082\u0002\n\n\b\b\u0001\u0012\u0002\u0010\u0001 \u0000¢\u0006\u0002\u0010\u0010\u0082\u0002\u0007\n\u0005\b\u009920\u0001¨\u0006$"}, d2 = {"createFailure", RequestConfiguration.MAX_AD_CONTENT_RATING_UNSPECIFIED, "exception", RequestConfiguration.MAX_AD_CONTENT_RATING_UNSPECIFIED, "throwOnFailure", RequestConfiguration.MAX_AD_CONTENT_RATING_UNSPECIFIED, "Lkotlin/Result;", "(Ljava/lang/Object;)V", "runCatching", "R", "block", "Lkotlin/Function0;", "(Lkotlin/jvm/functions/Function0;)Ljava/lang/Object;", RequestConfiguration.MAX_AD_CONTENT_RATING_T, "Lkotlin/Function1;", "Lkotlin/ExtensionFunctionType;", "(Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;", "getOrThrow", "(Ljava/lang/Object;)Ljava/lang/Object;", "getOrElse", "onFailure", "Lkotlin/ParameterName;", "name", "getOrDefault", "defaultValue", "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;", "fold", "onSuccess", "value", "(Ljava/lang/Object;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;", "map", "transform", "mapCatching", "recover", "recoverCatching", "action", "kotlin-stdlib"}, k = 2, mv = {2, 2, 0}, xi = 48)
|
|
@SourceDebugExtension({"SMAP\nResult.kt\nKotlin\n*S Kotlin\n*F\n+ 1 Result.kt\nkotlin/ResultKt\n+ 2 fake.kt\nkotlin/jvm/internal/FakeKt\n*L\n1#1,340:1\n1#2:341\n*E\n"})
|
|
/* loaded from: classes3.dex */
|
|
public final class ResultKt {
|
|
@SinceKotlin(version = "1.3")
|
|
@PublishedApi
|
|
@NotNull
|
|
public static final Object createFailure(@NotNull Throwable exception) {
|
|
Intrinsics.checkNotNullParameter(exception, "exception");
|
|
return new Result.Failure(exception);
|
|
}
|
|
|
|
@SinceKotlin(version = "1.3")
|
|
@InlineOnly
|
|
private static final <R, T> R fold(Object obj, Function1<? super T, ? extends R> onSuccess, Function1<? super Throwable, ? extends R> onFailure) {
|
|
Intrinsics.checkNotNullParameter(onSuccess, "onSuccess");
|
|
Intrinsics.checkNotNullParameter(onFailure, "onFailure");
|
|
Throwable m33exceptionOrNullimpl = Result.m33exceptionOrNullimpl(obj);
|
|
if (m33exceptionOrNullimpl == null) {
|
|
return onSuccess.invoke(obj);
|
|
}
|
|
return onFailure.invoke(m33exceptionOrNullimpl);
|
|
}
|
|
|
|
/* JADX WARN: Multi-variable type inference failed */
|
|
@SinceKotlin(version = "1.3")
|
|
@InlineOnly
|
|
private static final <R, T extends R> R getOrDefault(Object obj, R r) {
|
|
if (Result.m36isFailureimpl(obj)) {
|
|
return r;
|
|
}
|
|
return obj;
|
|
}
|
|
|
|
/* JADX WARN: Multi-variable type inference failed */
|
|
@SinceKotlin(version = "1.3")
|
|
@InlineOnly
|
|
private static final <R, T extends R> R getOrElse(Object obj, Function1<? super Throwable, ? extends R> onFailure) {
|
|
Intrinsics.checkNotNullParameter(onFailure, "onFailure");
|
|
Throwable m33exceptionOrNullimpl = Result.m33exceptionOrNullimpl(obj);
|
|
if (m33exceptionOrNullimpl == null) {
|
|
return obj;
|
|
}
|
|
return onFailure.invoke(m33exceptionOrNullimpl);
|
|
}
|
|
|
|
/* JADX WARN: Multi-variable type inference failed */
|
|
@SinceKotlin(version = "1.3")
|
|
@InlineOnly
|
|
private static final <T> T getOrThrow(Object obj) {
|
|
throwOnFailure(obj);
|
|
return obj;
|
|
}
|
|
|
|
@SinceKotlin(version = "1.3")
|
|
@InlineOnly
|
|
private static final <R, T> Object map(Object obj, Function1<? super T, ? extends R> transform) {
|
|
Intrinsics.checkNotNullParameter(transform, "transform");
|
|
if (Result.m37isSuccessimpl(obj)) {
|
|
return Result.m30constructorimpl(transform.invoke(obj));
|
|
}
|
|
return Result.m30constructorimpl(obj);
|
|
}
|
|
|
|
@SinceKotlin(version = "1.3")
|
|
@InlineOnly
|
|
private static final <R, T> Object mapCatching(Object obj, Function1<? super T, ? extends R> transform) {
|
|
Intrinsics.checkNotNullParameter(transform, "transform");
|
|
if (Result.m37isSuccessimpl(obj)) {
|
|
try {
|
|
return Result.m30constructorimpl(transform.invoke(obj));
|
|
} catch (Throwable th) {
|
|
Result.Companion companion = Result.INSTANCE;
|
|
return Result.m30constructorimpl(createFailure(th));
|
|
}
|
|
}
|
|
return Result.m30constructorimpl(obj);
|
|
}
|
|
|
|
@SinceKotlin(version = "1.3")
|
|
@InlineOnly
|
|
private static final <T> Object onFailure(Object obj, Function1<? super Throwable, Unit> action) {
|
|
Intrinsics.checkNotNullParameter(action, "action");
|
|
Throwable m33exceptionOrNullimpl = Result.m33exceptionOrNullimpl(obj);
|
|
if (m33exceptionOrNullimpl != null) {
|
|
action.invoke(m33exceptionOrNullimpl);
|
|
}
|
|
return obj;
|
|
}
|
|
|
|
@SinceKotlin(version = "1.3")
|
|
@InlineOnly
|
|
private static final <T> Object onSuccess(Object obj, Function1<? super T, Unit> action) {
|
|
Intrinsics.checkNotNullParameter(action, "action");
|
|
if (Result.m37isSuccessimpl(obj)) {
|
|
action.invoke(obj);
|
|
}
|
|
return obj;
|
|
}
|
|
|
|
@SinceKotlin(version = "1.3")
|
|
@InlineOnly
|
|
private static final <R, T extends R> Object recover(Object obj, Function1<? super Throwable, ? extends R> transform) {
|
|
Intrinsics.checkNotNullParameter(transform, "transform");
|
|
Throwable m33exceptionOrNullimpl = Result.m33exceptionOrNullimpl(obj);
|
|
if (m33exceptionOrNullimpl == null) {
|
|
return obj;
|
|
}
|
|
return Result.m30constructorimpl(transform.invoke(m33exceptionOrNullimpl));
|
|
}
|
|
|
|
@SinceKotlin(version = "1.3")
|
|
@InlineOnly
|
|
private static final <R, T extends R> Object recoverCatching(Object obj, Function1<? super Throwable, ? extends R> transform) {
|
|
Intrinsics.checkNotNullParameter(transform, "transform");
|
|
Throwable m33exceptionOrNullimpl = Result.m33exceptionOrNullimpl(obj);
|
|
if (m33exceptionOrNullimpl == null) {
|
|
return obj;
|
|
}
|
|
try {
|
|
return Result.m30constructorimpl(transform.invoke(m33exceptionOrNullimpl));
|
|
} catch (Throwable th) {
|
|
Result.Companion companion = Result.INSTANCE;
|
|
return Result.m30constructorimpl(createFailure(th));
|
|
}
|
|
}
|
|
|
|
@SinceKotlin(version = "1.3")
|
|
@InlineOnly
|
|
private static final <R> Object runCatching(Function0<? extends R> block) {
|
|
Intrinsics.checkNotNullParameter(block, "block");
|
|
try {
|
|
Result.Companion companion = Result.INSTANCE;
|
|
return Result.m30constructorimpl(block.invoke());
|
|
} catch (Throwable th) {
|
|
Result.Companion companion2 = Result.INSTANCE;
|
|
return Result.m30constructorimpl(createFailure(th));
|
|
}
|
|
}
|
|
|
|
@SinceKotlin(version = "1.3")
|
|
@PublishedApi
|
|
public static final void throwOnFailure(@NotNull Object obj) {
|
|
if (!(obj instanceof Result.Failure)) {
|
|
} else {
|
|
throw ((Result.Failure) obj).exception;
|
|
}
|
|
}
|
|
|
|
@SinceKotlin(version = "1.3")
|
|
@InlineOnly
|
|
private static final <T, R> Object runCatching(T t, Function1<? super T, ? extends R> block) {
|
|
Intrinsics.checkNotNullParameter(block, "block");
|
|
try {
|
|
Result.Companion companion = Result.INSTANCE;
|
|
return Result.m30constructorimpl(block.invoke(t));
|
|
} catch (Throwable th) {
|
|
Result.Companion companion2 = Result.INSTANCE;
|
|
return Result.m30constructorimpl(createFailure(th));
|
|
}
|
|
}
|
|
}
|