* 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>
165 lines
12 KiB
Java
165 lines
12 KiB
Java
package kotlin.collections;
|
|
|
|
import com.google.android.gms.ads.RequestConfiguration;
|
|
import java.util.Collections;
|
|
import java.util.Comparator;
|
|
import java.util.Map;
|
|
import java.util.Properties;
|
|
import java.util.SortedMap;
|
|
import java.util.TreeMap;
|
|
import java.util.concurrent.ConcurrentMap;
|
|
import kotlin.Metadata;
|
|
import kotlin.Pair;
|
|
import kotlin.PublishedApi;
|
|
import kotlin.SinceKotlin;
|
|
import kotlin.Unit;
|
|
import kotlin.collections.builders.MapBuilder;
|
|
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;
|
|
|
|
/* JADX INFO: Access modifiers changed from: package-private */
|
|
@Metadata(d1 = {"\u0000b\n\u0000\n\u0002\u0010$\n\u0002\b\u0003\n\u0002\u0018\u0002\n\u0002\b\u0002\n\u0002\u0018\u0002\n\u0002\u0010%\n\u0002\u0010\u0002\n\u0002\u0018\u0002\n\u0000\n\u0002\u0010\b\n\u0002\b\u0004\n\u0002\u0018\u0002\n\u0002\b\u0002\n\u0002\u0018\u0002\n\u0002\b\u0002\n\u0002\u0018\u0002\n\u0002\u0010\u000f\n\u0000\n\u0002\u0018\u0002\n\u0002\b\u0002\n\u0002\u0010\u0011\n\u0002\b\u0003\n\u0002\u0018\u0002\n\u0002\u0010\u000e\n\u0002\b\u0006\u001a2\u0010\u0000\u001a\u000e\u0012\u0004\u0012\u0002H\u0002\u0012\u0004\u0012\u0002H\u00030\u0001\"\u0004\b\u0000\u0010\u0002\"\u0004\b\u0001\u0010\u00032\u0012\u0010\u0004\u001a\u000e\u0012\u0004\u0012\u0002H\u0002\u0012\u0004\u0012\u0002H\u00030\u0005\u001aI\u0010\u0006\u001a\u000e\u0012\u0004\u0012\u0002H\u0002\u0012\u0004\u0012\u0002H\u00030\u0001\"\u0004\b\u0000\u0010\u0002\"\u0004\b\u0001\u0010\u00032#\u0010\u0007\u001a\u001f\u0012\u0010\u0012\u000e\u0012\u0004\u0012\u0002H\u0002\u0012\u0004\u0012\u0002H\u00030\t\u0012\u0004\u0012\u00020\n0\b¢\u0006\u0002\b\u000bH\u0081\bø\u0001\u0000\u001aQ\u0010\u0006\u001a\u000e\u0012\u0004\u0012\u0002H\u0002\u0012\u0004\u0012\u0002H\u00030\u0001\"\u0004\b\u0000\u0010\u0002\"\u0004\b\u0001\u0010\u00032\u0006\u0010\f\u001a\u00020\r2#\u0010\u0007\u001a\u001f\u0012\u0010\u0012\u000e\u0012\u0004\u0012\u0002H\u0002\u0012\u0004\u0012\u0002H\u00030\t\u0012\u0004\u0012\u00020\n0\b¢\u0006\u0002\b\u000bH\u0081\bø\u0001\u0000\u001a \u0010\u000e\u001a\u000e\u0012\u0004\u0012\u0002H\u0002\u0012\u0004\u0012\u0002H\u00030\t\"\u0004\b\u0000\u0010\u0002\"\u0004\b\u0001\u0010\u0003H\u0001\u001a(\u0010\u000e\u001a\u000e\u0012\u0004\u0012\u0002H\u0002\u0012\u0004\u0012\u0002H\u00030\t\"\u0004\b\u0000\u0010\u0002\"\u0004\b\u0001\u0010\u00032\u0006\u0010\f\u001a\u00020\rH\u0001\u001a4\u0010\u000f\u001a\u000e\u0012\u0004\u0012\u0002H\u0002\u0012\u0004\u0012\u0002H\u00030\u0001\"\u0004\b\u0000\u0010\u0002\"\u0004\b\u0001\u0010\u00032\u0012\u0010\u0010\u001a\u000e\u0012\u0004\u0012\u0002H\u0002\u0012\u0004\u0012\u0002H\u00030\tH\u0001\u001aC\u0010\u0011\u001a\u0002H\u0003\"\u0004\b\u0000\u0010\u0002\"\u0004\b\u0001\u0010\u0003*\u000e\u0012\u0004\u0012\u0002H\u0002\u0012\u0004\u0012\u0002H\u00030\u00122\u0006\u0010\u0013\u001a\u0002H\u00022\f\u0010\u0014\u001a\b\u0012\u0004\u0012\u0002H\u00030\u0015H\u0086\bø\u0001\u0000¢\u0006\u0002\u0010\u0016\u001a:\u0010\u0017\u001a\u000e\u0012\u0004\u0012\u0002H\u0002\u0012\u0004\u0012\u0002H\u00030\u0018\"\u000e\b\u0000\u0010\u0002*\b\u0012\u0004\u0012\u0002H\u00020\u0019\"\u0004\b\u0001\u0010\u0003*\u0010\u0012\u0006\b\u0001\u0012\u0002H\u0002\u0012\u0004\u0012\u0002H\u00030\u0001\u001a@\u0010\u0017\u001a\u000e\u0012\u0004\u0012\u0002H\u0002\u0012\u0004\u0012\u0002H\u00030\u0018\"\u0004\b\u0000\u0010\u0002\"\u0004\b\u0001\u0010\u0003*\u0010\u0012\u0006\b\u0001\u0012\u0002H\u0002\u0012\u0004\u0012\u0002H\u00030\u00012\u000e\u0010\u001a\u001a\n\u0012\u0006\b\u0000\u0012\u0002H\u00020\u001b\u001aY\u0010\u001c\u001a\u000e\u0012\u0004\u0012\u0002H\u0002\u0012\u0004\u0012\u0002H\u00030\u0018\"\u000e\b\u0000\u0010\u0002*\b\u0012\u0004\u0012\u0002H\u00020\u0019\"\u0004\b\u0001\u0010\u00032*\u0010\u001d\u001a\u0016\u0012\u0012\b\u0001\u0012\u000e\u0012\u0004\u0012\u0002H\u0002\u0012\u0004\u0012\u0002H\u00030\u00050\u001e\"\u000e\u0012\u0004\u0012\u0002H\u0002\u0012\u0004\u0012\u0002H\u00030\u0005¢\u0006\u0002\u0010\u001f\u001aa\u0010\u001c\u001a\u000e\u0012\u0004\u0012\u0002H\u0002\u0012\u0004\u0012\u0002H\u00030\u0018\"\u0004\b\u0000\u0010\u0002\"\u0004\b\u0001\u0010\u00032\u000e\u0010\u001a\u001a\n\u0012\u0006\b\u0000\u0012\u0002H\u00020\u001b2*\u0010\u001d\u001a\u0016\u0012\u0012\b\u0001\u0012\u000e\u0012\u0004\u0012\u0002H\u0002\u0012\u0004\u0012\u0002H\u00030\u00050\u001e\"\u000e\u0012\u0004\u0012\u0002H\u0002\u0012\u0004\u0012\u0002H\u00030\u0005H\u0007¢\u0006\u0002\u0010 \u001a\u0019\u0010!\u001a\u00020\"*\u000e\u0012\u0004\u0012\u00020#\u0012\u0004\u0012\u00020#0\u0001H\u0087\b\u001a1\u0010$\u001a\u000e\u0012\u0004\u0012\u0002H\u0002\u0012\u0004\u0012\u0002H\u00030\u0001\"\u0004\b\u0000\u0010\u0002\"\u0004\b\u0001\u0010\u0003*\u000e\u0012\u0004\u0012\u0002H\u0002\u0012\u0004\u0012\u0002H\u00030\u0001H\u0081\b\u001a2\u0010%\u001a\u000e\u0012\u0004\u0012\u0002H\u0002\u0012\u0004\u0012\u0002H\u00030\u0001\"\u0004\b\u0000\u0010\u0002\"\u0004\b\u0001\u0010\u0003*\u0010\u0012\u0006\b\u0001\u0012\u0002H\u0002\u0012\u0004\u0012\u0002H\u00030\u0001H\u0000\u001a\u0010\u0010&\u001a\u00020\r2\u0006\u0010'\u001a\u00020\rH\u0001\"\u000e\u0010(\u001a\u00020\rX\u0082T¢\u0006\u0002\n\u0000\u0082\u0002\u0007\n\u0005\b\u009920\u0001¨\u0006)"}, d2 = {"mapOf", RequestConfiguration.MAX_AD_CONTENT_RATING_UNSPECIFIED, "K", "V", "pair", "Lkotlin/Pair;", "buildMapInternal", "builderAction", "Lkotlin/Function1;", RequestConfiguration.MAX_AD_CONTENT_RATING_UNSPECIFIED, RequestConfiguration.MAX_AD_CONTENT_RATING_UNSPECIFIED, "Lkotlin/ExtensionFunctionType;", "capacity", RequestConfiguration.MAX_AD_CONTENT_RATING_UNSPECIFIED, "createMapBuilder", "build", "builder", "getOrPut", "Ljava/util/concurrent/ConcurrentMap;", "key", "defaultValue", "Lkotlin/Function0;", "(Ljava/util/concurrent/ConcurrentMap;Ljava/lang/Object;Lkotlin/jvm/functions/Function0;)Ljava/lang/Object;", "toSortedMap", "Ljava/util/SortedMap;", RequestConfiguration.MAX_AD_CONTENT_RATING_UNSPECIFIED, "comparator", "Ljava/util/Comparator;", "sortedMapOf", "pairs", RequestConfiguration.MAX_AD_CONTENT_RATING_UNSPECIFIED, "([Lkotlin/Pair;)Ljava/util/SortedMap;", "(Ljava/util/Comparator;[Lkotlin/Pair;)Ljava/util/SortedMap;", "toProperties", "Ljava/util/Properties;", RequestConfiguration.MAX_AD_CONTENT_RATING_UNSPECIFIED, "toSingletonMapOrSelf", "toSingletonMap", "mapCapacity", "expectedSize", "INT_MAX_POWER_OF_TWO", "kotlin-stdlib"}, k = 5, mv = {2, 2, 0}, xi = 49, xs = "kotlin/collections/MapsKt")
|
|
@SourceDebugExtension({"SMAP\nMapsJVM.kt\nKotlin\n*S Kotlin\n*F\n+ 1 MapsJVM.kt\nkotlin/collections/MapsKt__MapsJVMKt\n+ 2 fake.kt\nkotlin/jvm/internal/FakeKt\n*L\n1#1,157:1\n1#2:158\n*E\n"})
|
|
/* loaded from: classes3.dex */
|
|
public class MapsKt__MapsJVMKt extends MapsKt__MapWithDefaultKt {
|
|
private static final int INT_MAX_POWER_OF_TWO = 1073741824;
|
|
|
|
@SinceKotlin(version = "1.3")
|
|
@PublishedApi
|
|
@NotNull
|
|
public static <K, V> Map<K, V> build(@NotNull Map<K, V> builder) {
|
|
Intrinsics.checkNotNullParameter(builder, "builder");
|
|
return ((MapBuilder) builder).build();
|
|
}
|
|
|
|
@SinceKotlin(version = "1.3")
|
|
@PublishedApi
|
|
@InlineOnly
|
|
private static final <K, V> Map<K, V> buildMapInternal(Function1<? super Map<K, V>, Unit> builderAction) {
|
|
Intrinsics.checkNotNullParameter(builderAction, "builderAction");
|
|
Map createMapBuilder = createMapBuilder();
|
|
builderAction.invoke(createMapBuilder);
|
|
return build(createMapBuilder);
|
|
}
|
|
|
|
@SinceKotlin(version = "1.3")
|
|
@PublishedApi
|
|
@NotNull
|
|
public static final <K, V> Map<K, V> createMapBuilder() {
|
|
return new MapBuilder();
|
|
}
|
|
|
|
public static final <K, V> V getOrPut(@NotNull ConcurrentMap<K, V> concurrentMap, K k, @NotNull Function0<? extends V> defaultValue) {
|
|
Intrinsics.checkNotNullParameter(concurrentMap, "<this>");
|
|
Intrinsics.checkNotNullParameter(defaultValue, "defaultValue");
|
|
V v = concurrentMap.get(k);
|
|
if (v == null) {
|
|
V invoke = defaultValue.invoke();
|
|
V putIfAbsent = concurrentMap.putIfAbsent(k, invoke);
|
|
if (putIfAbsent == null) {
|
|
return invoke;
|
|
}
|
|
return putIfAbsent;
|
|
}
|
|
return v;
|
|
}
|
|
|
|
@PublishedApi
|
|
public static int mapCapacity(int i) {
|
|
if (i < 0) {
|
|
return i;
|
|
}
|
|
if (i < 3) {
|
|
return i + 1;
|
|
}
|
|
if (i < INT_MAX_POWER_OF_TWO) {
|
|
return (int) ((i / 0.75f) + 1.0f);
|
|
}
|
|
return Integer.MAX_VALUE;
|
|
}
|
|
|
|
@NotNull
|
|
public static final <K, V> Map<K, V> mapOf(@NotNull Pair<? extends K, ? extends V> pair) {
|
|
Intrinsics.checkNotNullParameter(pair, "pair");
|
|
Map<K, V> singletonMap = Collections.singletonMap(pair.getFirst(), pair.getSecond());
|
|
Intrinsics.checkNotNullExpressionValue(singletonMap, "singletonMap(...)");
|
|
return singletonMap;
|
|
}
|
|
|
|
@NotNull
|
|
public static final <K extends Comparable<? super K>, V> SortedMap<K, V> sortedMapOf(@NotNull Pair<? extends K, ? extends V>... pairs) {
|
|
Intrinsics.checkNotNullParameter(pairs, "pairs");
|
|
TreeMap treeMap = new TreeMap();
|
|
MapsKt__MapsKt.putAll(treeMap, pairs);
|
|
return treeMap;
|
|
}
|
|
|
|
@InlineOnly
|
|
private static final Properties toProperties(Map<String, String> map) {
|
|
Intrinsics.checkNotNullParameter(map, "<this>");
|
|
Properties properties = new Properties();
|
|
properties.putAll(map);
|
|
return properties;
|
|
}
|
|
|
|
@NotNull
|
|
public static final <K, V> Map<K, V> toSingletonMap(@NotNull Map<? extends K, ? extends V> map) {
|
|
Intrinsics.checkNotNullParameter(map, "<this>");
|
|
Map.Entry<? extends K, ? extends V> next = map.entrySet().iterator().next();
|
|
Map<K, V> singletonMap = Collections.singletonMap(next.getKey(), next.getValue());
|
|
Intrinsics.checkNotNullExpressionValue(singletonMap, "with(...)");
|
|
return singletonMap;
|
|
}
|
|
|
|
@InlineOnly
|
|
private static final <K, V> Map<K, V> toSingletonMapOrSelf(Map<K, ? extends V> map) {
|
|
Intrinsics.checkNotNullParameter(map, "<this>");
|
|
return toSingletonMap(map);
|
|
}
|
|
|
|
@NotNull
|
|
public static final <K extends Comparable<? super K>, V> SortedMap<K, V> toSortedMap(@NotNull Map<? extends K, ? extends V> map) {
|
|
Intrinsics.checkNotNullParameter(map, "<this>");
|
|
return new TreeMap(map);
|
|
}
|
|
|
|
@SinceKotlin(version = "1.3")
|
|
@PublishedApi
|
|
@InlineOnly
|
|
private static final <K, V> Map<K, V> buildMapInternal(int i, Function1<? super Map<K, V>, Unit> builderAction) {
|
|
Intrinsics.checkNotNullParameter(builderAction, "builderAction");
|
|
Map createMapBuilder = createMapBuilder(i);
|
|
builderAction.invoke(createMapBuilder);
|
|
return build(createMapBuilder);
|
|
}
|
|
|
|
@SinceKotlin(version = "1.3")
|
|
@PublishedApi
|
|
@NotNull
|
|
public static <K, V> Map<K, V> createMapBuilder(int i) {
|
|
return new MapBuilder(i);
|
|
}
|
|
|
|
@SinceKotlin(version = "1.4")
|
|
@NotNull
|
|
public static final <K, V> SortedMap<K, V> sortedMapOf(@NotNull Comparator<? super K> comparator, @NotNull Pair<? extends K, ? extends V>... pairs) {
|
|
Intrinsics.checkNotNullParameter(comparator, "comparator");
|
|
Intrinsics.checkNotNullParameter(pairs, "pairs");
|
|
TreeMap treeMap = new TreeMap(comparator);
|
|
MapsKt__MapsKt.putAll(treeMap, pairs);
|
|
return treeMap;
|
|
}
|
|
|
|
@NotNull
|
|
public static final <K, V> SortedMap<K, V> toSortedMap(@NotNull Map<? extends K, ? extends V> map, @NotNull Comparator<? super K> comparator) {
|
|
Intrinsics.checkNotNullParameter(map, "<this>");
|
|
Intrinsics.checkNotNullParameter(comparator, "comparator");
|
|
TreeMap treeMap = new TreeMap(comparator);
|
|
treeMap.putAll(map);
|
|
return treeMap;
|
|
}
|
|
}
|