empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix NPEs

Browse source
This commit is contained in:
Moxie Marlinspike 2013-06-25 13:20:29 -07:00
parent e00914c977
commit 288b416988
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/org/thoughtcrime/securesms/ConversationListItem.java
View file

@ -113,7 +113,8 @@ public class ConversationListItem extends RelativeLayout
}
public void unbind() {
this.recipients.removeListener(this);
if (this.recipients != null)
this.recipients.removeListener(this);
}
private void initializeContactWidgetVisibility() {

6
src/org/thoughtcrime/securesms/crypto/KeyExchangeProcessor.java
View file

@ -111,8 +111,10 @@ public class KeyExchangeProcessor {
sessionRecord.save();
DatabaseFactory.getIdentityDatabase(context)
.saveIdentity(masterSecret, recipient, message.getIdentityKey());
if (message.hasIdentityKey()) {
DatabaseFactory.getIdentityDatabase(context)
.saveIdentity(masterSecret, recipient, message.getIdentityKey());
}
DecryptingQueue.scheduleRogueMessages(context, masterSecret, recipient);