moparisthebest
/
Conversations
mirror of https://github.com/moparisthebest/Conversations
1
0
Fork 0
Code Issues Releases Wiki Activity

add null pointer check to db migration

This commit is contained in:
Daniel Gultsch 2015-09-05 18:47:37 +02:00
parent e2d506c96a
commit 2c4a6b0912
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
View File

@ -312,7 +312,11 @@ public class DatabaseBackend extends SQLiteOpenHelper {
AxolotlAddress ownAddress = new AxolotlAddress(account.getJid().toBareJid().toString(), ownDeviceId);
deleteSession(db, account, ownAddress);
IdentityKeyPair identityKeyPair = loadOwnIdentityKeyPair(db, account);
setIdentityKeyTrust(db, account, identityKeyPair.getPublicKey().getFingerprint().replaceAll("\\s", ""), XmppAxolotlSession.Trust.TRUSTED );
if (identityKeyPair != null) {
setIdentityKeyTrust(db, account, identityKeyPair.getPublicKey().getFingerprint().replaceAll("\\s", ""), XmppAxolotlSession.Trust.TRUSTED);
} else {
Log.d(Config.LOGTAG,account.getJid().toBareJid()+": could not load own identity key pair");
}
}
}
}