diff options
author | iNPUTmice <daniel@gultsch.de> | 2014-06-20 17:30:19 +0200 |
---|---|---|
committer | iNPUTmice <daniel@gultsch.de> | 2014-06-20 17:30:19 +0200 |
commit | 1cf055d2fdbaa881cfc8ead6b78dc744e9dbe596 (patch) | |
tree | 51c0a3463ff3d5f005aeb6dccf6c50d05fddab42 /src/eu/siacs/conversations/ui/ConversationActivity.java | |
parent | beafb06b6a59649a4c314db820f5ce30be120e7c (diff) |
not working version of otr file transfer
Diffstat (limited to '')
-rw-r--r-- | src/eu/siacs/conversations/ui/ConversationActivity.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/eu/siacs/conversations/ui/ConversationActivity.java b/src/eu/siacs/conversations/ui/ConversationActivity.java index 59c8fc4ff..4e264df74 100644 --- a/src/eu/siacs/conversations/ui/ConversationActivity.java +++ b/src/eu/siacs/conversations/ui/ConversationActivity.java @@ -418,7 +418,8 @@ public class ConversationActivity extends XmppActivity { } else if (getSelectedConversation().getNextEncryption() == Message.ENCRYPTION_NONE) { selectPresenceToAttachFile(attachmentChoice); } else { - AlertDialog.Builder builder = new AlertDialog.Builder(this); + selectPresenceToAttachFile(attachmentChoice); + /*AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setTitle(getString(R.string.otr_file_transfer)); builder.setMessage(getString(R.string.otr_file_transfer_msg)); builder.setNegativeButton(getString(R.string.cancel), null); @@ -448,7 +449,7 @@ public class ConversationActivity extends XmppActivity { } }); } - builder.create().show(); + builder.create().show();*/ } } |