Skip to content

ADFA-4658: fix NPE crash and empty-dialog trap in Kiwix settings (Wip… #190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
luisguzman-adfa merged 3 commits into from
Jul 11, 2026
Merged

ADFA-4658: fix NPE crash and empty-dialog trap in Kiwix settings (Wip… #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
59bf03a
ADFA-4658: fix NPE crash and empty-dialog trap in Kiwix settings (Wip…
luisguzman-adfa Jul 11, 2026
94f8b74
ADFA-4658: redesign Kiwix settings dialog (loading/offline states, cl…
luisguzman-adfa Jul 11, 2026
0c1f310
ADFA-4658: use app:tint on the dialog ImageViews (fix lint UseAppTint)
luisguzman-adfa Jul 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
199 changes: 117 additions & 82 deletions controller/app/src/main/java/org/iiab/controller/install/presentation/PlannerController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,98 +429,133 @@ private void showKiwixSettingsDialog() {
View view = fragment.getLayoutInflater().inflate(R.layout.dialog_install_planner_settings, null);
BrandDialog.Handle dialog = new BrandDialog(fragment.requireContext()).setContentView(view).create();

android.widget.Spinner spinnerLang = view.findViewById(R.id.spinner_kiwix_lang);
Button btnWipe = view.findViewById(R.id.btn_wipe_cache);
Button btnSelect = view.findViewById(R.id.btn_select_variant);
android.widget.RadioGroup rgVariants = view.findViewById(R.id.rg_kiwix_variants);
final android.widget.Spinner spinnerLang = view.findViewById(R.id.spinner_kiwix_lang);
final Button btnWipe = view.findViewById(R.id.btn_wipe_cache);
final Button btnSelect = view.findViewById(R.id.btn_select_variant);
final android.widget.RadioGroup rgVariants = view.findViewById(R.id.rg_kiwix_variants);
final View content = view.findViewById(R.id.planner_content);
final View loading = view.findViewById(R.id.planner_loading);
final View offline = view.findViewById(R.id.planner_offline);
final View btnClose = view.findViewById(R.id.btn_planner_close);
final Button btnRetry = view.findViewById(R.id.btn_planner_retry);

btnClose.setOnClickListener(v -> dialog.dismiss());

// Load (or reload) the Kiwix catalog from the Internet, swapping the dialog
// between loading / offline / ready. Open, Retry and Wipe Cache all reuse this
// one path so the dialog is never left empty or stranded (ADFA-4658).
final Runnable[] loadRef = new Runnable[1];
loadRef[0] = () -> {
loading.setVisibility(View.VISIBLE);
content.setVisibility(View.GONE);
offline.setVisibility(View.GONE);
btnSelect.setEnabled(false);

InstallationPlanner.getOrFetchCatalog(fragment.requireContext(), new InstallationPlanner.CacheListener() {
@Override
public void onReady(JSONObject catalog) {
if (!fragment.isAdded()) return;
loading.setVisibility(View.GONE);
offline.setVisibility(View.GONE);
content.setVisibility(View.VISIBLE);
btnSelect.setEnabled(true);

List<String> langKeys = new ArrayList<>();
java.util.Iterator<String> keys = catalog.keys();
while (keys.hasNext()) langKeys.add(keys.next());
java.util.Collections.sort(langKeys);

List<String> displayNames = new ArrayList<>();
int selectedIndex = 0;
android.content.SharedPreferences prefs = fragment.requireContext().getSharedPreferences(fragment.getString(R.string.pref_file_internal), Context.MODE_PRIVATE);
String currentTarget = (host.getOverrideKiwixLang() != null) ? host.getOverrideKiwixLang() : prefs.getString("selected_lang_minimal", "en");

for (int i = 0; i < langKeys.size(); i++) {
String code = langKeys.get(i);
java.util.Locale loc = new java.util.Locale(code);
String name = loc.getDisplayLanguage(loc);
displayNames.add(name.substring(0, 1).toUpperCase() + name.substring(1) + " / " + loc.getDisplayLanguage(java.util.Locale.US));
if (code.equals(currentTarget)) selectedIndex = i;
}

android.widget.ArrayAdapter<String> adapter = new android.widget.ArrayAdapter<>(fragment.requireContext(), android.R.layout.simple_spinner_dropdown_item, displayNames);
spinnerLang.setAdapter(adapter);
spinnerLang.setSelection(selectedIndex);

spinnerLang.setOnItemSelectedListener(new android.widget.AdapterView.OnItemSelectedListener() {
@Override
public void onItemSelected(android.widget.AdapterView<?> parent, View v, int position, long id) {
String selectedCode = langKeys.get(position);
rgVariants.removeAllViews();

JSONObject variants = catalog.optJSONObject(selectedCode);
if (variants != null) {
java.util.Iterator<String> vKeys = variants.keys();
while (vKeys.hasNext()) {
String vk = vKeys.next();
JSONObject vData = variants.optJSONObject(vk);
double size = (vData != null) ? vData.optDouble("size", 0.0) : 0.0;

android.widget.RadioButton rb = new android.widget.RadioButton(fragment.requireContext());
rb.setId(View.generateViewId());
rb.setText(String.format(java.util.Locale.US, "%-22s %5.1f GB", vk, size));
rb.setTextColor(ContextCompat.getColor(fragment.requireContext(), R.color.dash_text_primary));
rb.setTypeface(Typeface.MONOSPACE);
rb.setTag(vk);
rgVariants.addView(rb);

if (vk.equals(host.getOverrideKiwixVariant())) rb.setChecked(true);
}
}
}

@Override
public void onNothingSelected(android.widget.AdapterView<?> parent) {
}
});

btnSelect.setOnClickListener(v -> {
int checkedId = rgVariants.getCheckedRadioButtonId();
android.widget.RadioButton rb = (checkedId != -1) ? rgVariants.findViewById(checkedId) : null;
int pos = spinnerLang.getSelectedItemPosition();
if (rb != null && pos >= 0 && pos < langKeys.size()) {
host.setOverrideKiwixVariant((String) rb.getTag());
host.setOverrideKiwixLang(langKeys.get(pos));
recalculateProjection();
dialog.dismiss();
} else {
Snackbars.make(fragment.getView(), R.string.kiwix_select_variant_error).show();
}
});
}

@Override
public void onError(String error) {
if (!fragment.isAdded()) return;
loading.setVisibility(View.GONE);
content.setVisibility(View.GONE);
offline.setVisibility(View.VISIBLE);
btnSelect.setEnabled(false);
}
});
};

// Wipe Cache: clear the stale selection (clearCheck BEFORE removeAllViews, or
// the RadioGroup keeps its checked id and Select crashes on a null RadioButton,
// ADFA-4658), then reload the catalog. It does NOT close the dialog.
btnWipe.setOnClickListener(v -> {
InstallationPlanner.wipeCache(fragment.requireContext());
rgVariants.clearCheck();
rgVariants.removeAllViews();
spinnerLang.setAdapter(null);
host.setOverrideKiwixVariant(null);
Snackbars.make(fragment.getView(), R.string.kiwix_cache_wiped).show();
loadRef[0].run();
});

InstallationPlanner.getOrFetchCatalog(fragment.requireContext(), new InstallationPlanner.CacheListener() {
@Override
public void onReady(JSONObject catalog) {
if (!fragment.isAdded()) return;

List<String> langKeys = new ArrayList<>();
java.util.Iterator<String> keys = catalog.keys();
while (keys.hasNext()) langKeys.add(keys.next());
java.util.Collections.sort(langKeys);

List<String> displayNames = new ArrayList<>();
int selectedIndex = 0;
android.content.SharedPreferences prefs = fragment.requireContext().getSharedPreferences(fragment.getString(R.string.pref_file_internal), Context.MODE_PRIVATE);
String currentTarget = (host.getOverrideKiwixLang() != null) ? host.getOverrideKiwixLang() : prefs.getString("selected_lang_minimal", "en");

for (int i = 0; i < langKeys.size(); i++) {
String code = langKeys.get(i);
java.util.Locale loc = new java.util.Locale(code);
String name = loc.getDisplayLanguage(loc);
displayNames.add(name.substring(0, 1).toUpperCase() + name.substring(1) + " / " + loc.getDisplayLanguage(java.util.Locale.US));
if (code.equals(currentTarget)) selectedIndex = i;
}

android.widget.ArrayAdapter<String> adapter = new android.widget.ArrayAdapter<>(fragment.requireContext(), android.R.layout.simple_spinner_dropdown_item, displayNames);
spinnerLang.setAdapter(adapter);
spinnerLang.setSelection(selectedIndex);

spinnerLang.setOnItemSelectedListener(new android.widget.AdapterView.OnItemSelectedListener() {
@Override
public void onItemSelected(android.widget.AdapterView<?> parent, View v, int position, long id) {
String selectedCode = langKeys.get(position);
rgVariants.removeAllViews();

JSONObject variants = catalog.optJSONObject(selectedCode);
if (variants != null) {
java.util.Iterator<String> vKeys = variants.keys();
while (vKeys.hasNext()) {
String vk = vKeys.next();
JSONObject vData = variants.optJSONObject(vk);
double size = (vData != null) ? vData.optDouble("size", 0.0) : 0.0;

android.widget.RadioButton rb = new android.widget.RadioButton(fragment.requireContext());
rb.setId(View.generateViewId());
rb.setText(String.format(java.util.Locale.US, "%-22s %5.1f GB", vk, size));
rb.setTextColor(ContextCompat.getColor(fragment.requireContext(), R.color.dash_text_primary));
rb.setTypeface(Typeface.MONOSPACE);
rb.setTag(vk);
rgVariants.addView(rb);

if (vk.equals(host.getOverrideKiwixVariant())) rb.setChecked(true);
}
}
}

@Override
public void onNothingSelected(android.widget.AdapterView<?> parent) {
}
});

btnSelect.setOnClickListener(v -> {
int checkedId = rgVariants.getCheckedRadioButtonId();
if (checkedId != -1) {
android.widget.RadioButton rb = rgVariants.findViewById(checkedId);
host.setOverrideKiwixVariant((String) rb.getTag());
host.setOverrideKiwixLang(langKeys.get(spinnerLang.getSelectedItemPosition()));
recalculateProjection();
dialog.dismiss();
} else {
Snackbars.make(fragment.getView(), R.string.kiwix_select_variant_error).show();
}
});
}
if (btnRetry != null) btnRetry.setOnClickListener(v -> loadRef[0].run());

@Override
public void onError(String error) {
if (fragment.isAdded())
Snackbars.make(fragment.getView(), fragment.getString(R.string.kiwix_catalog_error, error)).show();
}
});
loadRef[0].run();
dialog.show();
}

Expand Down
6 changes: 6 additions & 0 deletions controller/app/src/main/res/drawable/ic_close_24.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp" android:height="24dp"
android:viewportWidth="24" android:viewportHeight="24">
<path android:fillColor="#FFFFFFFF"
android:pathData="M19,6.41L17.59,5L12,10.59L6.41,5L5,6.41L10.59,12L5,17.59L6.41,19L12,13.41L17.59,19L19,17.59L13.41,12z"/>
</vector>
6 changes: 6 additions & 0 deletions controller/app/src/main/res/drawable/outline_cloud_off_24.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp" android:height="24dp"
android:viewportWidth="24" android:viewportHeight="24">
<path android:fillColor="#FFFFFFFF"
android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4c-1.48,0 -2.85,0.43 -4.01,1.17l1.46,1.46C10.21,6.23 11.08,6 12,6c3.04,0 5.5,2.46 5.5,5.5v0.5H19c1.66,0 3,1.34 3,3 0,1.13 -0.64,2.11 -1.56,2.62l1.45,1.45C23.16,18.16 24,16.68 24,15c0,-2.64 -2.05,-4.78 -4.65,-4.96zM3,5.27l2.75,2.74C2.56,8.15 0,10.77 0,14c0,3.31 2.69,6 6,6h11.73l2,2L21,20.73 4.27,4 3,5.27zM7.73,10l8,8H6c-2.21,0 -4,-1.79 -4,-4s1.79,-4 4,-4h1.73z"/>
</vector>
Loading