From b86a30d40f1459bc40e78f6aa848560beded4854 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Mon, 11 Apr 2016 10:32:55 -0400 Subject: [PATCH] fix expert mode version display when maxSdkVersion is MAX_VALUE closes #616 https://gitlab.com/fdroid/fdroidclient/issues/616 --- app/src/main/java/org/fdroid/fdroid/AppDetails.java | 2 +- app/src/main/java/org/fdroid/fdroid/data/Apk.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/fdroid/fdroid/AppDetails.java b/app/src/main/java/org/fdroid/fdroid/AppDetails.java index 5cda16ec3..26668808c 100644 --- a/app/src/main/java/org/fdroid/fdroid/AppDetails.java +++ b/app/src/main/java/org/fdroid/fdroid/AppDetails.java @@ -247,7 +247,7 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A if (!Preferences.get().expertMode()) { holder.api.setVisibility(View.GONE); - } else if (apk.minSdkVersion > 0 && apk.maxSdkVersion > 0) { + } else if (apk.minSdkVersion > 0 && apk.maxSdkVersion < Apk.SDK_VERSION_MAX_VALUE) { holder.api.setText(getString(R.string.minsdk_up_to_maxsdk, Utils.getAndroidVersionName(apk.minSdkVersion), Utils.getAndroidVersionName(apk.maxSdkVersion))); diff --git a/app/src/main/java/org/fdroid/fdroid/data/Apk.java b/app/src/main/java/org/fdroid/fdroid/data/Apk.java index 09f694bf0..1e7dc633f 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/Apk.java +++ b/app/src/main/java/org/fdroid/fdroid/data/Apk.java @@ -11,6 +11,9 @@ import java.util.Date; public class Apk extends ValueObject implements Comparable { + // Using only byte-range keeps it only 8-bits in the SQLite database + public static final int SDK_VERSION_MAX_VALUE = Byte.MAX_VALUE; + public String packageName; public String version; public int vercode; @@ -19,7 +22,7 @@ public class Apk extends ValueObject implements Comparable { public String hash; public String hashType; public int minSdkVersion; // 0 if unknown - public int maxSdkVersion = Byte.MAX_VALUE; // "infinity" if not set + public int maxSdkVersion = SDK_VERSION_MAX_VALUE; // "infinity" if not set public Date added; public Utils.CommaSeparatedList permissions; // null if empty or // unknown