narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

avoid very rare npe

Browse source
This commit is contained in:
Daniel Gultsch 2015-07-03 21:32:46 +02:00
parent 1c86098f3b
commit d30fb6f0a1
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/eu/siacs/conversations/entities/Roster.java
View file

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

3
src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
View file

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