avoid very rare npe

Daniel Gultsch created 10 years ago

Change summary

src/main/java/eu/siacs/conversations/entities/Roster.java             | 3 
src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java | 3 
2 files changed, 4 insertions(+), 2 deletions(-)

Detailed changes

src/main/java/eu/siacs/conversations/entities/Roster.java

@@ -74,6 +74,9 @@ public class Roster {
 	}
 
 	public void initContact(final Contact contact) {
+		if (contact == null) {
+			return;
+		}
 		contact.setAccount(account);
 		contact.setOption(Contact.Options.IN_ROSTER);
 		synchronized (this.contacts) {

src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java

@@ -386,8 +386,7 @@ public class DatabaseBackend extends SQLiteOpenHelper {
 		SQLiteDatabase db = this.getReadableDatabase();
 		Cursor cursor;
 		String args[] = { roster.getAccount().getUuid() };
-		cursor = db.query(Contact.TABLENAME, null, Contact.ACCOUNT + "=?",
-				args, null, null, null);
+		cursor = db.query(Contact.TABLENAME, null, Contact.ACCOUNT + "=?", args, null, null, null);
 		while (cursor.moveToNext()) {
 			roster.initContact(Contact.fromCursor(cursor));
 		}