From 65c4087b05cc5ec387d5e7785247c78dae1f7bda Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Thu, 6 Oct 2016 19:45:16 +0200 Subject: [PATCH] improved Apk.toString() for easier debugging --- app/src/main/java/org/fdroid/fdroid/data/Apk.java | 2 +- .../java/org/fdroid/fdroid/installer/InstallerFactory.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/fdroid/fdroid/data/Apk.java b/app/src/main/java/org/fdroid/fdroid/data/Apk.java index 592644699..406966308 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/Apk.java +++ b/app/src/main/java/org/fdroid/fdroid/data/Apk.java @@ -270,7 +270,7 @@ public class Apk extends ValueObject implements Comparable, Parcelable { @Override public String toString() { - return packageName + " (version " + versionCode + ")"; + return toContentValues().toString(); } public ContentValues toContentValues() { diff --git a/app/src/main/java/org/fdroid/fdroid/installer/InstallerFactory.java b/app/src/main/java/org/fdroid/fdroid/installer/InstallerFactory.java index 47c9bc74c..fffb47fab 100644 --- a/app/src/main/java/org/fdroid/fdroid/installer/InstallerFactory.java +++ b/app/src/main/java/org/fdroid/fdroid/installer/InstallerFactory.java @@ -41,12 +41,12 @@ public class InstallerFactory { */ public static Installer create(Context context, Apk apk) { if (apk == null || TextUtils.isEmpty(apk.packageName)) { - throw new IllegalArgumentException("packageName must not be empty!"); + throw new IllegalArgumentException("Apk.packageName must not be empty: " + apk); } Installer installer; if (apk.packageName.equals(PrivilegedInstaller.PRIVILEGED_EXTENSION_PACKAGE_NAME)) { - // special case for "F-Droid Privileged Extension" + // special case for installing "Privileged Extension" with root installer = new ExtensionInstaller(context, apk); } else if (PrivilegedInstaller.isDefault(context)) { Utils.debugLog(TAG, "privileged extension correctly installed -> PrivilegedInstaller");