* 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>
168 lines
11 KiB
Java
168 lines
11 KiB
Java
package kotlin.time;
|
|
|
|
import com.google.android.gms.ads.RequestConfiguration;
|
|
import kotlin.Lazy;
|
|
import kotlin.LazyKt;
|
|
import kotlin.Metadata;
|
|
import kotlin.SinceKotlin;
|
|
import kotlin.WasExperimental;
|
|
import kotlin.jvm.internal.DefaultConstructorMarker;
|
|
import kotlin.jvm.internal.Intrinsics;
|
|
import kotlin.jvm.internal.LongCompanionObject;
|
|
import kotlin.jvm.internal.SourceDebugExtension;
|
|
import kotlin.math.MathKt;
|
|
import kotlin.time.ComparableTimeMark;
|
|
import kotlin.time.TimeSource;
|
|
import org.jetbrains.annotations.NotNull;
|
|
import org.jetbrains.annotations.Nullable;
|
|
|
|
@SinceKotlin(version = "1.9")
|
|
@Metadata(d1 = {"\u0000\"\n\u0002\u0018\u0002\n\u0002\u0018\u0002\n\u0000\n\u0002\u0018\u0002\n\u0002\b\u0005\n\u0002\u0010\t\n\u0002\b\u0007\n\u0002\u0018\u0002\n\u0002\b\u0002\b'\u0018\u00002\u00020\u0001:\u0001\u0012B\u000f\u0012\u0006\u0010\u0002\u001a\u00020\u0003¢\u0006\u0004\b\u0004\u0010\u0005J\b\u0010\b\u001a\u00020\tH$J\b\u0010\u000f\u001a\u00020\tH\u0002J\b\u0010\u0010\u001a\u00020\u0011H\u0016R\u0014\u0010\u0002\u001a\u00020\u0003X\u0084\u0004¢\u0006\b\n\u0000\u001a\u0004\b\u0006\u0010\u0007R\u001b\u0010\n\u001a\u00020\t8BX\u0082\u0084\u0002¢\u0006\f\n\u0004\b\r\u0010\u000e\u001a\u0004\b\u000b\u0010\f¨\u0006\u0013"}, d2 = {"Lkotlin/time/AbstractLongTimeSource;", "Lkotlin/time/TimeSource$WithComparableMarks;", "unit", "Lkotlin/time/DurationUnit;", "<init>", "(Lkotlin/time/DurationUnit;)V", "getUnit", "()Lkotlin/time/DurationUnit;", "read", RequestConfiguration.MAX_AD_CONTENT_RATING_UNSPECIFIED, "zero", "getZero", "()J", "zero$delegate", "Lkotlin/Lazy;", "adjustedRead", "markNow", "Lkotlin/time/ComparableTimeMark;", "LongTimeMark", "kotlin-stdlib"}, k = 1, mv = {2, 2, 0}, xi = 48)
|
|
@WasExperimental(markerClass = {ExperimentalTime.class})
|
|
/* loaded from: classes4.dex */
|
|
public abstract class AbstractLongTimeSource implements TimeSource.WithComparableMarks {
|
|
|
|
@NotNull
|
|
private final DurationUnit unit;
|
|
|
|
/* renamed from: zero$delegate, reason: from kotlin metadata */
|
|
@NotNull
|
|
private final Lazy zero;
|
|
|
|
@Metadata(d1 = {"\u00004\n\u0002\u0018\u0002\n\u0002\u0018\u0002\n\u0000\n\u0002\u0010\t\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/AbstractLongTimeSource$LongTimeMark;", "Lkotlin/time/ComparableTimeMark;", "startedAt", RequestConfiguration.MAX_AD_CONTENT_RATING_UNSPECIFIED, "timeSource", "Lkotlin/time/AbstractLongTimeSource;", "offset", "Lkotlin/time/Duration;", "<init>", "(JLkotlin/time/AbstractLongTimeSource;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)
|
|
@SourceDebugExtension({"SMAP\nTimeSources.kt\nKotlin\n*S Kotlin\n*F\n+ 1 TimeSources.kt\nkotlin/time/AbstractLongTimeSource$LongTimeMark\n+ 2 longSaturatedMath.kt\nkotlin/time/LongSaturatedMathKt\n*L\n1#1,210:1\n80#2:211\n*S KotlinDebug\n*F\n+ 1 TimeSources.kt\nkotlin/time/AbstractLongTimeSource$LongTimeMark\n*L\n67#1:211\n*E\n"})
|
|
/* loaded from: classes4.dex */
|
|
public static final class LongTimeMark implements ComparableTimeMark {
|
|
private final long offset;
|
|
private final long startedAt;
|
|
|
|
@NotNull
|
|
private final AbstractLongTimeSource timeSource;
|
|
|
|
public /* synthetic */ LongTimeMark(long j, AbstractLongTimeSource abstractLongTimeSource, long j2, DefaultConstructorMarker defaultConstructorMarker) {
|
|
this(j, abstractLongTimeSource, j2);
|
|
}
|
|
|
|
@Override // kotlin.time.TimeMark
|
|
/* renamed from: elapsedNow-UwyO8pc */
|
|
public long mo1348elapsedNowUwyO8pc() {
|
|
return Duration.m1386minusLRDsOJo(LongSaturatedMathKt.saturatingOriginsDiff(this.timeSource.adjustedRead(), this.startedAt, this.timeSource.getUnit()), this.offset);
|
|
}
|
|
|
|
@Override // kotlin.time.ComparableTimeMark
|
|
public boolean equals(@Nullable Object other) {
|
|
if ((other instanceof LongTimeMark) && Intrinsics.areEqual(this.timeSource, ((LongTimeMark) 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() {
|
|
int m1379hashCodeimpl = Duration.m1379hashCodeimpl(this.offset) * 37;
|
|
long j = this.startedAt;
|
|
return m1379hashCodeimpl + ((int) (j ^ (j >>> 32)));
|
|
}
|
|
|
|
@Override // kotlin.time.TimeMark
|
|
@NotNull
|
|
/* renamed from: minus-LRDsOJo */
|
|
public /* bridge */ ComparableTimeMark mo1349minusLRDsOJo(long j) {
|
|
return ComparableTimeMark.DefaultImpls.m1353minusLRDsOJo(this, j);
|
|
}
|
|
|
|
@Override // kotlin.time.ComparableTimeMark
|
|
/* renamed from: minus-UwyO8pc */
|
|
public long mo1350minusUwyO8pc(@NotNull ComparableTimeMark other) {
|
|
Intrinsics.checkNotNullParameter(other, "other");
|
|
if (other instanceof LongTimeMark) {
|
|
LongTimeMark longTimeMark = (LongTimeMark) other;
|
|
if (Intrinsics.areEqual(this.timeSource, longTimeMark.timeSource)) {
|
|
return Duration.m1387plusLRDsOJo(LongSaturatedMathKt.saturatingOriginsDiff(this.startedAt, longTimeMark.startedAt, this.timeSource.getUnit()), Duration.m1386minusLRDsOJo(this.offset, longTimeMark.offset));
|
|
}
|
|
}
|
|
throw new IllegalArgumentException("Subtracting or comparing time marks from different time sources is not possible: " + this + " and " + other);
|
|
}
|
|
|
|
@NotNull
|
|
public String toString() {
|
|
return "LongTimeMark(" + this.startedAt + DurationUnitKt__DurationUnitKt.shortName(this.timeSource.getUnit()) + " + " + ((Object) Duration.m1398toStringimpl(this.offset)) + ", " + this.timeSource + ')';
|
|
}
|
|
|
|
private LongTimeMark(long j, AbstractLongTimeSource timeSource, long j2) {
|
|
Intrinsics.checkNotNullParameter(timeSource, "timeSource");
|
|
this.startedAt = j;
|
|
this.timeSource = timeSource;
|
|
this.offset = j2;
|
|
}
|
|
|
|
@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 */
|
|
public ComparableTimeMark mo1351plusLRDsOJo(long duration) {
|
|
DurationUnit unit = this.timeSource.getUnit();
|
|
if (Duration.m1383isInfiniteimpl(duration)) {
|
|
return new LongTimeMark(LongSaturatedMathKt.m1460saturatingAddNuflL3o(this.startedAt, unit, duration), this.timeSource, Duration.INSTANCE.m1449getZEROUwyO8pc(), null);
|
|
}
|
|
long m1401truncateToUwyO8pc$kotlin_stdlib = Duration.m1401truncateToUwyO8pc$kotlin_stdlib(duration, unit);
|
|
long m1387plusLRDsOJo = Duration.m1387plusLRDsOJo(Duration.m1386minusLRDsOJo(duration, m1401truncateToUwyO8pc$kotlin_stdlib), this.offset);
|
|
long m1460saturatingAddNuflL3o = LongSaturatedMathKt.m1460saturatingAddNuflL3o(this.startedAt, unit, m1401truncateToUwyO8pc$kotlin_stdlib);
|
|
long m1401truncateToUwyO8pc$kotlin_stdlib2 = Duration.m1401truncateToUwyO8pc$kotlin_stdlib(m1387plusLRDsOJo, unit);
|
|
long m1460saturatingAddNuflL3o2 = LongSaturatedMathKt.m1460saturatingAddNuflL3o(m1460saturatingAddNuflL3o, unit, m1401truncateToUwyO8pc$kotlin_stdlib2);
|
|
long m1386minusLRDsOJo = Duration.m1386minusLRDsOJo(m1387plusLRDsOJo, m1401truncateToUwyO8pc$kotlin_stdlib2);
|
|
long m1371getInWholeNanosecondsimpl = Duration.m1371getInWholeNanosecondsimpl(m1386minusLRDsOJo);
|
|
if (m1460saturatingAddNuflL3o2 != 0 && m1371getInWholeNanosecondsimpl != 0 && (m1460saturatingAddNuflL3o2 ^ m1371getInWholeNanosecondsimpl) < 0) {
|
|
long duration2 = DurationKt.toDuration(MathKt.getSign(m1371getInWholeNanosecondsimpl), unit);
|
|
m1460saturatingAddNuflL3o2 = LongSaturatedMathKt.m1460saturatingAddNuflL3o(m1460saturatingAddNuflL3o2, unit, duration2);
|
|
m1386minusLRDsOJo = Duration.m1386minusLRDsOJo(m1386minusLRDsOJo, duration2);
|
|
}
|
|
if ((1 | (m1460saturatingAddNuflL3o2 - 1)) == LongCompanionObject.MAX_VALUE) {
|
|
m1386minusLRDsOJo = Duration.INSTANCE.m1449getZEROUwyO8pc();
|
|
}
|
|
return new LongTimeMark(m1460saturatingAddNuflL3o2, this.timeSource, m1386minusLRDsOJo, null);
|
|
}
|
|
}
|
|
|
|
public AbstractLongTimeSource(@NotNull DurationUnit unit) {
|
|
Intrinsics.checkNotNullParameter(unit, "unit");
|
|
this.unit = unit;
|
|
this.zero = LazyKt.lazy(new a(0, this));
|
|
}
|
|
|
|
/* JADX INFO: Access modifiers changed from: private */
|
|
public final long adjustedRead() {
|
|
return read() - getZero();
|
|
}
|
|
|
|
private final long getZero() {
|
|
return ((Number) this.zero.getValue()).longValue();
|
|
}
|
|
|
|
@NotNull
|
|
public final DurationUnit getUnit() {
|
|
return this.unit;
|
|
}
|
|
|
|
public abstract long read();
|
|
|
|
@Override // kotlin.time.TimeSource
|
|
@NotNull
|
|
public ComparableTimeMark markNow() {
|
|
return new LongTimeMark(adjustedRead(), this, Duration.INSTANCE.m1449getZEROUwyO8pc(), null);
|
|
}
|
|
}
|