arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2025-01-11 00:01:12 +00:00
Code Issues Releases Wiki Activity

avoid NullPointerException (hint from ANR)

Browse Source
This commit is contained in:
rfc2822 2013-11-09 10:54:29 +01:00
parent ab517bd87d
commit 477a3c89f7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/at/bitfire/davdroid/resource/LocalCollection.java
View File

@ -73,7 +73,7 @@ public abstract class LocalCollection<ResourceType extends Resource> {
new String[] { entryColumnID(), entryColumnRemoteName(), entryColumnETag() }, new String[] { entryColumnID(), entryColumnRemoteName(), entryColumnETag() },
where, null, null); where, null, null);
LinkedList<Resource> dirty = new LinkedList<Resource>(); LinkedList<Resource> dirty = new LinkedList<Resource>();
while (cursor.moveToNext()) while (cursor != null && cursor.moveToNext())
dirty.add(findById(cursor.getLong(0), cursor.getString(1), cursor.getString(2), true)); dirty.add(findById(cursor.getLong(0), cursor.getString(1), cursor.getString(2), true));
return dirty.toArray(new Resource[0]); return dirty.toArray(new Resource[0]);
} }
@ -86,7 +86,7 @@ public abstract class LocalCollection<ResourceType extends Resource> {
new String[] { entryColumnID(), entryColumnRemoteName(), entryColumnETag() }, new String[] { entryColumnID(), entryColumnRemoteName(), entryColumnETag() },
where, null, null); where, null, null);
LinkedList<Resource> deleted = new LinkedList<Resource>(); LinkedList<Resource> deleted = new LinkedList<Resource>();
while (cursor.moveToNext()) while (cursor != null && cursor.moveToNext())
deleted.add(findById(cursor.getLong(0), cursor.getString(1), cursor.getString(2), false)); deleted.add(findById(cursor.getLong(0), cursor.getString(1), cursor.getString(2), false));
return deleted.toArray(new Resource[0]); return deleted.toArray(new Resource[0]);
} }
@ -99,7 +99,7 @@ public abstract class LocalCollection<ResourceType extends Resource> {
new String[] { entryColumnID() }, new String[] { entryColumnID() },
where, null, null); where, null, null);
LinkedList<Resource> fresh = new LinkedList<Resource>(); LinkedList<Resource> fresh = new LinkedList<Resource>();
while (cursor.moveToNext()) { while (cursor != null && cursor.moveToNext()) {
String uid = UUID.randomUUID().toString(), String uid = UUID.randomUUID().toString(),
resourceName = uid + fileExtension(); resourceName = uid + fileExtension();
Resource resource = findById(cursor.getLong(0), resourceName, null, true); //new Event(cursor.getLong(0), resourceName, null); Resource resource = findById(cursor.getLong(0), resourceName, null, true); //new Event(cursor.getLong(0), resourceName, null);