render 'read up to this point' in 1:1 when followed by date bubble
fixes #3237
This commit is contained in:
		
							parent
							
								
									995f95ce99
								
							
						
					
					
						commit
						2edab21423
					
				| @ -2296,13 +2296,16 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke | ||||
|                     this.messageList.add(Message.createStatusMessage(conversation, getString(R.string.contact_has_stopped_typing, conversation.getName()))); | ||||
|                 } else { | ||||
|                     for (int i = this.messageList.size() - 1; i >= 0; --i) { | ||||
|                         if (this.messageList.get(i).getStatus() == Message.STATUS_RECEIVED) { | ||||
|                             return; | ||||
|                         } else { | ||||
|                             if (this.messageList.get(i).getStatus() == Message.STATUS_SEND_DISPLAYED) { | ||||
|                                 this.messageList.add(i + 1, | ||||
|                                         Message.createStatusMessage(conversation, getString(R.string.contact_has_read_up_to_this_point, conversation.getName()))); | ||||
|                         final Message message = this.messageList.get(i); | ||||
|                         if (message.getType() != Message.TYPE_STATUS) { | ||||
|                             if (message.getStatus() == Message.STATUS_RECEIVED) { | ||||
|                                 return; | ||||
|                             } else { | ||||
|                                 if (message.getStatus() == Message.STATUS_SEND_DISPLAYED) { | ||||
|                                     this.messageList.add(i + 1, | ||||
|                                             Message.createStatusMessage(conversation, getString(R.string.contact_has_read_up_to_this_point, conversation.getName()))); | ||||
|                                     return; | ||||
|                                 } | ||||
|                             } | ||||
|                         } | ||||
|                     } | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 Daniel Gultsch
						Daniel Gultsch