KaKi87
550ddb0413
* 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>
437 lines
11 KiB
Smali
437 lines
11 KiB
Smali
.class public final Lkotlin/concurrent/LocksKt;
|
|
.super Ljava/lang/Object;
|
|
.source "SourceFile"
|
|
|
|
|
|
# annotations
|
|
.annotation runtime Lkotlin/Metadata;
|
|
d1 = {
|
|
"\u0000\u001a\n\u0002\u0008\u0002\n\u0002\u0018\u0002\n\u0000\n\u0002\u0018\u0002\n\u0002\u0008\u0002\n\u0002\u0018\u0002\n\u0002\u0008\u0003\u001a6\u0010\u0000\u001a\u0002H\u0001\"\u0004\u0008\u0000\u0010\u0001*\u00020\u00022\u000c\u0010\u0003\u001a\u0008\u0012\u0004\u0012\u0002H\u00010\u0004H\u0087\u0008\u00f8\u0001\u0000\u0082\u0002\n\n\u0008\u0008\u0001\u0012\u0002\u0010\u0001 \u0001\u00a2\u0006\u0002\u0010\u0005\u001a6\u0010\u0006\u001a\u0002H\u0001\"\u0004\u0008\u0000\u0010\u0001*\u00020\u00072\u000c\u0010\u0003\u001a\u0008\u0012\u0004\u0012\u0002H\u00010\u0004H\u0087\u0008\u00f8\u0001\u0000\u0082\u0002\n\n\u0008\u0008\u0001\u0012\u0002\u0010\u0001 \u0001\u00a2\u0006\u0002\u0010\u0008\u001a6\u0010\t\u001a\u0002H\u0001\"\u0004\u0008\u0000\u0010\u0001*\u00020\u00072\u000c\u0010\u0003\u001a\u0008\u0012\u0004\u0012\u0002H\u00010\u0004H\u0087\u0008\u00f8\u0001\u0000\u0082\u0002\n\n\u0008\u0008\u0001\u0012\u0002\u0010\u0001 \u0001\u00a2\u0006\u0002\u0010\u0008\u0082\u0002\u0007\n\u0005\u0008\u009920\u0001\u00a8\u0006\n"
|
|
}
|
|
d2 = {
|
|
"withLock",
|
|
"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 = 0x2
|
|
mv = {
|
|
0x2,
|
|
0x2,
|
|
0x0
|
|
}
|
|
xi = 0x30
|
|
.end annotation
|
|
|
|
.annotation build Lkotlin/jvm/JvmName;
|
|
name = "LocksKt"
|
|
.end annotation
|
|
|
|
.annotation build Lkotlin/jvm/internal/SourceDebugExtension;
|
|
value = {
|
|
"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"
|
|
}
|
|
.end annotation
|
|
|
|
|
|
# direct methods
|
|
.method private static final read(Ljava/util/concurrent/locks/ReentrantReadWriteLock;Lkotlin/jvm/functions/Function0;)Ljava/lang/Object;
|
|
.locals 1
|
|
.annotation system Ldalvik/annotation/Signature;
|
|
value = {
|
|
"<T:",
|
|
"Ljava/lang/Object;",
|
|
">(",
|
|
"Ljava/util/concurrent/locks/ReentrantReadWriteLock;",
|
|
"Lkotlin/jvm/functions/Function0<",
|
|
"+TT;>;)TT;"
|
|
}
|
|
.end annotation
|
|
|
|
.annotation build Lkotlin/internal/InlineOnly;
|
|
.end annotation
|
|
|
|
.line 1
|
|
const-string v0, "<this>"
|
|
|
|
.line 2
|
|
.line 3
|
|
invoke-static {p0, v0}, Lkotlin/jvm/internal/Intrinsics;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
|
|
|
|
.line 4
|
|
.line 5
|
|
.line 6
|
|
const-string v0, "action"
|
|
|
|
.line 7
|
|
.line 8
|
|
invoke-static {p1, v0}, Lkotlin/jvm/internal/Intrinsics;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
|
|
|
|
.line 9
|
|
.line 10
|
|
.line 11
|
|
invoke-virtual {p0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->readLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;
|
|
|
|
.line 12
|
|
.line 13
|
|
.line 14
|
|
move-result-object p0
|
|
|
|
.line 15
|
|
invoke-virtual {p0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;->lock()V
|
|
|
|
.line 16
|
|
.line 17
|
|
.line 18
|
|
const/4 v0, 0x1
|
|
|
|
.line 19
|
|
:try_start_0
|
|
invoke-interface {p1}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
|
|
|
|
.line 20
|
|
.line 21
|
|
.line 22
|
|
move-result-object p1
|
|
:try_end_0
|
|
.catchall {:try_start_0 .. :try_end_0} :catchall_0
|
|
|
|
.line 23
|
|
invoke-static {v0}, Lkotlin/jvm/internal/InlineMarker;->finallyStart(I)V
|
|
|
|
.line 24
|
|
.line 25
|
|
.line 26
|
|
invoke-virtual {p0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;->unlock()V
|
|
|
|
.line 27
|
|
.line 28
|
|
.line 29
|
|
invoke-static {v0}, Lkotlin/jvm/internal/InlineMarker;->finallyEnd(I)V
|
|
|
|
.line 30
|
|
.line 31
|
|
.line 32
|
|
return-object p1
|
|
|
|
.line 33
|
|
:catchall_0
|
|
move-exception p1
|
|
|
|
.line 34
|
|
invoke-static {v0}, Lkotlin/jvm/internal/InlineMarker;->finallyStart(I)V
|
|
|
|
.line 35
|
|
.line 36
|
|
.line 37
|
|
invoke-virtual {p0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;->unlock()V
|
|
|
|
.line 38
|
|
.line 39
|
|
.line 40
|
|
invoke-static {v0}, Lkotlin/jvm/internal/InlineMarker;->finallyEnd(I)V
|
|
|
|
.line 41
|
|
.line 42
|
|
.line 43
|
|
throw p1
|
|
.end method
|
|
|
|
.method private static final withLock(Ljava/util/concurrent/locks/Lock;Lkotlin/jvm/functions/Function0;)Ljava/lang/Object;
|
|
.locals 1
|
|
.annotation system Ldalvik/annotation/Signature;
|
|
value = {
|
|
"<T:",
|
|
"Ljava/lang/Object;",
|
|
">(",
|
|
"Ljava/util/concurrent/locks/Lock;",
|
|
"Lkotlin/jvm/functions/Function0<",
|
|
"+TT;>;)TT;"
|
|
}
|
|
.end annotation
|
|
|
|
.annotation build Lkotlin/internal/InlineOnly;
|
|
.end annotation
|
|
|
|
.line 1
|
|
const-string v0, "<this>"
|
|
|
|
.line 2
|
|
.line 3
|
|
invoke-static {p0, v0}, Lkotlin/jvm/internal/Intrinsics;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
|
|
|
|
.line 4
|
|
.line 5
|
|
.line 6
|
|
const-string v0, "action"
|
|
|
|
.line 7
|
|
.line 8
|
|
invoke-static {p1, v0}, Lkotlin/jvm/internal/Intrinsics;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
|
|
|
|
.line 9
|
|
.line 10
|
|
.line 11
|
|
invoke-interface {p0}, Ljava/util/concurrent/locks/Lock;->lock()V
|
|
|
|
.line 12
|
|
.line 13
|
|
.line 14
|
|
const/4 v0, 0x1
|
|
|
|
.line 15
|
|
:try_start_0
|
|
invoke-interface {p1}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
|
|
|
|
.line 16
|
|
.line 17
|
|
.line 18
|
|
move-result-object p1
|
|
:try_end_0
|
|
.catchall {:try_start_0 .. :try_end_0} :catchall_0
|
|
|
|
.line 19
|
|
invoke-static {v0}, Lkotlin/jvm/internal/InlineMarker;->finallyStart(I)V
|
|
|
|
.line 20
|
|
.line 21
|
|
.line 22
|
|
invoke-interface {p0}, Ljava/util/concurrent/locks/Lock;->unlock()V
|
|
|
|
.line 23
|
|
.line 24
|
|
.line 25
|
|
invoke-static {v0}, Lkotlin/jvm/internal/InlineMarker;->finallyEnd(I)V
|
|
|
|
.line 26
|
|
.line 27
|
|
.line 28
|
|
return-object p1
|
|
|
|
.line 29
|
|
:catchall_0
|
|
move-exception p1
|
|
|
|
.line 30
|
|
invoke-static {v0}, Lkotlin/jvm/internal/InlineMarker;->finallyStart(I)V
|
|
|
|
.line 31
|
|
.line 32
|
|
.line 33
|
|
invoke-interface {p0}, Ljava/util/concurrent/locks/Lock;->unlock()V
|
|
|
|
.line 34
|
|
.line 35
|
|
.line 36
|
|
invoke-static {v0}, Lkotlin/jvm/internal/InlineMarker;->finallyEnd(I)V
|
|
|
|
.line 37
|
|
.line 38
|
|
.line 39
|
|
throw p1
|
|
.end method
|
|
|
|
.method private static final write(Ljava/util/concurrent/locks/ReentrantReadWriteLock;Lkotlin/jvm/functions/Function0;)Ljava/lang/Object;
|
|
.locals 4
|
|
.annotation system Ldalvik/annotation/Signature;
|
|
value = {
|
|
"<T:",
|
|
"Ljava/lang/Object;",
|
|
">(",
|
|
"Ljava/util/concurrent/locks/ReentrantReadWriteLock;",
|
|
"Lkotlin/jvm/functions/Function0<",
|
|
"+TT;>;)TT;"
|
|
}
|
|
.end annotation
|
|
|
|
.annotation build Lkotlin/internal/InlineOnly;
|
|
.end annotation
|
|
|
|
.line 1
|
|
const-string v0, "<this>"
|
|
|
|
.line 2
|
|
.line 3
|
|
invoke-static {p0, v0}, Lkotlin/jvm/internal/Intrinsics;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
|
|
|
|
.line 4
|
|
.line 5
|
|
.line 6
|
|
const-string v0, "action"
|
|
|
|
.line 7
|
|
.line 8
|
|
invoke-static {p1, v0}, Lkotlin/jvm/internal/Intrinsics;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
|
|
|
|
.line 9
|
|
.line 10
|
|
.line 11
|
|
invoke-virtual {p0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->readLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;
|
|
|
|
.line 12
|
|
.line 13
|
|
.line 14
|
|
move-result-object v0
|
|
|
|
.line 15
|
|
invoke-virtual {p0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->getWriteHoldCount()I
|
|
|
|
.line 16
|
|
.line 17
|
|
.line 18
|
|
move-result v1
|
|
|
|
.line 19
|
|
const/4 v2, 0x0
|
|
|
|
.line 20
|
|
if-nez v1, :cond_0
|
|
|
|
.line 21
|
|
.line 22
|
|
invoke-virtual {p0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->getReadHoldCount()I
|
|
|
|
.line 23
|
|
.line 24
|
|
.line 25
|
|
move-result v1
|
|
|
|
.line 26
|
|
goto :goto_0
|
|
|
|
.line 27
|
|
:cond_0
|
|
move v1, v2
|
|
|
|
.line 28
|
|
:goto_0
|
|
move v3, v2
|
|
|
|
.line 29
|
|
:goto_1
|
|
if-ge v3, v1, :cond_1
|
|
|
|
.line 30
|
|
.line 31
|
|
invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;->unlock()V
|
|
|
|
.line 32
|
|
.line 33
|
|
.line 34
|
|
add-int/lit8 v3, v3, 0x1
|
|
|
|
.line 35
|
|
.line 36
|
|
goto :goto_1
|
|
|
|
.line 37
|
|
:cond_1
|
|
invoke-virtual {p0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->writeLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$WriteLock;
|
|
|
|
.line 38
|
|
.line 39
|
|
.line 40
|
|
move-result-object p0
|
|
|
|
.line 41
|
|
invoke-virtual {p0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$WriteLock;->lock()V
|
|
|
|
.line 42
|
|
.line 43
|
|
.line 44
|
|
const/4 v3, 0x1
|
|
|
|
.line 45
|
|
:try_start_0
|
|
invoke-interface {p1}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
|
|
|
|
.line 46
|
|
.line 47
|
|
.line 48
|
|
move-result-object p1
|
|
:try_end_0
|
|
.catchall {:try_start_0 .. :try_end_0} :catchall_0
|
|
|
|
.line 49
|
|
invoke-static {v3}, Lkotlin/jvm/internal/InlineMarker;->finallyStart(I)V
|
|
|
|
.line 50
|
|
.line 51
|
|
.line 52
|
|
:goto_2
|
|
if-ge v2, v1, :cond_2
|
|
|
|
.line 53
|
|
.line 54
|
|
invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;->lock()V
|
|
|
|
.line 55
|
|
.line 56
|
|
.line 57
|
|
add-int/lit8 v2, v2, 0x1
|
|
|
|
.line 58
|
|
.line 59
|
|
goto :goto_2
|
|
|
|
.line 60
|
|
:cond_2
|
|
invoke-virtual {p0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$WriteLock;->unlock()V
|
|
|
|
.line 61
|
|
.line 62
|
|
.line 63
|
|
invoke-static {v3}, Lkotlin/jvm/internal/InlineMarker;->finallyEnd(I)V
|
|
|
|
.line 64
|
|
.line 65
|
|
.line 66
|
|
return-object p1
|
|
|
|
.line 67
|
|
:catchall_0
|
|
move-exception p1
|
|
|
|
.line 68
|
|
invoke-static {v3}, Lkotlin/jvm/internal/InlineMarker;->finallyStart(I)V
|
|
|
|
.line 69
|
|
.line 70
|
|
.line 71
|
|
:goto_3
|
|
if-ge v2, v1, :cond_3
|
|
|
|
.line 72
|
|
.line 73
|
|
invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;->lock()V
|
|
|
|
.line 74
|
|
.line 75
|
|
.line 76
|
|
add-int/lit8 v2, v2, 0x1
|
|
|
|
.line 77
|
|
.line 78
|
|
goto :goto_3
|
|
|
|
.line 79
|
|
:cond_3
|
|
invoke-virtual {p0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$WriteLock;->unlock()V
|
|
|
|
.line 80
|
|
.line 81
|
|
.line 82
|
|
invoke-static {v3}, Lkotlin/jvm/internal/InlineMarker;->finallyEnd(I)V
|
|
|
|
.line 83
|
|
.line 84
|
|
.line 85
|
|
throw p1
|
|
.end method
|