narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

only dismiss sent message after encryption

Browse source
This commit is contained in:
Daniel Gultsch 2016-06-15 13:53:34 +02:00
parent cb5393c32f
commit 5f4471a45e
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
View file

@ -1542,21 +1542,30 @@ public class ConversationActivity extends XmppActivity
new UiCallback<Message>() { new UiCallback<Message>() {
@Override @Override
public void userInputRequried(PendingIntent pi, public void userInputRequried(PendingIntent pi,Message message) {
Message message) { ConversationActivity.this.runIntent(pi,ConversationActivity.REQUEST_SEND_MESSAGE);
ConversationActivity.this.runIntent(pi,
ConversationActivity.REQUEST_SEND_MESSAGE);
} }
@Override @Override
public void success(Message message) { public void success(Message message) {
message.setEncryption(Message.ENCRYPTION_DECRYPTED); message.setEncryption(Message.ENCRYPTION_DECRYPTED);
xmppConnectionService.sendMessage(message); xmppConnectionService.sendMessage(message);
if (mConversationFragment != null) {
mConversationFragment.messageSent();
}
} }
@Override @Override
public void error(int error, Message message) { public void error(final int error, Message message) {
runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(ConversationActivity.this,
R.string.unable_to_connect_to_keychain,
Toast.LENGTH_SHORT
).show();
}
});
} }
}); });
} }

4
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
View file

@ -916,7 +916,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
} }
} }
private void messageSent() { protected void messageSent() {
mEditMessage.setText(""); mEditMessage.setText("");
updateChatMsgHint(); updateChatMsgHint();
new Handler().post(new Runnable() { new Handler().post(new Runnable() {
@ -1172,7 +1172,6 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
@Override @Override
public void success(Contact contact) { public void success(Contact contact) {
messageSent();
activity.encryptTextMessage(message); activity.encryptTextMessage(message);
} }
@ -1210,7 +1209,6 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
warning.show(); warning.show();
} }
activity.encryptTextMessage(message); activity.encryptTextMessage(message);
messageSent();
} else { } else {
showNoPGPKeyDialog(true, showNoPGPKeyDialog(true,
new DialogInterface.OnClickListener() { new DialogInterface.OnClickListener() {