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>
581 lines
11 KiB
Smali
581 lines
11 KiB
Smali
.class abstract Lcom/google/common/util/concurrent/InterruptibleTask;
|
|
.super Ljava/util/concurrent/atomic/AtomicReference;
|
|
.source "SourceFile"
|
|
|
|
# interfaces
|
|
.implements Ljava/lang/Runnable;
|
|
|
|
|
|
# annotations
|
|
.annotation build Lcom/google/common/annotations/GwtCompatible;
|
|
.end annotation
|
|
|
|
.annotation build Lcom/google/j2objc/annotations/ReflectionSupport;
|
|
.end annotation
|
|
|
|
.annotation system Ldalvik/annotation/MemberClasses;
|
|
value = {
|
|
Lcom/google/common/util/concurrent/InterruptibleTask$Blocker;,
|
|
Lcom/google/common/util/concurrent/InterruptibleTask$DoNothingRunnable;
|
|
}
|
|
.end annotation
|
|
|
|
.annotation system Ldalvik/annotation/Signature;
|
|
value = {
|
|
"<T:",
|
|
"Ljava/lang/Object;",
|
|
">",
|
|
"Ljava/util/concurrent/atomic/AtomicReference<",
|
|
"Ljava/lang/Runnable;",
|
|
">;",
|
|
"Ljava/lang/Runnable;"
|
|
}
|
|
.end annotation
|
|
|
|
|
|
# static fields
|
|
.field public static final c:Ljava/lang/Runnable;
|
|
|
|
.field public static final f:Ljava/lang/Runnable;
|
|
|
|
|
|
# direct methods
|
|
.method static constructor <clinit>()V
|
|
.locals 1
|
|
|
|
.line 1
|
|
new-instance v0, Lcom/google/common/util/concurrent/InterruptibleTask$DoNothingRunnable;
|
|
|
|
.line 2
|
|
.line 3
|
|
invoke-direct {v0}, Ljava/lang/Object;-><init>()V
|
|
|
|
.line 4
|
|
.line 5
|
|
.line 6
|
|
sput-object v0, Lcom/google/common/util/concurrent/InterruptibleTask;->c:Ljava/lang/Runnable;
|
|
|
|
.line 7
|
|
.line 8
|
|
new-instance v0, Lcom/google/common/util/concurrent/InterruptibleTask$DoNothingRunnable;
|
|
|
|
.line 9
|
|
.line 10
|
|
invoke-direct {v0}, Ljava/lang/Object;-><init>()V
|
|
|
|
.line 11
|
|
.line 12
|
|
.line 13
|
|
sput-object v0, Lcom/google/common/util/concurrent/InterruptibleTask;->f:Ljava/lang/Runnable;
|
|
|
|
.line 14
|
|
.line 15
|
|
return-void
|
|
.end method
|
|
|
|
|
|
# virtual methods
|
|
.method public abstract a(Ljava/lang/Throwable;)V
|
|
.end method
|
|
|
|
.method public abstract b(Ljava/lang/Object;)V
|
|
.end method
|
|
|
|
.method public abstract c()Z
|
|
.end method
|
|
|
|
.method public abstract d()Ljava/lang/Object;
|
|
.end method
|
|
|
|
.method public abstract e()Ljava/lang/String;
|
|
.end method
|
|
|
|
.method public final f(Ljava/lang/Thread;)V
|
|
.locals 8
|
|
|
|
.line 1
|
|
invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
|
|
|
|
.line 2
|
|
.line 3
|
|
.line 4
|
|
move-result-object v0
|
|
|
|
.line 5
|
|
check-cast v0, Ljava/lang/Runnable;
|
|
|
|
.line 6
|
|
.line 7
|
|
const/4 v1, 0x0
|
|
|
|
.line 8
|
|
const/4 v2, 0x0
|
|
|
|
.line 9
|
|
move v3, v1
|
|
|
|
.line 10
|
|
move v4, v3
|
|
|
|
.line 11
|
|
:goto_0
|
|
instance-of v5, v0, Lcom/google/common/util/concurrent/InterruptibleTask$Blocker;
|
|
|
|
.line 12
|
|
.line 13
|
|
sget-object v6, Lcom/google/common/util/concurrent/InterruptibleTask;->f:Ljava/lang/Runnable;
|
|
|
|
.line 14
|
|
.line 15
|
|
if-nez v5, :cond_2
|
|
|
|
.line 16
|
|
.line 17
|
|
if-ne v0, v6, :cond_0
|
|
|
|
.line 18
|
|
.line 19
|
|
goto :goto_1
|
|
|
|
.line 20
|
|
:cond_0
|
|
if-eqz v3, :cond_1
|
|
|
|
.line 21
|
|
.line 22
|
|
invoke-virtual {p1}, Ljava/lang/Thread;->interrupt()V
|
|
|
|
.line 23
|
|
.line 24
|
|
.line 25
|
|
:cond_1
|
|
return-void
|
|
|
|
.line 26
|
|
:cond_2
|
|
:goto_1
|
|
if-eqz v5, :cond_3
|
|
|
|
.line 27
|
|
.line 28
|
|
move-object v2, v0
|
|
|
|
.line 29
|
|
check-cast v2, Lcom/google/common/util/concurrent/InterruptibleTask$Blocker;
|
|
|
|
.line 30
|
|
.line 31
|
|
:cond_3
|
|
const/4 v5, 0x1
|
|
|
|
.line 32
|
|
add-int/2addr v4, v5
|
|
|
|
.line 33
|
|
const/16 v7, 0x3e8
|
|
|
|
.line 34
|
|
.line 35
|
|
if-le v4, v7, :cond_7
|
|
|
|
.line 36
|
|
.line 37
|
|
if-eq v0, v6, :cond_4
|
|
|
|
.line 38
|
|
.line 39
|
|
invoke-virtual {p0, v0, v6}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
|
|
|
|
.line 40
|
|
.line 41
|
|
.line 42
|
|
move-result v0
|
|
|
|
.line 43
|
|
if-eqz v0, :cond_8
|
|
|
|
.line 44
|
|
.line 45
|
|
:cond_4
|
|
invoke-static {}, Ljava/lang/Thread;->interrupted()Z
|
|
|
|
.line 46
|
|
.line 47
|
|
.line 48
|
|
move-result v0
|
|
|
|
.line 49
|
|
if-nez v0, :cond_6
|
|
|
|
.line 50
|
|
.line 51
|
|
if-eqz v3, :cond_5
|
|
|
|
.line 52
|
|
.line 53
|
|
goto :goto_2
|
|
|
|
.line 54
|
|
:cond_5
|
|
move v3, v1
|
|
|
|
.line 55
|
|
goto :goto_3
|
|
|
|
.line 56
|
|
:cond_6
|
|
:goto_2
|
|
move v3, v5
|
|
|
|
.line 57
|
|
:goto_3
|
|
invoke-static {v2}, Ljava/util/concurrent/locks/LockSupport;->park(Ljava/lang/Object;)V
|
|
|
|
.line 58
|
|
.line 59
|
|
.line 60
|
|
goto :goto_4
|
|
|
|
.line 61
|
|
:cond_7
|
|
invoke-static {}, Ljava/lang/Thread;->yield()V
|
|
|
|
.line 62
|
|
.line 63
|
|
.line 64
|
|
:cond_8
|
|
:goto_4
|
|
invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
|
|
|
|
.line 65
|
|
.line 66
|
|
.line 67
|
|
move-result-object v0
|
|
|
|
.line 68
|
|
check-cast v0, Ljava/lang/Runnable;
|
|
|
|
.line 69
|
|
.line 70
|
|
goto :goto_0
|
|
.end method
|
|
|
|
.method public final run()V
|
|
.locals 5
|
|
|
|
.line 1
|
|
invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
|
|
|
|
.line 2
|
|
.line 3
|
|
.line 4
|
|
move-result-object v0
|
|
|
|
.line 5
|
|
const/4 v1, 0x0
|
|
|
|
.line 6
|
|
invoke-virtual {p0, v1, v0}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
|
|
|
|
.line 7
|
|
.line 8
|
|
.line 9
|
|
move-result v2
|
|
|
|
.line 10
|
|
if-nez v2, :cond_0
|
|
|
|
.line 11
|
|
.line 12
|
|
goto :goto_1
|
|
|
|
.line 13
|
|
:cond_0
|
|
invoke-virtual {p0}, Lcom/google/common/util/concurrent/InterruptibleTask;->c()Z
|
|
|
|
.line 14
|
|
.line 15
|
|
.line 16
|
|
move-result v2
|
|
|
|
.line 17
|
|
sget-object v3, Lcom/google/common/util/concurrent/InterruptibleTask;->c:Ljava/lang/Runnable;
|
|
|
|
.line 18
|
|
.line 19
|
|
if-nez v2, :cond_4
|
|
|
|
.line 20
|
|
.line 21
|
|
:try_start_0
|
|
invoke-virtual {p0}, Lcom/google/common/util/concurrent/InterruptibleTask;->d()Ljava/lang/Object;
|
|
|
|
.line 22
|
|
.line 23
|
|
.line 24
|
|
move-result-object v1
|
|
:try_end_0
|
|
.catchall {:try_start_0 .. :try_end_0} :catchall_0
|
|
|
|
.line 25
|
|
goto :goto_0
|
|
|
|
.line 26
|
|
:catchall_0
|
|
move-exception v4
|
|
|
|
.line 27
|
|
:try_start_1
|
|
invoke-static {v4}, Lcom/google/common/util/concurrent/Platform;->a(Ljava/lang/Throwable;)V
|
|
:try_end_1
|
|
.catchall {:try_start_1 .. :try_end_1} :catchall_1
|
|
|
|
.line 28
|
|
.line 29
|
|
.line 30
|
|
invoke-virtual {p0, v0, v3}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
|
|
|
|
.line 31
|
|
.line 32
|
|
.line 33
|
|
move-result v1
|
|
|
|
.line 34
|
|
if-nez v1, :cond_1
|
|
|
|
.line 35
|
|
.line 36
|
|
invoke-virtual {p0, v0}, Lcom/google/common/util/concurrent/InterruptibleTask;->f(Ljava/lang/Thread;)V
|
|
|
|
.line 37
|
|
.line 38
|
|
.line 39
|
|
:cond_1
|
|
if-nez v2, :cond_6
|
|
|
|
.line 40
|
|
.line 41
|
|
invoke-virtual {p0, v4}, Lcom/google/common/util/concurrent/InterruptibleTask;->a(Ljava/lang/Throwable;)V
|
|
|
|
.line 42
|
|
.line 43
|
|
.line 44
|
|
goto :goto_1
|
|
|
|
.line 45
|
|
:catchall_1
|
|
move-exception v4
|
|
|
|
.line 46
|
|
invoke-virtual {p0, v0, v3}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
|
|
|
|
.line 47
|
|
.line 48
|
|
.line 49
|
|
move-result v3
|
|
|
|
.line 50
|
|
if-nez v3, :cond_2
|
|
|
|
.line 51
|
|
.line 52
|
|
invoke-virtual {p0, v0}, Lcom/google/common/util/concurrent/InterruptibleTask;->f(Ljava/lang/Thread;)V
|
|
|
|
.line 53
|
|
.line 54
|
|
.line 55
|
|
:cond_2
|
|
if-nez v2, :cond_3
|
|
|
|
.line 56
|
|
.line 57
|
|
invoke-virtual {p0, v1}, Lcom/google/common/util/concurrent/InterruptibleTask;->b(Ljava/lang/Object;)V
|
|
|
|
.line 58
|
|
.line 59
|
|
.line 60
|
|
:cond_3
|
|
throw v4
|
|
|
|
.line 61
|
|
:cond_4
|
|
:goto_0
|
|
invoke-virtual {p0, v0, v3}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
|
|
|
|
.line 62
|
|
.line 63
|
|
.line 64
|
|
move-result v3
|
|
|
|
.line 65
|
|
if-nez v3, :cond_5
|
|
|
|
.line 66
|
|
.line 67
|
|
invoke-virtual {p0, v0}, Lcom/google/common/util/concurrent/InterruptibleTask;->f(Ljava/lang/Thread;)V
|
|
|
|
.line 68
|
|
.line 69
|
|
.line 70
|
|
:cond_5
|
|
if-nez v2, :cond_6
|
|
|
|
.line 71
|
|
.line 72
|
|
invoke-virtual {p0, v1}, Lcom/google/common/util/concurrent/InterruptibleTask;->b(Ljava/lang/Object;)V
|
|
|
|
.line 73
|
|
.line 74
|
|
.line 75
|
|
:cond_6
|
|
:goto_1
|
|
return-void
|
|
.end method
|
|
|
|
.method public final toString()Ljava/lang/String;
|
|
.locals 3
|
|
|
|
.line 1
|
|
invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
|
|
|
|
.line 2
|
|
.line 3
|
|
.line 4
|
|
move-result-object v0
|
|
|
|
.line 5
|
|
check-cast v0, Ljava/lang/Runnable;
|
|
|
|
.line 6
|
|
.line 7
|
|
sget-object v1, Lcom/google/common/util/concurrent/InterruptibleTask;->c:Ljava/lang/Runnable;
|
|
|
|
.line 8
|
|
.line 9
|
|
if-ne v0, v1, :cond_0
|
|
|
|
.line 10
|
|
.line 11
|
|
const-string v0, "running=[DONE]"
|
|
|
|
.line 12
|
|
.line 13
|
|
goto :goto_0
|
|
|
|
.line 14
|
|
:cond_0
|
|
instance-of v1, v0, Lcom/google/common/util/concurrent/InterruptibleTask$Blocker;
|
|
|
|
.line 15
|
|
.line 16
|
|
if-eqz v1, :cond_1
|
|
|
|
.line 17
|
|
.line 18
|
|
const-string v0, "running=[INTERRUPTED]"
|
|
|
|
.line 19
|
|
.line 20
|
|
goto :goto_0
|
|
|
|
.line 21
|
|
:cond_1
|
|
instance-of v1, v0, Ljava/lang/Thread;
|
|
|
|
.line 22
|
|
.line 23
|
|
if-eqz v1, :cond_2
|
|
|
|
.line 24
|
|
.line 25
|
|
new-instance v1, Ljava/lang/StringBuilder;
|
|
|
|
.line 26
|
|
.line 27
|
|
const-string v2, "running=[RUNNING ON "
|
|
|
|
.line 28
|
|
.line 29
|
|
invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
|
|
|
|
.line 30
|
|
.line 31
|
|
.line 32
|
|
check-cast v0, Ljava/lang/Thread;
|
|
|
|
.line 33
|
|
.line 34
|
|
invoke-virtual {v0}, Ljava/lang/Thread;->getName()Ljava/lang/String;
|
|
|
|
.line 35
|
|
.line 36
|
|
.line 37
|
|
move-result-object v0
|
|
|
|
.line 38
|
|
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
|
|
|
.line 39
|
|
.line 40
|
|
.line 41
|
|
const-string v0, "]"
|
|
|
|
.line 42
|
|
.line 43
|
|
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
|
|
|
.line 44
|
|
.line 45
|
|
.line 46
|
|
invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
|
|
|
|
.line 47
|
|
.line 48
|
|
.line 49
|
|
move-result-object v0
|
|
|
|
.line 50
|
|
goto :goto_0
|
|
|
|
.line 51
|
|
:cond_2
|
|
const-string v0, "running=[NOT STARTED YET]"
|
|
|
|
.line 52
|
|
.line 53
|
|
:goto_0
|
|
const-string v1, ", "
|
|
|
|
.line 54
|
|
.line 55
|
|
invoke-static {v0, v1}, Landroid/support/v4/media/a;->v(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;
|
|
|
|
.line 56
|
|
.line 57
|
|
.line 58
|
|
move-result-object v0
|
|
|
|
.line 59
|
|
invoke-virtual {p0}, Lcom/google/common/util/concurrent/InterruptibleTask;->e()Ljava/lang/String;
|
|
|
|
.line 60
|
|
.line 61
|
|
.line 62
|
|
move-result-object v1
|
|
|
|
.line 63
|
|
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
|
|
|
.line 64
|
|
.line 65
|
|
.line 66
|
|
invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
|
|
|
|
.line 67
|
|
.line 68
|
|
.line 69
|
|
move-result-object v0
|
|
|
|
.line 70
|
|
return-object v0
|
|
.end method
|