mirror/fdroidclient
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidclient.git synced 2026-05-18 13:43:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-incompatible-install' into 'master'

Browse Source 
Fix visibility of install/update button when no compatible versions are available

Closes #2847

See merge request fdroid/fdroidclient!1414
This commit is contained in:
Torsten Grote
2024-09-03 16:54:22 +00:00
parent 2fdc87c4f6 83139ed5e6
commit 0ed7a09dde
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
View File

@@ -646,8 +646,17 @@ public class AppDetailsRecyclerViewAdapter
antiFeaturesListingView.setApp(app);
updateAntiFeaturesWarning();
boolean hasCompatibleVersion = false;
for (Apk apk : versions) {
if (apk.compatible) {
hasCompatibleVersion = true;
break;
}
}
boolean showPrimaryButton = hasCompatibleVersion || app.isInstalled(context);
buttonPrimaryView.setText(R.string.menu_install);
buttonPrimaryView.setVisibility(versionsLoading ? View.GONE : View.VISIBLE);
buttonPrimaryView.setVisibility(showPrimaryButton ? View.VISIBLE : View.GONE);
buttonSecondaryView.setText(R.string.menu_uninstall);
buttonSecondaryView.setVisibility(app.isUninstallable(context) ? View.VISIBLE : View.GONE);
buttonSecondaryView.setOnClickListener(v -> callbacks.uninstallApk());
@@ -665,7 +674,7 @@ public class AppDetailsRecyclerViewAdapter
buttonPrimaryView.setEnabled(true);
buttonPrimaryView.setOnClickListener(v -> callbacks.installApk(suggestedApk));
} else if (app.isInstalled(context)) {
if (app.canAndWantToUpdate(suggestedApk) && suggestedApk != null) {
if (app.canAndWantToUpdate(suggestedApk)) {
buttonPrimaryView.setText(R.string.menu_upgrade);
buttonPrimaryView.setOnClickListener(v -> callbacks.installApk(suggestedApk));
} else {