Skip to content
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

resources: more stability (fixes #2805) #2806

Merged
merged 3 commits into from
Dec 5, 2023
Merged

resources: more stability (fixes #2805) #2806

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
534f336
ensure that the fragment is attached to its activity
Okuro3499 Dec 5, 2023
0edfb9c
Update build.gradle
dogi Dec 5, 2023
e493130
Merge branch 'master' into 2805-fragment-lifecycle-issue-illegalstate…
dogi Dec 5, 2023
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
4 changes: 2 additions & 2 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ android {
applicationId "org.ole.planet.myplanet"
minSdkVersion 21
targetSdkVersion 34
versionCode 1182
versionName "0.11.82"
versionCode 1183
versionName "0.11.83"
ndkVersion '21.3.6528147'
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
Expand Down
20 changes: 11 additions & 9 deletions app/src/main/java/org/ole/planet/myplanet/base/BaseResourceFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,15 +102,17 @@ protected void showDownloadDialog(final List<RealmMyLibrary> db_myLibrary) {
@Override
public void isAvailable() {
if (!db_myLibrary.isEmpty()) {
LayoutInflater inflater = getLayoutInflater();
convertView = inflater.inflate(R.layout.my_library_alertdialog, null);
AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(getActivity());
alertDialogBuilder.setView(convertView).setTitle(R.string.download_suggestion);
alertDialogBuilder.setPositiveButton(R.string.download_selected, (dialogInterface, i) -> startDownload(DownloadUtils.downloadFiles(db_myLibrary, lv.getSelectedItemsList(), settings))).setNeutralButton(R.string.download_all, (dialogInterface, i) -> startDownload(DownloadUtils.downloadAllFiles(db_myLibrary, settings))).setNegativeButton(R.string.txt_cancel, null);
AlertDialog alertDialog = alertDialogBuilder.create();
createListView(db_myLibrary, alertDialog);
alertDialog.show();
(alertDialog).getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(lv.getSelectedItemsList().size() > 0);
if (isAdded() && getActivity() != null) {
LayoutInflater inflater = getActivity().getLayoutInflater();
convertView = inflater.inflate(R.layout.my_library_alertdialog, null);
AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(getActivity());
alertDialogBuilder.setView(convertView).setTitle(R.string.download_suggestion);
alertDialogBuilder.setPositiveButton(R.string.download_selected, (dialogInterface, i) -> startDownload(DownloadUtils.downloadFiles(db_myLibrary, lv.getSelectedItemsList(), settings))).setNeutralButton(R.string.download_all, (dialogInterface, i) -> startDownload(DownloadUtils.downloadAllFiles(db_myLibrary, settings))).setNegativeButton(R.string.txt_cancel, null);
AlertDialog alertDialog = alertDialogBuilder.create();
createListView(db_myLibrary, alertDialog);
alertDialog.show();
(alertDialog).getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(lv.getSelectedItemsList().size() > 0);
}
} else {
Utilities.toast(requireContext(), getString(R.string.no_resources_to_download));
}
Expand Down