soul-browser/sources/java/com/mycompany/app/dialog/DialogSaveConfirm.java
KaKi87 550ddb0413
Decompile and recreate Soul Browser v1.4.85 with APK CI builds (#1)
* 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>
2026-08-10 16:07:14 +02:00

113 lines
5.5 KiB
Java

package com.mycompany.app.dialog;
import android.app.Activity;
import android.content.Context;
import android.os.Handler;
import android.view.View;
import android.widget.LinearLayout;
import com.mycompany.app.dialog.DialogSeekAudio;
import com.mycompany.app.main.MainSelectAdapter;
import com.mycompany.app.soulbrowser.R;
import com.mycompany.app.view.MyDialogBottom;
import com.mycompany.app.view.MyDialogLinear;
import com.mycompany.app.view.MyRecyclerView;
import java.util.ArrayList;
/* loaded from: classes3.dex */
public class DialogSaveConfirm extends MyDialogBottom {
public Context a0;
public DialogSeekAudio.DialogSeekListener b0;
public MyDialogLinear c0;
public MyRecyclerView d0;
public MainSelectAdapter e0;
public DialogSaveConfirm(Activity activity, DialogSeekAudio.DialogSeekListener dialogSeekListener) {
super(activity);
this.a0 = getContext();
this.b0 = dialogSeekListener;
Handler handler = this.i;
if (handler == null) {
return;
}
handler.post(new Runnable() { // from class: com.mycompany.app.dialog.DialogSaveConfirm.1
@Override // java.lang.Runnable
public final void run() {
final DialogSaveConfirm dialogSaveConfirm = DialogSaveConfirm.this;
Context context = dialogSaveConfirm.a0;
if (context != null) {
MyDialogLinear q = com.google.android.gms.internal.mlkit_vision_text_common.a.q(context, 1);
MyRecyclerView u = com.google.android.gms.internal.mlkit_vision_text_common.a.u(context, true, false);
LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(-1, 0);
layoutParams.weight = 1.0f;
q.addView(u, layoutParams);
dialogSaveConfirm.c0 = q;
dialogSaveConfirm.d0 = u;
Handler handler2 = dialogSaveConfirm.i;
if (handler2 == null) {
return;
}
handler2.post(new Runnable() { // from class: com.mycompany.app.dialog.DialogSaveConfirm.2
@Override // java.lang.Runnable
public final void run() {
final DialogSaveConfirm dialogSaveConfirm2 = DialogSaveConfirm.this;
if (dialogSaveConfirm2.c0 != null && dialogSaveConfirm2.a0 != null) {
ArrayList arrayList = new ArrayList();
arrayList.add(new MainSelectAdapter.MainSelectItem(0, R.string.exit_with_save));
arrayList.add(new MainSelectAdapter.MainSelectItem(1, R.string.exit_without_save));
dialogSaveConfirm2.e0 = new MainSelectAdapter(arrayList, new MainSelectAdapter.MainSelectListener() { // from class: com.mycompany.app.dialog.DialogSaveConfirm.3
@Override // com.mycompany.app.main.MainSelectAdapter.MainSelectListener
public final void a(int i) {
DialogSaveConfirm dialogSaveConfirm3 = DialogSaveConfirm.this;
DialogSeekAudio.DialogSeekListener dialogSeekListener2 = dialogSaveConfirm3.b0;
if (dialogSeekListener2 != null) {
dialogSeekListener2.a(i);
}
dialogSaveConfirm3.dismiss();
}
});
com.google.android.gms.internal.mlkit_vision_text_common.a.w(1, dialogSaveConfirm2.d0);
dialogSaveConfirm2.d0.setAdapter(dialogSaveConfirm2.e0);
dialogSaveConfirm2.g(dialogSaveConfirm2.c0, new MyDialogBottom.BotViewListener() { // from class: com.mycompany.app.dialog.DialogSaveConfirm.4
@Override // com.mycompany.app.view.MyDialogBottom.BotViewListener
public final void a(View view) {
DialogSaveConfirm dialogSaveConfirm3 = DialogSaveConfirm.this;
if (dialogSaveConfirm3.c0 == null) {
return;
}
dialogSaveConfirm3.show();
}
});
}
}
});
}
}
});
}
@Override // com.mycompany.app.view.MyDialogBottom, android.app.Dialog, android.content.DialogInterface
public final void dismiss() {
this.f18633c = false;
if (this.a0 == null) {
return;
}
MyDialogLinear myDialogLinear = this.c0;
if (myDialogLinear != null) {
myDialogLinear.b();
this.c0 = null;
}
MyRecyclerView myRecyclerView = this.d0;
if (myRecyclerView != null) {
myRecyclerView.s0();
this.d0 = null;
}
MainSelectAdapter mainSelectAdapter = this.e0;
if (mainSelectAdapter != null) {
mainSelectAdapter.w();
this.e0 = null;
}
this.a0 = null;
this.b0 = null;
super.dismiss();
}
}