* 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>
101 lines
5 KiB
Java
101 lines
5 KiB
Java
package kotlin.jdk7;
|
|
|
|
import android.content.ContentProviderClient;
|
|
import android.content.res.TypedArray;
|
|
import android.drm.DrmManagerClient;
|
|
import android.media.MediaDrm;
|
|
import android.media.MediaMetadataRetriever;
|
|
import androidx.core.provider.b;
|
|
import com.google.android.gms.ads.RequestConfiguration;
|
|
import com.mycompany.app.dialog.a;
|
|
import java.util.concurrent.ExecutorService;
|
|
import kotlin.ExceptionsKt;
|
|
import kotlin.Metadata;
|
|
import kotlin.PublishedApi;
|
|
import kotlin.SinceKotlin;
|
|
import kotlin.Unit;
|
|
import kotlin.internal.InlineOnly;
|
|
import kotlin.jvm.JvmName;
|
|
import kotlin.jvm.functions.Function0;
|
|
import kotlin.jvm.functions.Function1;
|
|
import kotlin.jvm.internal.InlineMarker;
|
|
import kotlin.jvm.internal.Intrinsics;
|
|
import org.jetbrains.annotations.Nullable;
|
|
|
|
@Metadata(d1 = {"\u0000.\n\u0000\n\u0002\u0018\u0002\n\u0002\u0018\u0002\n\u0002\b\u0002\n\u0002\u0018\u0002\n\u0000\n\u0002\u0018\u0002\n\u0002\u0010\u0002\n\u0002\b\u0004\n\u0002\u0018\u0002\n\u0002\b\u0003\n\u0002\u0010\u0003\n\u0000\u001a \u0010\u0000\u001a\u00060\u0001j\u0002`\u00052\u000e\b\u0004\u0010\u0006\u001a\b\u0012\u0004\u0012\u00020\b0\u0007H\u0087\bø\u0001\u0000\u001aN\u0010\t\u001a\u0002H\n\"\u0010\b\u0000\u0010\u000b*\n\u0018\u00010\u0001j\u0004\u0018\u0001`\u0005\"\u0004\b\u0001\u0010\n*\u0002H\u000b2\u0012\u0010\f\u001a\u000e\u0012\u0004\u0012\u0002H\u000b\u0012\u0004\u0012\u0002H\n0\rH\u0087\bø\u0001\u0000\u0082\u0002\n\n\b\b\u0001\u0012\u0002\u0010\u0001 \u0001¢\u0006\u0002\u0010\u000e\u001a\u001e\u0010\u000f\u001a\u00020\b*\n\u0018\u00010\u0001j\u0004\u0018\u0001`\u00052\b\u0010\u0010\u001a\u0004\u0018\u00010\u0011H\u0001*\u001a\b\u0007\u0010\u0000\"\u00020\u00012\u00020\u0001B\f\b\u0002\u0012\b\b\u0003\u0012\u0004\b\b(\u0004\u0082\u0002\u0007\n\u0005\b\u009920\u0001¨\u0006\u0012"}, d2 = {"AutoCloseable", "Ljava/lang/AutoCloseable;", "Lkotlin/SinceKotlin;", "version", "2.0", "Lkotlin/AutoCloseable;", "closeAction", "Lkotlin/Function0;", RequestConfiguration.MAX_AD_CONTENT_RATING_UNSPECIFIED, "use", "R", RequestConfiguration.MAX_AD_CONTENT_RATING_T, "block", "Lkotlin/Function1;", "(Ljava/lang/AutoCloseable;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;", "closeFinally", "cause", RequestConfiguration.MAX_AD_CONTENT_RATING_UNSPECIFIED, "kotlin-stdlib"}, k = 2, mv = {2, 2, 0}, pn = "kotlin", xi = 48)
|
|
@JvmName(name = "AutoCloseableKt")
|
|
/* loaded from: classes4.dex */
|
|
public final class AutoCloseableKt {
|
|
@SinceKotlin(version = "2.0")
|
|
@InlineOnly
|
|
private static final AutoCloseable AutoCloseable(final Function0<Unit> closeAction) {
|
|
Intrinsics.checkNotNullParameter(closeAction, "closeAction");
|
|
return new AutoCloseable() { // from class: kotlin.jdk7.AutoCloseableKt$AutoCloseable$1
|
|
@Override // java.lang.AutoCloseable
|
|
public final void close() {
|
|
closeAction.invoke();
|
|
}
|
|
};
|
|
}
|
|
|
|
@SinceKotlin(version = "2.0")
|
|
public static /* synthetic */ void AutoCloseable$annotations() {
|
|
}
|
|
|
|
@SinceKotlin(version = "1.2")
|
|
@PublishedApi
|
|
public static final void closeFinally(@Nullable AutoCloseable autoCloseable, @Nullable Throwable th) {
|
|
if (autoCloseable != null) {
|
|
if (th == null) {
|
|
if (autoCloseable instanceof AutoCloseable) {
|
|
autoCloseable.close();
|
|
return;
|
|
}
|
|
if (autoCloseable instanceof ExecutorService) {
|
|
b.f((ExecutorService) autoCloseable);
|
|
return;
|
|
}
|
|
if (autoCloseable instanceof TypedArray) {
|
|
((TypedArray) autoCloseable).recycle();
|
|
return;
|
|
}
|
|
if (autoCloseable instanceof MediaMetadataRetriever) {
|
|
((MediaMetadataRetriever) autoCloseable).release();
|
|
return;
|
|
}
|
|
if (autoCloseable instanceof MediaDrm) {
|
|
((MediaDrm) autoCloseable).release();
|
|
return;
|
|
} else if (autoCloseable instanceof DrmManagerClient) {
|
|
((DrmManagerClient) autoCloseable).release();
|
|
return;
|
|
} else {
|
|
if (autoCloseable instanceof ContentProviderClient) {
|
|
((ContentProviderClient) autoCloseable).release();
|
|
return;
|
|
}
|
|
throw new IllegalArgumentException();
|
|
}
|
|
}
|
|
try {
|
|
a.s(autoCloseable);
|
|
} catch (Throwable th2) {
|
|
ExceptionsKt.addSuppressed(th, th2);
|
|
}
|
|
}
|
|
}
|
|
|
|
@SinceKotlin(version = "1.2")
|
|
@InlineOnly
|
|
private static final <T extends AutoCloseable, R> R use(T t, Function1<? super T, ? extends R> block) {
|
|
Intrinsics.checkNotNullParameter(block, "block");
|
|
try {
|
|
R invoke = block.invoke(t);
|
|
InlineMarker.finallyStart(1);
|
|
closeFinally(t, null);
|
|
InlineMarker.finallyEnd(1);
|
|
return invoke;
|
|
} finally {
|
|
}
|
|
}
|
|
}
|