Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use signature as well as version code in app details for suggested apk.

Browse Source
This commit is contained in:
Peter Serwylo 2017-06-30 12:23:33 +10:00
parent 41f85f3c9d
commit 677fd3a522
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -478,7 +478,7 @@ public class AppDetailsRecyclerViewAdapter
if (callbacks.isAppDownloading()) { if (callbacks.isAppDownloading()) {
buttonPrimaryView.setText(R.string.downloading); buttonPrimaryView.setText(R.string.downloading);
buttonPrimaryView.setEnabled(false); buttonPrimaryView.setEnabled(false);
} else if (!app.isInstalled() && app.suggestedVersionCode > 0 && versions.size() > 0) { } else if (!app.isInstalled() && suggestedApk != null) {
// Check count > 0 due to incompatible apps resulting in an empty list. // Check count > 0 due to incompatible apps resulting in an empty list.
callbacks.disableAndroidBeam(); callbacks.disableAndroidBeam();
// Set Install button and hide second button // Set Install button and hide second button
@ -487,7 +487,7 @@ public class AppDetailsRecyclerViewAdapter
buttonPrimaryView.setEnabled(true); buttonPrimaryView.setEnabled(true);
} else if (app.isInstalled()) { } else if (app.isInstalled()) {
callbacks.enableAndroidBeam(); callbacks.enableAndroidBeam();
if (app.canAndWantToUpdate(context)) { if (app.canAndWantToUpdate(context) && suggestedApk != null) {
buttonPrimaryView.setText(R.string.menu_upgrade); buttonPrimaryView.setText(R.string.menu_upgrade);
buttonPrimaryView.setOnClickListener(onUpgradeClickListener); buttonPrimaryView.setOnClickListener(onUpgradeClickListener);
} else { } else {
@ -819,9 +819,12 @@ public class AppDetailsRecyclerViewAdapter
public void bindModel(final Apk apk) { public void bindModel(final Apk apk) {
java.text.DateFormat df = DateFormat.getDateFormat(context); java.text.DateFormat df = DateFormat.getDateFormat(context);
boolean isSuggested = apk.versionCode == app.suggestedVersionCode &&
TextUtils.equals(apk.sig, app.getMostAppropriateSignature());
version.setText(context.getString(R.string.version) version.setText(context.getString(R.string.version)
+ " " + apk.versionName + " " + apk.versionName
+ (apk.versionCode == app.suggestedVersionCode ? " ☆" : "")); + (isSuggested ? " ☆" : ""));
status.setText(getInstalledStatus(apk)); status.setText(getInstalledStatus(apk));