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

Fixed two NPE.

Browse Source 
Categories can technically be null, so need to guard for that
when getting them from the ContentProvider. This occurred because
I had an old index from before the change from "category" to
"categories", so it indeed was null.

The other one was from when I added a new repo without a fingerprint.
The fingerprint gets changed to upper case, but if null, causes
a NPE.
This commit is contained in:
Peter Serwylo 2014-02-20 08:55:44 +11:00
parent 8bb0e58e6c
commit 4d5fd98ae5
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/org/fdroid/fdroid/data/AppProvider.java
View File

@ -66,8 +66,11 @@ public class AppProvider extends FDroidProvider {
if (cursor != null) {
cursor.moveToFirst();
while (!cursor.isAfterLast()) {
for( String s : Utils.CommaSeparatedList.make(cursor.getString(0))) {
categorySet.add(s);
String categoriesString = cursor.getString(0);
if (categoriesString != null) {
for( String s : Utils.CommaSeparatedList.make(categoriesString)) {
categorySet.add(s);
}
}
cursor.moveToNext();
}

4
src/org/fdroid/fdroid/views/fragments/RepoListFragment.java
View File

@ -407,7 +407,9 @@ public class RepoListFragment extends ListFragment
private void createNewRepo(String address, String fingerprint) {
ContentValues values = new ContentValues(2);
values.put(RepoProvider.DataColumns.ADDRESS, address);
values.put(RepoProvider.DataColumns.FINGERPRINT, fingerprint.toUpperCase(Locale.ENGLISH));
if (fingerprint != null && fingerprint.length() > 0) {
values.put(RepoProvider.DataColumns.FINGERPRINT, fingerprint.toUpperCase(Locale.ENGLISH));
}
RepoProvider.Helper.insert(getActivity(), values);
finishedAddingRepo();
}