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

Guard against null, and improve logging in ApkVerifier.

Browse Source
This commit is contained in:
Peter Serwylo 2016-10-16 20:28:19 +11:00
parent ad2059574e
commit b72cdff522
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,6 +23,7 @@ import android.content.Context;
import android.content.pm.PackageInfo; import android.content.pm.PackageInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.net.Uri; import android.net.Uri;
import android.support.annotation.Nullable;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
@ -80,8 +81,6 @@ class ApkVerifier {
} }
// verify permissions, important for unattended installer // verify permissions, important for unattended installer
Utils.debugLog(TAG, "localPermissions: " + TextUtils.join("\n", localApkInfo.requestedPermissions));
Utils.debugLog(TAG, "expectedPermissions: " + TextUtils.join("\n", expectedApk.requestedPermissions));
if (!requestedPermissionsEqual(expectedApk.requestedPermissions, localApkInfo.requestedPermissions)) { if (!requestedPermissionsEqual(expectedApk.requestedPermissions, localApkInfo.requestedPermissions)) {
throw new ApkPermissionUnequalException("Permissions in APK and index.xml do not match!"); throw new ApkPermissionUnequalException("Permissions in APK and index.xml do not match!");
} }
@ -103,7 +102,11 @@ class ApkVerifier {
* data format is {@link String} arrays but they are in effect sets. This is the * data format is {@link String} arrays but they are in effect sets. This is the
* same data format as {@link android.content.pm.PackageInfo#requestedPermissions} * same data format as {@link android.content.pm.PackageInfo#requestedPermissions}
*/ */
public static boolean requestedPermissionsEqual(String[] expected, String[] actual) { public static boolean requestedPermissionsEqual(@Nullable String[] expected, @Nullable String[] actual) {
Utils.debugLog(TAG, "Checking permissions");
Utils.debugLog(TAG, "Actual:\n " + (actual == null ? "None" : TextUtils.join("\n ", actual)));
Utils.debugLog(TAG, "Expected:\n " + (expected == null ? "None" : TextUtils.join("\n ", expected)));
if (expected == null && actual == null) { if (expected == null && actual == null) {
return true; return true;
} }