TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-04-07 07:14:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

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() { public void unbind() {
this.recipients.removeListener(this); if (this.recipients != null)
this.recipients.removeListener(this);
} }
private void initializeContactWidgetVisibility() { private void initializeContactWidgetVisibility() {

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

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