only dismiss sent message after encryption
This commit is contained in:
parent
2049593bfa
commit
018ee63ef4
2 changed files with 16 additions and 9 deletions
src/main/java/eu/siacs/conversations/ui
|
@ -1752,21 +1752,30 @@ public class ConversationActivity extends XmppActivity
|
|||
new UiCallback<Message>() {
|
||||
|
||||
@Override
|
||||
public void userInputRequried(PendingIntent pi,
|
||||
Message message) {
|
||||
ConversationActivity.this.runIntent(pi,
|
||||
ConversationActivity.REQUEST_SEND_MESSAGE);
|
||||
public void userInputRequried(PendingIntent pi,Message message) {
|
||||
ConversationActivity.this.runIntent(pi,ConversationActivity.REQUEST_SEND_MESSAGE);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void success(Message message) {
|
||||
message.setEncryption(Message.ENCRYPTION_DECRYPTED);
|
||||
xmppConnectionService.sendMessage(message);
|
||||
if (mConversationFragment != null) {
|
||||
mConversationFragment.messageSent();
|
||||
}
|
||||
}
|
||||
|
||||
@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();
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
|
@ -927,7 +927,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
|
|||
}
|
||||
}
|
||||
|
||||
private void messageSent() {
|
||||
protected void messageSent() {
|
||||
mEditMessage.setText("");
|
||||
updateChatMsgHint();
|
||||
new Handler().post(new Runnable() {
|
||||
|
@ -1183,7 +1183,6 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
|
|||
|
||||
@Override
|
||||
public void success(Contact contact) {
|
||||
messageSent();
|
||||
activity.encryptTextMessage(message);
|
||||
}
|
||||
|
||||
|
@ -1221,7 +1220,6 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
|
|||
warning.show();
|
||||
}
|
||||
activity.encryptTextMessage(message);
|
||||
messageSent();
|
||||
} else {
|
||||
showNoPGPKeyDialog(true,
|
||||
new DialogInterface.OnClickListener() {
|
||||
|
|
Reference in a new issue