Merge branch 'trz/rename' into trz/rebase

4 files changed, 7 insertions, 1 deletions

diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index 073cc849..89d84cb2 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -52,6 +52,7 @@ public class MessageParser extends AbstractParser implements
 			if (from.toBareJid().equals(account.getJid().toBareJid())) {
 				conversation.setOutgoingChatState(state);
 				if (state == ChatState.ACTIVE || state == ChatState.COMPOSING) {
+					Logging.d("markRead", "MessageParser.extractChatState (" + conversation.getName() + ")");
 					mXmppConnectionService.markRead(conversation);
 					account.activateGracePeriod();
 				}
@@ -427,6 +428,7 @@ public class MessageParser extends AbstractParser implements
 
 			if (query == null || query.getWith() == null) { //either no mam or catchup
 				if (status == Message.STATUS_SEND || status == Message.STATUS_SEND_RECEIVED) {
+					Logging.d("markRead", "MessageParser.onMessagePacketReceived1 (" + conversation.getName() + ")");
 					mXmppConnectionService.markRead(conversation);
 					if (query == null) {
 						account.activateGracePeriod();
@@ -515,6 +517,7 @@ public class MessageParser extends AbstractParser implements
 			if (packet.fromAccount(account)) {
 				Conversation conversation = mXmppConnectionService.find(account,counterpart.toBareJid());
 				if (conversation != null) {
+					Logging.d("markRead", "MessageParser.onMessagePacketReceived2 (" + conversation.getName() + ")");
 					mXmppConnectionService.markRead(conversation);
 				}
 			} else {
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 1f537172..f6ab7b72 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -2574,6 +2574,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 
 	public void sendReadMarker(final Conversation conversation) {
 		final Message markable = conversation.getLatestMarkableMessage();
+		Logging.d("markRead", "XmppConnectionService.sendReadMarker (" + conversation.getName() + ")");
 		if (this.markRead(conversation)) {
 			updateConversationUi();
 		}
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
index 175df041..02a9cb0f 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
@@ -43,6 +43,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
 import de.thedevstack.conversationsplus.ui.dialogs.UserDecisionDialog;
 import de.thedevstack.conversationsplus.ui.listeners.ResizePictureUserDecisionListener;
@@ -229,6 +230,7 @@ public class ConversationActivity extends XmppActivity
 					return null;
 				}
 				listAdapter.remove(swipedConversation);
+				Logging.d("markRead", "EnhancedListView.OnDismissCallback.onDismiss (" + swipedConversation.getName() + ")");
 				xmppConnectionService.markRead(swipedConversation);
 
 				final boolean formerlySelected = (getSelectedConversation() == swipedConversation);
diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index dd102177..4145afb8 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -49,7 +49,7 @@
             android:ems="10"
             android:imeOptions="flagNoExtractUi|actionSend"
             android:inputType="textShortMessage|textMultiLine|textCapSentences"
-            android:minHeight="48dp"
+            android:minHeight="56dp"
             android:minLines="1"
             android:paddingBottom="12dp"
             android:paddingLeft="8dp"