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

improved log warning about TargetSdkVersion mismatch

Browse Source
This commit is contained in:
Hans-Christoph Steiner 2018-12-21 22:56:21 +01:00
parent 9c8c3380c1
commit 20ebc00e5e
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/fdroid/fdroid/installer/ApkVerifier.java
View File

@ -26,7 +26,6 @@ import android.net.Uri;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.Utils;
import org.fdroid.fdroid.data.Apk; import org.fdroid.fdroid.data.Apk;
@ -91,9 +90,11 @@ class ApkVerifier {
Utils.debugLog(TAG, "expectedTargetSdkVersion: " + expectedTargetSdkVersion); Utils.debugLog(TAG, "expectedTargetSdkVersion: " + expectedTargetSdkVersion);
if (expectedTargetSdkVersion == Apk.SDK_VERSION_MIN_VALUE) { if (expectedTargetSdkVersion == Apk.SDK_VERSION_MIN_VALUE) {
// NOTE: In old fdroidserver versions, targetSdkVersion was not stored inside the repo! // NOTE: In old fdroidserver versions, targetSdkVersion was not stored inside the repo!
Log.w(TAG, "Skipping check for targetSdkVersion, not available in this repo!"); Log.w(TAG, "Skipping check for targetSdkVersion, not available in this app or repo!");
} else if (localTargetSdkVersion != expectedTargetSdkVersion) { } else if (localTargetSdkVersion != expectedTargetSdkVersion) {
throw new ApkVerificationException("TargetSdkVersion of apk file is not the expected targetSdkVersion!"); throw new ApkVerificationException(
String.format("TargetSdkVersion of apk file (%d) is not the expected targetSdkVersion (%d)!",
localTargetSdkVersion, expectedTargetSdkVersion));
} }
} }