From e6c6c28f5fb1c772ff7f3b7051c8f1dbb8b460aa Mon Sep 17 00:00:00 2001 From: Peter Serwylo Date: Wed, 26 Apr 2017 08:38:02 +1000 Subject: [PATCH] Formatting + PMD fix in response to CR PMD does not like manually throwing NPEs, even if they have more verbose information than the default NPE. As such, use an `IllegalArgumentException` instead. --- app/src/main/java/org/fdroid/fdroid/NotificationHelper.java | 5 ++++- .../org/fdroid/fdroid/installer/ApkSignatureVerifier.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/fdroid/fdroid/NotificationHelper.java b/app/src/main/java/org/fdroid/fdroid/NotificationHelper.java index 16c869b1e..40fba8548 100644 --- a/app/src/main/java/org/fdroid/fdroid/NotificationHelper.java +++ b/app/src/main/java/org/fdroid/fdroid/NotificationHelper.java @@ -531,7 +531,10 @@ class NotificationHelper { // Need to check that the notification is still valid, and also that the image // is indeed cached now, so we won't get stuck in an endless loop. AppUpdateStatusManager.AppUpdateStatus oldEntry = appUpdateStatusManager.get(entry.getUniqueKey()); - if (oldEntry != null && oldEntry.app != null && oldEntry.app.iconUrl != null && DiskCacheUtils.findInCache(oldEntry.app.iconUrl, ImageLoader.getInstance().getDiskCache()) != null) { + if (oldEntry != null + && oldEntry.app != null + && oldEntry.app.iconUrl != null + && DiskCacheUtils.findInCache(oldEntry.app.iconUrl, ImageLoader.getInstance().getDiskCache()) != null) { createNotification(oldEntry); // Update with new image! } } 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 e8479c22f..da2a6a4e5 100644 --- a/app/src/main/java/org/fdroid/fdroid/installer/ApkSignatureVerifier.java +++ b/app/src/main/java/org/fdroid/fdroid/installer/ApkSignatureVerifier.java @@ -72,7 +72,7 @@ class ApkSignatureVerifier { PackageInfo pkgInfo = pm.getPackageArchiveInfo(pkgPath, PackageManager.GET_SIGNATURES); if (pkgInfo == null) { - throw new NullPointerException("Could not find PackageInfo for package at \"" + pkgPath + "\"."); + throw new IllegalArgumentException("Could not find PackageInfo for package at \"" + pkgPath + "\"."); } return signatureToBytes(pkgInfo.signatures);