From 20ebc00e5e57f63c6c8f59dd6afb86b06f83611f Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Fri, 21 Dec 2018 22:56:21 +0100 Subject: [PATCH] improved log warning about TargetSdkVersion mismatch --- .../main/java/org/fdroid/fdroid/installer/ApkVerifier.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/fdroid/fdroid/installer/ApkVerifier.java b/app/src/main/java/org/fdroid/fdroid/installer/ApkVerifier.java index e59ba3678..fc827122a 100644 --- a/app/src/main/java/org/fdroid/fdroid/installer/ApkVerifier.java +++ b/app/src/main/java/org/fdroid/fdroid/installer/ApkVerifier.java @@ -26,7 +26,6 @@ import android.net.Uri; import android.support.annotation.Nullable; import android.text.TextUtils; import android.util.Log; - import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.data.Apk; @@ -91,9 +90,11 @@ class ApkVerifier { Utils.debugLog(TAG, "expectedTargetSdkVersion: " + expectedTargetSdkVersion); if (expectedTargetSdkVersion == Apk.SDK_VERSION_MIN_VALUE) { // 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) { - 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)); } }