From 9aefffa3de29f8f191be223c9634d88c26a98679 Mon Sep 17 00:00:00 2001 From: Margaux Clerc Date: Mon, 9 Feb 2015 12:38:22 +0100 Subject: [PATCH] Fix bug with draft --- src/org/linphone/ChatActivity.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/org/linphone/ChatActivity.java b/src/org/linphone/ChatActivity.java index 550fb7dec..1a4c7082d 100644 --- a/src/org/linphone/ChatActivity.java +++ b/src/org/linphone/ChatActivity.java @@ -558,7 +558,7 @@ public class ChatActivity extends FragmentActivity implements OnClickListener, S lc.removeListener(mListener); } - getIntent().putExtra("MessageDraft", message.getText()); + getIntent().putExtra("messageDraft", message.getText().toString()); super.onPause(); } @@ -569,12 +569,8 @@ public class ChatActivity extends FragmentActivity implements OnClickListener, S message.addTextChangedListener(textWatcher); addVirtualKeyboardVisiblityListener(); - super.onResume(); - LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull(); - - - + if (lc != null) { lc.addListener(mListener); } @@ -586,12 +582,14 @@ public class ChatActivity extends FragmentActivity implements OnClickListener, S } } - String draft = getIntent().getStringExtra("messageDraft"); + String draft = getIntent().getExtras().getString("messageDraft"); message.setText(draft); remoteComposing.setVisibility(chatRoom.isRemoteComposing() ? View.VISIBLE : View.GONE); displayMessages(); + + super.onResume(); } @Override