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

Add support for filtering apk compatibility by maxSdkVersion

Browse Source 
For now it's enforced like minSdkVersion. It is possible to try and install
incompatible apks by enabling "Incompatible Versions" and agreeing to the
warning shown when clicking on such a version.
This commit is contained in:
Daniel Martí 2014-02-19 18:11:32 +01:00
parent dc1bdc2f3b
commit e6ec5ee242
8 changed files with 39 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@ -200,7 +200,9 @@
<string name="repo_disabled_notification">Disabled "%1$s".\n\nYou will
need to re-enable this repository to install apps from it.
</string>
<string name="minsdk_or_later">Android %s or later</string>
<string name="minsdk_or_later">%s or later</string>
<string name="up_to_maxsdk">up to %s</string>
<string name="minsdk_up_to_maxsdk">%1$s up to %2$s</string>
<string name="not_on_same_wifi">Your device is not on the same WiFi as the local repo you just added! Try joining this network: %s</string>
<string name="requires_features">Requires: %1$s</string>

15
src/org/fdroid/fdroid/AppDetails.java
View File

@ -145,12 +145,21 @@ public class AppDetails extends ListActivity {
holder.size.setVisibility(View.GONE);
}
if (pref_expert && apk.minSdkVersion > 0) {
if (!pref_expert) {
holder.api.setVisibility(View.GONE);
} else if (apk.minSdkVersion > 0 && apk.maxSdkVersion > 0) {
holder.api.setText(getString(R.string.minsdk_up_to_maxsdk,
Utils.getAndroidVersionName(apk.minSdkVersion),
Utils.getAndroidVersionName(apk.maxSdkVersion)));
holder.api.setVisibility(View.VISIBLE);
} else if (apk.minSdkVersion > 0) {
holder.api.setText(getString(R.string.minsdk_or_later,
Utils.getAndroidVersionName(apk.minSdkVersion)));
holder.api.setVisibility(View.VISIBLE);
} else {
holder.api.setVisibility(View.GONE);
} else if (apk.maxSdkVersion > 0) {
holder.api.setText(getString(R.string.up_to_maxsdk,
Utils.getAndroidVersionName(apk.maxSdkVersion)));
holder.api.setVisibility(View.VISIBLE);
}
if (apk.srcname != null) {

2
src/org/fdroid/fdroid/CompatibilityChecker.java
View File

@ -69,7 +69,7 @@ public class CompatibilityChecker extends Compatibility {
List<String> incompatibleReasons = new ArrayList<String>();
if (!hasApi(apk.minSdkVersion)) {
if (!hasApi(apk.minSdkVersion) || !upToApi(apk.maxSdkVersion)) {
incompatibleReasons.add(
context.getResources().getString(
R.string.minsdk_or_later,

6
src/org/fdroid/fdroid/RepoXMLHandler.java
View File

@ -158,6 +158,12 @@ public class RepoXMLHandler extends DefaultHandler {
} catch (NumberFormatException ex) {
curapk.minSdkVersion = 0;
}
} else if (curel.equals("maxsdkver")) {
try {
curapk.maxSdkVersion = Integer.parseInt(str);
} catch (NumberFormatException ex) {
curapk.maxSdkVersion = 0;
}
} else if (curel.equals("added")) {
try {
curapk.added = str.length() == 0 ? null : Utils.DATE_FORMAT

6
src/org/fdroid/fdroid/compat/Compatibility.java
View File

@ -4,10 +4,16 @@ import android.os.Build;
public abstract class Compatibility {
// like minSdkVersion
protected static boolean hasApi(int apiLevel) {
return getApi() >= apiLevel;
}
// like maxSdkVersion
protected static boolean upToApi(int apiLevel) {
return (apiLevel < 1 || getApi() <= apiLevel);
}
protected static int getApi() {
return Build.VERSION.SDK_INT;
}

4
src/org/fdroid/fdroid/data/Apk.java
View File

@ -16,6 +16,7 @@ public class Apk extends ValueObject implements Comparable<Apk> {
public String hash;
public String hashType;
public int minSdkVersion; // 0 if unknown
public int maxSdkVersion; // 0 if none
public Date added;
public Utils.CommaSeparatedList permissions; // null if empty or
// unknown
@ -75,6 +76,8 @@ public class Apk extends ValueObject implements Comparable<Apk> {
compatible = cursor.getInt(i) == 1;
} else if (column.equals(ApkProvider.DataColumns.MIN_SDK_VERSION)) {
minSdkVersion = cursor.getInt(i);
} else if (column.equals(ApkProvider.DataColumns.MAX_SDK_VERSION)) {
maxSdkVersion = cursor.getInt(i);
} else if (column.equals(ApkProvider.DataColumns.NAME)) {
apkName = cursor.getString(i);
} else if (column.equals(ApkProvider.DataColumns.PERMISSIONS)) {
@ -121,6 +124,7 @@ public class Apk extends ValueObject implements Comparable<Apk> {
values.put(ApkProvider.DataColumns.SIZE, size);
values.put(ApkProvider.DataColumns.NAME, apkName);
values.put(ApkProvider.DataColumns.MIN_SDK_VERSION, minSdkVersion);
values.put(ApkProvider.DataColumns.MAX_SDK_VERSION, maxSdkVersion);
values.put(ApkProvider.DataColumns.ADDED_DATE, added == null ? "" : Utils.DATE_FORMAT.format(added));
values.put(ApkProvider.DataColumns.PERMISSIONS, Utils.CommaSeparatedList.str(permissions));
values.put(ApkProvider.DataColumns.FEATURES, Utils.CommaSeparatedList.str(features));

7
src/org/fdroid/fdroid/data/ApkProvider.java
View File

@ -149,6 +149,7 @@ public class ApkProvider extends FDroidProvider {
public static String SIGNATURE = "sig";
public static String SOURCE_NAME = "srcname";
public static String MIN_SDK_VERSION = "minSdkVersion";
public static String MAX_SDK_VERSION = "maxSdkVersion";
public static String PERMISSIONS = "permissions";
public static String FEATURES = "features";
public static String NATIVE_CODE = "nativecode";
@ -161,9 +162,9 @@ public class ApkProvider extends FDroidProvider {
public static String[] ALL = {
_ID, APK_ID, VERSION, REPO_ID, HASH, VERSION_CODE, NAME, SIZE,
SIGNATURE, SOURCE_NAME, MIN_SDK_VERSION, PERMISSIONS, FEATURES,
NATIVE_CODE, HASH_TYPE, ADDED_DATE, IS_COMPATIBLE,
REPO_VERSION, REPO_ADDRESS, INCOMPATIBLE_REASONS
SIGNATURE, SOURCE_NAME, MIN_SDK_VERSION, MAX_SDK_VERSION,
PERMISSIONS, FEATURES, NATIVE_CODE, HASH_TYPE, ADDED_DATE,
IS_COMPATIBLE, REPO_VERSION, REPO_ADDRESS, INCOMPATIBLE_REASONS
};
}

3
src/org/fdroid/fdroid/data/DBHelper.java
View File

@ -46,6 +46,7 @@ public class DBHelper extends SQLiteOpenHelper {
+ "sig string, "
+ "srcname string, "
+ "minSdkVersion integer, "
+ "maxSdkVersion integer, "
+ "permissions string, "
+ "features string, "
+ "nativecode string, "
@ -86,7 +87,7 @@ public class DBHelper extends SQLiteOpenHelper {
+ "iconUrl text, "
+ "primary key(id));";
private static final int DB_VERSION = 39;
private static final int DB_VERSION = 40;
private Context context;