* 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>
137 lines
8.7 KiB
Java
137 lines
8.7 KiB
Java
package kotlin.time;
|
|
|
|
import com.google.android.gms.ads.RequestConfiguration;
|
|
import kotlin.Deprecated;
|
|
import kotlin.DeprecationLevel;
|
|
import kotlin.Metadata;
|
|
import kotlin.SinceKotlin;
|
|
import kotlin.jvm.internal.DefaultConstructorMarker;
|
|
import kotlin.jvm.internal.Intrinsics;
|
|
import kotlin.time.ComparableTimeMark;
|
|
import kotlin.time.TimeSource;
|
|
import org.jetbrains.annotations.NotNull;
|
|
import org.jetbrains.annotations.Nullable;
|
|
|
|
@SinceKotlin(version = "1.3")
|
|
@Metadata(d1 = {"\u0000 \n\u0002\u0018\u0002\n\u0002\u0018\u0002\n\u0000\n\u0002\u0018\u0002\n\u0002\b\u0005\n\u0002\u0010\u0006\n\u0000\n\u0002\u0018\u0002\n\u0002\b\u0002\b'\u0018\u00002\u00020\u0001:\u0001\fB\u000f\u0012\u0006\u0010\u0002\u001a\u00020\u0003¢\u0006\u0004\b\u0004\u0010\u0005J\b\u0010\b\u001a\u00020\tH$J\b\u0010\n\u001a\u00020\u000bH\u0016R\u0014\u0010\u0002\u001a\u00020\u0003X\u0084\u0004¢\u0006\b\n\u0000\u001a\u0004\b\u0006\u0010\u0007¨\u0006\r"}, d2 = {"Lkotlin/time/AbstractDoubleTimeSource;", "Lkotlin/time/TimeSource$WithComparableMarks;", "unit", "Lkotlin/time/DurationUnit;", "<init>", "(Lkotlin/time/DurationUnit;)V", "getUnit", "()Lkotlin/time/DurationUnit;", "read", RequestConfiguration.MAX_AD_CONTENT_RATING_UNSPECIFIED, "markNow", "Lkotlin/time/ComparableTimeMark;", "DoubleTimeMark", "kotlin-stdlib"}, k = 1, mv = {2, 2, 0}, xi = 48)
|
|
@Deprecated(level = DeprecationLevel.ERROR, message = "Using AbstractDoubleTimeSource is no longer recommended, use AbstractLongTimeSource instead.")
|
|
@ExperimentalTime
|
|
/* loaded from: classes4.dex */
|
|
public abstract class AbstractDoubleTimeSource implements TimeSource.WithComparableMarks {
|
|
|
|
@NotNull
|
|
private final DurationUnit unit;
|
|
|
|
@Metadata(d1 = {"\u00004\n\u0002\u0018\u0002\n\u0002\u0018\u0002\n\u0000\n\u0002\u0010\u0006\n\u0000\n\u0002\u0018\u0002\n\u0000\n\u0002\u0018\u0002\n\u0002\b\u000f\n\u0002\u0010\u000b\n\u0002\u0010\u0000\n\u0000\n\u0002\u0010\b\n\u0000\n\u0002\u0010\u000e\n\u0000\b\u0002\u0018\u00002\u00020\u0001B\u001f\u0012\u0006\u0010\u0002\u001a\u00020\u0003\u0012\u0006\u0010\u0004\u001a\u00020\u0005\u0012\u0006\u0010\u0006\u001a\u00020\u0007¢\u0006\u0004\b\b\u0010\tJ\u000f\u0010\u000b\u001a\u00020\u0007H\u0016¢\u0006\u0004\b\f\u0010\rJ\u0018\u0010\u000e\u001a\u00020\u00012\u0006\u0010\u000f\u001a\u00020\u0007H\u0096\u0002¢\u0006\u0004\b\u0010\u0010\u0011J\u0018\u0010\u0012\u001a\u00020\u00072\u0006\u0010\u0013\u001a\u00020\u0001H\u0096\u0002¢\u0006\u0004\b\u0014\u0010\u0015J\u0013\u0010\u0016\u001a\u00020\u00172\b\u0010\u0013\u001a\u0004\u0018\u00010\u0018H\u0096\u0002J\b\u0010\u0019\u001a\u00020\u001aH\u0016J\b\u0010\u001b\u001a\u00020\u001cH\u0016R\u000e\u0010\u0002\u001a\u00020\u0003X\u0082\u0004¢\u0006\u0002\n\u0000R\u000e\u0010\u0004\u001a\u00020\u0005X\u0082\u0004¢\u0006\u0002\n\u0000R\u0010\u0010\u0006\u001a\u00020\u0007X\u0082\u0004¢\u0006\u0004\n\u0002\u0010\n¨\u0006\u001d"}, d2 = {"Lkotlin/time/AbstractDoubleTimeSource$DoubleTimeMark;", "Lkotlin/time/ComparableTimeMark;", "startedAt", RequestConfiguration.MAX_AD_CONTENT_RATING_UNSPECIFIED, "timeSource", "Lkotlin/time/AbstractDoubleTimeSource;", "offset", "Lkotlin/time/Duration;", "<init>", "(DLkotlin/time/AbstractDoubleTimeSource;JLkotlin/jvm/internal/DefaultConstructorMarker;)V", "J", "elapsedNow", "elapsedNow-UwyO8pc", "()J", "plus", "duration", "plus-LRDsOJo", "(J)Lkotlin/time/ComparableTimeMark;", "minus", "other", "minus-UwyO8pc", "(Lkotlin/time/ComparableTimeMark;)J", "equals", RequestConfiguration.MAX_AD_CONTENT_RATING_UNSPECIFIED, RequestConfiguration.MAX_AD_CONTENT_RATING_UNSPECIFIED, "hashCode", RequestConfiguration.MAX_AD_CONTENT_RATING_UNSPECIFIED, "toString", RequestConfiguration.MAX_AD_CONTENT_RATING_UNSPECIFIED, "kotlin-stdlib"}, k = 1, mv = {2, 2, 0}, xi = 48)
|
|
/* loaded from: classes4.dex */
|
|
public static final class DoubleTimeMark implements ComparableTimeMark {
|
|
private final long offset;
|
|
private final double startedAt;
|
|
|
|
@NotNull
|
|
private final AbstractDoubleTimeSource timeSource;
|
|
|
|
public /* synthetic */ DoubleTimeMark(double d, AbstractDoubleTimeSource abstractDoubleTimeSource, long j, DefaultConstructorMarker defaultConstructorMarker) {
|
|
this(d, abstractDoubleTimeSource, j);
|
|
}
|
|
|
|
@Override // kotlin.time.TimeMark
|
|
/* renamed from: elapsedNow-UwyO8pc, reason: not valid java name */
|
|
public long mo1348elapsedNowUwyO8pc() {
|
|
return Duration.m1386minusLRDsOJo(DurationKt.toDuration(this.timeSource.read() - this.startedAt, this.timeSource.getUnit()), this.offset);
|
|
}
|
|
|
|
@Override // kotlin.time.ComparableTimeMark
|
|
public boolean equals(@Nullable Object other) {
|
|
if ((other instanceof DoubleTimeMark) && Intrinsics.areEqual(this.timeSource, ((DoubleTimeMark) other).timeSource) && Duration.m1363equalsimpl0(mo1350minusUwyO8pc((ComparableTimeMark) other), Duration.INSTANCE.m1449getZEROUwyO8pc())) {
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
@Override // kotlin.time.TimeMark
|
|
public /* bridge */ boolean hasNotPassedNow() {
|
|
return ComparableTimeMark.DefaultImpls.hasNotPassedNow(this);
|
|
}
|
|
|
|
@Override // kotlin.time.TimeMark
|
|
public /* bridge */ boolean hasPassedNow() {
|
|
return ComparableTimeMark.DefaultImpls.hasPassedNow(this);
|
|
}
|
|
|
|
@Override // kotlin.time.ComparableTimeMark
|
|
public int hashCode() {
|
|
return Duration.m1379hashCodeimpl(Duration.m1387plusLRDsOJo(DurationKt.toDuration(this.startedAt, this.timeSource.getUnit()), this.offset));
|
|
}
|
|
|
|
@Override // kotlin.time.TimeMark
|
|
@NotNull
|
|
/* renamed from: minus-LRDsOJo, reason: not valid java name */
|
|
public /* bridge */ ComparableTimeMark mo1349minusLRDsOJo(long j) {
|
|
return ComparableTimeMark.DefaultImpls.m1353minusLRDsOJo(this, j);
|
|
}
|
|
|
|
@Override // kotlin.time.ComparableTimeMark
|
|
/* renamed from: minus-UwyO8pc, reason: not valid java name */
|
|
public long mo1350minusUwyO8pc(@NotNull ComparableTimeMark other) {
|
|
Intrinsics.checkNotNullParameter(other, "other");
|
|
if (other instanceof DoubleTimeMark) {
|
|
DoubleTimeMark doubleTimeMark = (DoubleTimeMark) other;
|
|
if (Intrinsics.areEqual(this.timeSource, doubleTimeMark.timeSource)) {
|
|
if (Duration.m1363equalsimpl0(this.offset, doubleTimeMark.offset) && Duration.m1383isInfiniteimpl(this.offset)) {
|
|
return Duration.INSTANCE.m1449getZEROUwyO8pc();
|
|
}
|
|
long m1386minusLRDsOJo = Duration.m1386minusLRDsOJo(this.offset, doubleTimeMark.offset);
|
|
long duration = DurationKt.toDuration(this.startedAt - doubleTimeMark.startedAt, this.timeSource.getUnit());
|
|
if (Duration.m1363equalsimpl0(duration, Duration.m1402unaryMinusUwyO8pc(m1386minusLRDsOJo))) {
|
|
return Duration.INSTANCE.m1449getZEROUwyO8pc();
|
|
}
|
|
return Duration.m1387plusLRDsOJo(duration, m1386minusLRDsOJo);
|
|
}
|
|
}
|
|
throw new IllegalArgumentException("Subtracting or comparing time marks from different time sources is not possible: " + this + " and " + other);
|
|
}
|
|
|
|
@NotNull
|
|
public String toString() {
|
|
return "DoubleTimeMark(" + this.startedAt + DurationUnitKt__DurationUnitKt.shortName(this.timeSource.getUnit()) + " + " + ((Object) Duration.m1398toStringimpl(this.offset)) + ", " + this.timeSource + ')';
|
|
}
|
|
|
|
private DoubleTimeMark(double d, AbstractDoubleTimeSource timeSource, long j) {
|
|
Intrinsics.checkNotNullParameter(timeSource, "timeSource");
|
|
this.startedAt = d;
|
|
this.timeSource = timeSource;
|
|
this.offset = j;
|
|
}
|
|
|
|
@Override // java.lang.Comparable
|
|
public /* bridge */ int compareTo(@NotNull ComparableTimeMark comparableTimeMark) {
|
|
return ComparableTimeMark.DefaultImpls.compareTo(this, comparableTimeMark);
|
|
}
|
|
|
|
@Override // kotlin.time.TimeMark
|
|
@NotNull
|
|
/* renamed from: plus-LRDsOJo, reason: not valid java name */
|
|
public ComparableTimeMark mo1351plusLRDsOJo(long duration) {
|
|
return new DoubleTimeMark(this.startedAt, this.timeSource, Duration.m1387plusLRDsOJo(this.offset, duration), null);
|
|
}
|
|
}
|
|
|
|
public AbstractDoubleTimeSource(@NotNull DurationUnit unit) {
|
|
Intrinsics.checkNotNullParameter(unit, "unit");
|
|
this.unit = unit;
|
|
}
|
|
|
|
@NotNull
|
|
public final DurationUnit getUnit() {
|
|
return this.unit;
|
|
}
|
|
|
|
public abstract double read();
|
|
|
|
@Override // kotlin.time.TimeSource
|
|
@NotNull
|
|
public ComparableTimeMark markNow() {
|
|
return new DoubleTimeMark(read(), this, Duration.INSTANCE.m1449getZEROUwyO8pc(), null);
|
|
}
|
|
}
|