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>
288 lines
6.6 KiB
Smali
288 lines
6.6 KiB
Smali
.class public final Lcom/google/android/gms/tasks/Tasks;
|
|
.super Ljava/lang/Object;
|
|
.source "SourceFile"
|
|
|
|
|
|
# direct methods
|
|
.method public static a(Lcom/google/android/gms/tasks/Task;)Ljava/lang/Object;
|
|
.locals 2
|
|
|
|
.line 1
|
|
invoke-static {}, Lcom/google/android/gms/common/internal/Preconditions;->checkNotMainThread()V
|
|
|
|
.line 2
|
|
.line 3
|
|
.line 4
|
|
invoke-static {}, Lcom/google/android/gms/common/internal/Preconditions;->checkNotGoogleApiHandlerThread()V
|
|
|
|
.line 5
|
|
.line 6
|
|
.line 7
|
|
const-string v0, "Task must not be null"
|
|
|
|
.line 8
|
|
.line 9
|
|
invoke-static {p0, v0}, Lcom/google/android/gms/common/internal/Preconditions;->checkNotNull(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
.line 10
|
|
.line 11
|
|
.line 12
|
|
invoke-virtual {p0}, Lcom/google/android/gms/tasks/Task;->o()Z
|
|
|
|
.line 13
|
|
.line 14
|
|
.line 15
|
|
move-result v0
|
|
|
|
.line 16
|
|
if-eqz v0, :cond_0
|
|
|
|
.line 17
|
|
.line 18
|
|
invoke-static {p0}, Lcom/google/android/gms/tasks/Tasks;->f(Lcom/google/android/gms/tasks/Task;)Ljava/lang/Object;
|
|
|
|
.line 19
|
|
.line 20
|
|
.line 21
|
|
move-result-object p0
|
|
|
|
.line 22
|
|
return-object p0
|
|
|
|
.line 23
|
|
:cond_0
|
|
new-instance v0, Lcom/google/android/gms/tasks/zzaa;
|
|
|
|
.line 24
|
|
.line 25
|
|
invoke-direct {v0}, Lcom/google/android/gms/tasks/zzaa;-><init>()V
|
|
|
|
.line 26
|
|
.line 27
|
|
.line 28
|
|
sget-object v1, Lcom/google/android/gms/tasks/TaskExecutors;->b:Ljava/util/concurrent/Executor;
|
|
|
|
.line 29
|
|
.line 30
|
|
invoke-virtual {p0, v1, v0}, Lcom/google/android/gms/tasks/Task;->h(Ljava/util/concurrent/Executor;Lcom/google/android/gms/tasks/OnSuccessListener;)Lcom/google/android/gms/tasks/Task;
|
|
|
|
.line 31
|
|
.line 32
|
|
.line 33
|
|
invoke-virtual {p0, v1, v0}, Lcom/google/android/gms/tasks/Task;->f(Ljava/util/concurrent/Executor;Lcom/google/android/gms/tasks/OnFailureListener;)Lcom/google/android/gms/tasks/Task;
|
|
|
|
.line 34
|
|
.line 35
|
|
.line 36
|
|
invoke-virtual {p0, v1, v0}, Lcom/google/android/gms/tasks/Task;->b(Ljava/util/concurrent/Executor;Lcom/google/android/gms/tasks/OnCanceledListener;)V
|
|
|
|
.line 37
|
|
.line 38
|
|
.line 39
|
|
iget-object v0, v0, Lcom/google/android/gms/tasks/zzaa;->c:Ljava/util/concurrent/CountDownLatch;
|
|
|
|
.line 40
|
|
.line 41
|
|
invoke-virtual {v0}, Ljava/util/concurrent/CountDownLatch;->await()V
|
|
|
|
.line 42
|
|
.line 43
|
|
.line 44
|
|
invoke-static {p0}, Lcom/google/android/gms/tasks/Tasks;->f(Lcom/google/android/gms/tasks/Task;)Ljava/lang/Object;
|
|
|
|
.line 45
|
|
.line 46
|
|
.line 47
|
|
move-result-object p0
|
|
|
|
.line 48
|
|
return-object p0
|
|
.end method
|
|
|
|
.method public static b(Ljava/util/concurrent/Callable;Ljava/util/concurrent/Executor;)Lcom/google/android/gms/tasks/Task;
|
|
.locals 2
|
|
|
|
.line 1
|
|
const-string v0, "Executor must not be null"
|
|
|
|
.line 2
|
|
.line 3
|
|
invoke-static {p1, v0}, Lcom/google/android/gms/common/internal/Preconditions;->checkNotNull(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
.line 4
|
|
.line 5
|
|
.line 6
|
|
const-string v0, "Callback must not be null"
|
|
|
|
.line 7
|
|
.line 8
|
|
invoke-static {p0, v0}, Lcom/google/android/gms/common/internal/Preconditions;->checkNotNull(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
.line 9
|
|
.line 10
|
|
.line 11
|
|
new-instance v0, Lcom/google/android/gms/tasks/zzw;
|
|
|
|
.line 12
|
|
.line 13
|
|
invoke-direct {v0}, Lcom/google/android/gms/tasks/zzw;-><init>()V
|
|
|
|
.line 14
|
|
.line 15
|
|
.line 16
|
|
new-instance v1, Lcom/google/android/gms/tasks/zzx;
|
|
|
|
.line 17
|
|
.line 18
|
|
invoke-direct {v1, v0, p0}, Lcom/google/android/gms/tasks/zzx;-><init>(Lcom/google/android/gms/tasks/zzw;Ljava/util/concurrent/Callable;)V
|
|
|
|
.line 19
|
|
.line 20
|
|
.line 21
|
|
invoke-interface {p1, v1}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
|
|
|
|
.line 22
|
|
.line 23
|
|
.line 24
|
|
return-object v0
|
|
.end method
|
|
|
|
.method public static c()Lcom/google/android/gms/tasks/Task;
|
|
.locals 1
|
|
|
|
.line 1
|
|
new-instance v0, Lcom/google/android/gms/tasks/zzw;
|
|
|
|
.line 2
|
|
.line 3
|
|
invoke-direct {v0}, Lcom/google/android/gms/tasks/zzw;-><init>()V
|
|
|
|
.line 4
|
|
.line 5
|
|
.line 6
|
|
invoke-virtual {v0}, Lcom/google/android/gms/tasks/zzw;->u()V
|
|
|
|
.line 7
|
|
.line 8
|
|
.line 9
|
|
return-object v0
|
|
.end method
|
|
|
|
.method public static d(Ljava/lang/Exception;)Lcom/google/android/gms/tasks/Task;
|
|
.locals 1
|
|
|
|
.line 1
|
|
new-instance v0, Lcom/google/android/gms/tasks/zzw;
|
|
|
|
.line 2
|
|
.line 3
|
|
invoke-direct {v0}, Lcom/google/android/gms/tasks/zzw;-><init>()V
|
|
|
|
.line 4
|
|
.line 5
|
|
.line 6
|
|
invoke-virtual {v0, p0}, Lcom/google/android/gms/tasks/zzw;->t(Ljava/lang/Exception;)V
|
|
|
|
.line 7
|
|
.line 8
|
|
.line 9
|
|
return-object v0
|
|
.end method
|
|
|
|
.method public static e(Ljava/lang/Object;)Lcom/google/android/gms/tasks/Task;
|
|
.locals 1
|
|
|
|
.line 1
|
|
new-instance v0, Lcom/google/android/gms/tasks/zzw;
|
|
|
|
.line 2
|
|
.line 3
|
|
invoke-direct {v0}, Lcom/google/android/gms/tasks/zzw;-><init>()V
|
|
|
|
.line 4
|
|
.line 5
|
|
.line 6
|
|
invoke-virtual {v0, p0}, Lcom/google/android/gms/tasks/zzw;->r(Ljava/lang/Object;)V
|
|
|
|
.line 7
|
|
.line 8
|
|
.line 9
|
|
return-object v0
|
|
.end method
|
|
|
|
.method public static f(Lcom/google/android/gms/tasks/Task;)Ljava/lang/Object;
|
|
.locals 1
|
|
|
|
.line 1
|
|
invoke-virtual {p0}, Lcom/google/android/gms/tasks/Task;->p()Z
|
|
|
|
.line 2
|
|
.line 3
|
|
.line 4
|
|
move-result v0
|
|
|
|
.line 5
|
|
if-eqz v0, :cond_0
|
|
|
|
.line 6
|
|
.line 7
|
|
invoke-virtual {p0}, Lcom/google/android/gms/tasks/Task;->m()Ljava/lang/Object;
|
|
|
|
.line 8
|
|
.line 9
|
|
.line 10
|
|
move-result-object p0
|
|
|
|
.line 11
|
|
return-object p0
|
|
|
|
.line 12
|
|
:cond_0
|
|
invoke-virtual {p0}, Lcom/google/android/gms/tasks/Task;->n()Z
|
|
|
|
.line 13
|
|
.line 14
|
|
.line 15
|
|
move-result v0
|
|
|
|
.line 16
|
|
if-eqz v0, :cond_1
|
|
|
|
.line 17
|
|
.line 18
|
|
new-instance p0, Ljava/util/concurrent/CancellationException;
|
|
|
|
.line 19
|
|
.line 20
|
|
const-string v0, "Task is already canceled"
|
|
|
|
.line 21
|
|
.line 22
|
|
invoke-direct {p0, v0}, Ljava/util/concurrent/CancellationException;-><init>(Ljava/lang/String;)V
|
|
|
|
.line 23
|
|
.line 24
|
|
.line 25
|
|
throw p0
|
|
|
|
.line 26
|
|
:cond_1
|
|
new-instance v0, Ljava/util/concurrent/ExecutionException;
|
|
|
|
.line 27
|
|
.line 28
|
|
invoke-virtual {p0}, Lcom/google/android/gms/tasks/Task;->l()Ljava/lang/Exception;
|
|
|
|
.line 29
|
|
.line 30
|
|
.line 31
|
|
move-result-object p0
|
|
|
|
.line 32
|
|
invoke-direct {v0, p0}, Ljava/util/concurrent/ExecutionException;-><init>(Ljava/lang/Throwable;)V
|
|
|
|
.line 33
|
|
.line 34
|
|
.line 35
|
|
throw v0
|
|
.end method
|