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

Fix tests by never caching a null signature

Browse Source 
This also keeps us from future possible NPE or null signature issues, if
we ever call getPackageSig on a PackageInfo with no signatures.
This commit is contained in:
Daniel Martí 2015-11-13 11:41:25 +01:00
parent 41b2ad6a9d
commit 04a2c4b70d
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
F-Droid/src/org/fdroid/fdroid/data/InstalledAppProvider.java
View File

@ -113,6 +113,9 @@ public class InstalledAppProvider extends FDroidProvider {
} }
public static String getPackageSig(PackageInfo info) { public static String getPackageSig(PackageInfo info) {
if (info == null || info.signatures == null || info.signatures.length < 1) {
return "";
}
Signature sig = info.signatures[0]; Signature sig = info.signatures[0];
String sigHash = ""; String sigHash = "";
try { try {

1
F-Droid/test/src/org/fdroid/fdroid/InstalledAppProviderTest.java
View File

@ -158,6 +158,7 @@ public class InstalledAppProviderTest extends FDroidProviderTest<InstalledAppPro
values.put(InstalledAppProvider.DataColumns.APPLICATION_LABEL, "Mock app: " + appId); values.put(InstalledAppProvider.DataColumns.APPLICATION_LABEL, "Mock app: " + appId);
values.put(InstalledAppProvider.DataColumns.VERSION_CODE, versionCode); values.put(InstalledAppProvider.DataColumns.VERSION_CODE, versionCode);
values.put(InstalledAppProvider.DataColumns.VERSION_NAME, versionNumber); values.put(InstalledAppProvider.DataColumns.VERSION_NAME, versionNumber);
values.put(InstalledAppProvider.DataColumns.SIGNATURE, "");
return values; return values;
} }