sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

possible null pointer fix

This commit is contained in:
Daniel Gultsch 2014-03-09 03:33:32 +01:00
parent a8dd6794f3
commit d543d377b7
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/eu/siacs/conversations/ui/ConversationFragment.java
View File

@ -604,10 +604,12 @@ public class ConversationFragment extends Fragment {
if (params[i].getEncryption() == Message.ENCRYPTION_PGP) { if (params[i].getEncryption() == Message.ENCRYPTION_PGP) {
String body = params[i].getBody(); String body = params[i].getBody();
String decrypted = null; String decrypted = null;
if (activity==null) {
return false;
} else if (!activity.xmppConnectionServiceBound) {
return false;
}
try { try {
if (activity==null) {
return false;
}
Log.d("gultsch","calling to decrypt message id #"+params[i].getUuid()); Log.d("gultsch","calling to decrypt message id #"+params[i].getUuid());
decrypted = activity.xmppConnectionService.getPgpEngine().decrypt(body); decrypted = activity.xmppConnectionService.getPgpEngine().decrypt(body);
} catch (UserInputRequiredException e) { } catch (UserInputRequiredException e) {