From 7375e09d191ee9a9562911a9ea38e6cb08824bae Mon Sep 17 00:00:00 2001 From: Peter Serwylo Date: Wed, 26 Apr 2017 08:38:41 +1000 Subject: [PATCH] Fail softly, notifying user of failure rather than crashing, --- .../org/fdroid/fdroid/installer/ApkSignatureVerifier.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/src/main/java/org/fdroid/fdroid/installer/ApkSignatureVerifier.java b/app/src/main/java/org/fdroid/fdroid/installer/ApkSignatureVerifier.java index da2a6a4e5..dd8ecaaa4 100644 --- a/app/src/main/java/org/fdroid/fdroid/installer/ApkSignatureVerifier.java +++ b/app/src/main/java/org/fdroid/fdroid/installer/ApkSignatureVerifier.java @@ -24,6 +24,7 @@ import android.content.Context; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.Signature; +import android.util.Log; import org.fdroid.fdroid.Utils; import org.spongycastle.util.encoders.Hex; @@ -51,6 +52,12 @@ class ApkSignatureVerifier { } public boolean hasFDroidSignature(File apkFile) { + if (!apkFile.exists()) { + Log.e(TAG, "Failed to verify that " + apkFile.getName() + " has F-Droid signature, " + + "because " + apkFile.getAbsolutePath() + " does not exist."); + return false; + } + byte[] apkSig = getApkSignature(apkFile); byte[] fdroidSig = getFDroidSignature();