* 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>
77 lines
4.1 KiB
Java
77 lines
4.1 KiB
Java
package kotlin.concurrent;
|
|
|
|
import com.google.android.gms.ads.RequestConfiguration;
|
|
import java.util.concurrent.locks.Lock;
|
|
import java.util.concurrent.locks.ReentrantReadWriteLock;
|
|
import kotlin.Metadata;
|
|
import kotlin.internal.InlineOnly;
|
|
import kotlin.jvm.JvmName;
|
|
import kotlin.jvm.functions.Function0;
|
|
import kotlin.jvm.internal.InlineMarker;
|
|
import kotlin.jvm.internal.Intrinsics;
|
|
import kotlin.jvm.internal.SourceDebugExtension;
|
|
|
|
@Metadata(d1 = {"\u0000\u001a\n\u0002\b\u0002\n\u0002\u0018\u0002\n\u0000\n\u0002\u0018\u0002\n\u0002\b\u0002\n\u0002\u0018\u0002\n\u0002\b\u0003\u001a6\u0010\u0000\u001a\u0002H\u0001\"\u0004\b\u0000\u0010\u0001*\u00020\u00022\f\u0010\u0003\u001a\b\u0012\u0004\u0012\u0002H\u00010\u0004H\u0087\bø\u0001\u0000\u0082\u0002\n\n\b\b\u0001\u0012\u0002\u0010\u0001 \u0001¢\u0006\u0002\u0010\u0005\u001a6\u0010\u0006\u001a\u0002H\u0001\"\u0004\b\u0000\u0010\u0001*\u00020\u00072\f\u0010\u0003\u001a\b\u0012\u0004\u0012\u0002H\u00010\u0004H\u0087\bø\u0001\u0000\u0082\u0002\n\n\b\b\u0001\u0012\u0002\u0010\u0001 \u0001¢\u0006\u0002\u0010\b\u001a6\u0010\t\u001a\u0002H\u0001\"\u0004\b\u0000\u0010\u0001*\u00020\u00072\f\u0010\u0003\u001a\b\u0012\u0004\u0012\u0002H\u00010\u0004H\u0087\bø\u0001\u0000\u0082\u0002\n\n\b\b\u0001\u0012\u0002\u0010\u0001 \u0001¢\u0006\u0002\u0010\b\u0082\u0002\u0007\n\u0005\b\u009920\u0001¨\u0006\n"}, d2 = {"withLock", RequestConfiguration.MAX_AD_CONTENT_RATING_T, "Ljava/util/concurrent/locks/Lock;", "action", "Lkotlin/Function0;", "(Ljava/util/concurrent/locks/Lock;Lkotlin/jvm/functions/Function0;)Ljava/lang/Object;", "read", "Ljava/util/concurrent/locks/ReentrantReadWriteLock;", "(Ljava/util/concurrent/locks/ReentrantReadWriteLock;Lkotlin/jvm/functions/Function0;)Ljava/lang/Object;", "write", "kotlin-stdlib"}, k = 2, mv = {2, 2, 0}, xi = 48)
|
|
@JvmName(name = "LocksKt")
|
|
@SourceDebugExtension({"SMAP\nLocks.kt\nKotlin\n*S Kotlin\n*F\n+ 1 Locks.kt\nkotlin/concurrent/LocksKt\n+ 2 fake.kt\nkotlin/jvm/internal/FakeKt\n*L\n1#1,74:1\n1#2:75\n*E\n"})
|
|
/* loaded from: classes3.dex */
|
|
public final class LocksKt {
|
|
@InlineOnly
|
|
private static final <T> T read(ReentrantReadWriteLock reentrantReadWriteLock, Function0<? extends T> action) {
|
|
Intrinsics.checkNotNullParameter(reentrantReadWriteLock, "<this>");
|
|
Intrinsics.checkNotNullParameter(action, "action");
|
|
ReentrantReadWriteLock.ReadLock readLock = reentrantReadWriteLock.readLock();
|
|
readLock.lock();
|
|
try {
|
|
return action.invoke();
|
|
} finally {
|
|
InlineMarker.finallyStart(1);
|
|
readLock.unlock();
|
|
InlineMarker.finallyEnd(1);
|
|
}
|
|
}
|
|
|
|
@InlineOnly
|
|
private static final <T> T withLock(Lock lock, Function0<? extends T> action) {
|
|
Intrinsics.checkNotNullParameter(lock, "<this>");
|
|
Intrinsics.checkNotNullParameter(action, "action");
|
|
lock.lock();
|
|
try {
|
|
return action.invoke();
|
|
} finally {
|
|
InlineMarker.finallyStart(1);
|
|
lock.unlock();
|
|
InlineMarker.finallyEnd(1);
|
|
}
|
|
}
|
|
|
|
@InlineOnly
|
|
private static final <T> T write(ReentrantReadWriteLock reentrantReadWriteLock, Function0<? extends T> action) {
|
|
int i;
|
|
Intrinsics.checkNotNullParameter(reentrantReadWriteLock, "<this>");
|
|
Intrinsics.checkNotNullParameter(action, "action");
|
|
ReentrantReadWriteLock.ReadLock readLock = reentrantReadWriteLock.readLock();
|
|
int i2 = 0;
|
|
if (reentrantReadWriteLock.getWriteHoldCount() == 0) {
|
|
i = reentrantReadWriteLock.getReadHoldCount();
|
|
} else {
|
|
i = 0;
|
|
}
|
|
for (int i3 = 0; i3 < i; i3++) {
|
|
readLock.unlock();
|
|
}
|
|
ReentrantReadWriteLock.WriteLock writeLock = reentrantReadWriteLock.writeLock();
|
|
writeLock.lock();
|
|
try {
|
|
return action.invoke();
|
|
} finally {
|
|
InlineMarker.finallyStart(1);
|
|
while (i2 < i) {
|
|
readLock.lock();
|
|
i2++;
|
|
}
|
|
writeLock.unlock();
|
|
InlineMarker.finallyEnd(1);
|
|
}
|
|
}
|
|
}
|