* 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>
162 lines
6.9 KiB
Java
162 lines
6.9 KiB
Java
package j$.util.concurrent;
|
|
|
|
import j$.util.Map;
|
|
import j$.util.Objects;
|
|
import java.util.Map;
|
|
import java.util.function.BiConsumer;
|
|
import java.util.function.BiFunction;
|
|
import java.util.function.Function;
|
|
|
|
/* loaded from: classes2.dex */
|
|
public interface ConcurrentMap<K, V> extends Map<K, V> {
|
|
|
|
/* renamed from: j$.util.concurrent.ConcurrentMap$-EL */
|
|
/* loaded from: classes2.dex */
|
|
public final /* synthetic */ class EL {
|
|
public static /* synthetic */ Object computeIfAbsent(java.util.concurrent.ConcurrentMap concurrentMap, Object obj, Function function) {
|
|
return concurrentMap instanceof ConcurrentMap ? ((ConcurrentMap) concurrentMap).computeIfAbsent(obj, function) : CC.$default$computeIfAbsent(concurrentMap, obj, function);
|
|
}
|
|
}
|
|
|
|
@Override // java.util.concurrent.ConcurrentMap, j$.util.concurrent.ConcurrentMap, j$.util.Map
|
|
V compute(K k, BiFunction<? super K, ? super V, ? extends V> biFunction);
|
|
|
|
@Override // java.util.concurrent.ConcurrentMap, j$.util.concurrent.ConcurrentMap, j$.util.Map
|
|
V computeIfAbsent(K k, Function<? super K, ? extends V> function);
|
|
|
|
@Override // java.util.concurrent.ConcurrentMap, j$.util.concurrent.ConcurrentMap, j$.util.Map
|
|
V computeIfPresent(K k, BiFunction<? super K, ? super V, ? extends V> biFunction);
|
|
|
|
@Override // java.util.concurrent.ConcurrentMap, j$.util.concurrent.ConcurrentMap, j$.util.Map
|
|
void forEach(BiConsumer<? super K, ? super V> biConsumer);
|
|
|
|
@Override // java.util.concurrent.ConcurrentMap, j$.util.concurrent.ConcurrentMap, j$.util.Map
|
|
V getOrDefault(Object obj, V v);
|
|
|
|
@Override // java.util.concurrent.ConcurrentMap, j$.util.concurrent.ConcurrentMap, j$.util.Map
|
|
V merge(K k, V v, BiFunction<? super V, ? super V, ? extends V> biFunction);
|
|
|
|
@Override // java.util.concurrent.ConcurrentMap, j$.util.concurrent.ConcurrentMap, j$.util.Map
|
|
void replaceAll(BiFunction<? super K, ? super V, ? extends V> biFunction);
|
|
|
|
/* renamed from: j$.util.concurrent.ConcurrentMap$-CC */
|
|
/* loaded from: classes2.dex */
|
|
public final /* synthetic */ class CC {
|
|
public static Object $default$getOrDefault(java.util.concurrent.ConcurrentMap concurrentMap, Object obj, Object obj2) {
|
|
Object obj3 = concurrentMap.get(obj);
|
|
return obj3 != null ? obj3 : obj2;
|
|
}
|
|
|
|
public static void $default$forEach(java.util.concurrent.ConcurrentMap concurrentMap, BiConsumer biConsumer) {
|
|
Objects.requireNonNull(biConsumer);
|
|
for (Map.Entry<K, V> entry : concurrentMap.entrySet()) {
|
|
try {
|
|
biConsumer.accept(entry.getKey(), entry.getValue());
|
|
} catch (IllegalStateException unused) {
|
|
}
|
|
}
|
|
}
|
|
|
|
public static void $default$replaceAll(java.util.concurrent.ConcurrentMap concurrentMap, BiFunction biFunction) {
|
|
Objects.requireNonNull(biFunction);
|
|
t tVar = new t(0, concurrentMap, biFunction);
|
|
if (concurrentMap instanceof ConcurrentMap) {
|
|
((ConcurrentMap) concurrentMap).forEach(tVar);
|
|
} else {
|
|
$default$forEach(concurrentMap, tVar);
|
|
}
|
|
}
|
|
|
|
/* JADX WARN: Multi-variable type inference failed */
|
|
public static Object $default$computeIfAbsent(java.util.concurrent.ConcurrentMap concurrentMap, Object obj, Function function) {
|
|
Object apply;
|
|
Objects.requireNonNull(function);
|
|
Object obj2 = concurrentMap.get(obj);
|
|
if (obj2 != null || (apply = function.apply(obj)) == null) {
|
|
return obj2;
|
|
}
|
|
Object putIfAbsent = concurrentMap.putIfAbsent(obj, apply);
|
|
return putIfAbsent == null ? apply : putIfAbsent;
|
|
}
|
|
|
|
/* JADX WARN: Multi-variable type inference failed */
|
|
public static Object $default$computeIfPresent(java.util.concurrent.ConcurrentMap concurrentMap, Object obj, BiFunction biFunction) {
|
|
Object apply;
|
|
Objects.requireNonNull(biFunction);
|
|
while (true) {
|
|
Object obj2 = concurrentMap.get(obj);
|
|
if (obj2 == null) {
|
|
return null;
|
|
}
|
|
apply = biFunction.apply(obj, obj2);
|
|
if (apply == null) {
|
|
if (concurrentMap.remove(obj, obj2)) {
|
|
break;
|
|
}
|
|
} else if (concurrentMap.replace(obj, obj2, apply)) {
|
|
break;
|
|
}
|
|
}
|
|
return apply;
|
|
}
|
|
|
|
/* JADX WARN: Code restructure failed: missing block: B:8:0x0019, code lost:
|
|
|
|
return r1;
|
|
*/
|
|
/* JADX WARN: Multi-variable type inference failed */
|
|
/*
|
|
Code decompiled incorrectly, please refer to instructions dump.
|
|
To view partially-correct add '--show-bad-code' argument
|
|
*/
|
|
public static java.lang.Object $default$compute(java.util.concurrent.ConcurrentMap r2, java.lang.Object r3, java.util.function.BiFunction r4) {
|
|
/*
|
|
L0:
|
|
java.lang.Object r0 = r2.get(r3)
|
|
L4:
|
|
java.lang.Object r1 = r4.apply(r3, r0)
|
|
if (r1 == 0) goto L1a
|
|
if (r0 == 0) goto L13
|
|
boolean r0 = r2.replace(r3, r0, r1)
|
|
if (r0 == 0) goto L0
|
|
goto L19
|
|
L13:
|
|
java.lang.Object r0 = r2.putIfAbsent(r3, r1)
|
|
if (r0 != 0) goto L4
|
|
L19:
|
|
return r1
|
|
L1a:
|
|
if (r0 == 0) goto L22
|
|
boolean r0 = r2.remove(r3, r0)
|
|
if (r0 == 0) goto L0
|
|
L22:
|
|
r2 = 0
|
|
return r2
|
|
*/
|
|
throw new UnsupportedOperationException("Method not decompiled: j$.util.concurrent.ConcurrentMap.CC.$default$compute(java.util.concurrent.ConcurrentMap, java.lang.Object, java.util.function.BiFunction):java.lang.Object");
|
|
}
|
|
|
|
/* JADX WARN: Multi-variable type inference failed */
|
|
public static Object $default$merge(java.util.concurrent.ConcurrentMap concurrentMap, Object obj, Object obj2, BiFunction biFunction) {
|
|
Objects.requireNonNull(biFunction);
|
|
Objects.requireNonNull(obj2);
|
|
while (true) {
|
|
Object obj3 = concurrentMap.get(obj);
|
|
while (obj3 == null) {
|
|
obj3 = concurrentMap.putIfAbsent(obj, obj2);
|
|
if (obj3 == null) {
|
|
return obj2;
|
|
}
|
|
}
|
|
Object apply = biFunction.apply(obj3, obj2);
|
|
if (apply != null) {
|
|
if (concurrentMap.replace(obj, obj3, apply)) {
|
|
return apply;
|
|
}
|
|
} else if (concurrentMap.remove(obj, obj3)) {
|
|
return null;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|