Removed useless 'button-message' to load more messages. Implementation already done with a more convenient method

5 files changed, 8 insertions, 68 deletions

diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index 4eea56b8..a99491ae 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -307,14 +307,6 @@ public class Conversation extends AbstractEntity implements Blockable {
 		return this.mFirstMamReference;
 	}
 
-	public void setLastClearHistory(long time) {
-		setAttribute("last_clear_history",String.valueOf(time));
-	}
-
-	public long getLastClearHistory() {
-		return getLongAttribute("last_clear_history", 0);
-	}
-
 	public void setCorrectingMessage(Message correctingMessage) {
 		this.correctingMessage = correctingMessage;
 	}
@@ -760,10 +752,6 @@ public class Conversation extends AbstractEntity implements Blockable {
 	}
 
 	public long getLastMessageTransmitted() {
-		long last_clear = getLastClearHistory();
-		if (last_clear != 0) {
-			return last_clear;
-		}
 		synchronized (this.messages) {
 			for(int i = this.messages.size() - 1; i >= 0; --i) {
 				Message message = this.messages.get(i);
diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index 3f923c41..a926f9a9 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -183,14 +183,6 @@ public class Message extends AbstractEntity {
 		return message;
 	}
 
-	public static Message createLoadMoreMessage(Conversation conversation) {
-		final Message message = new Message();
-		message.setType(Message.TYPE_STATUS);
-		message.setConversation(conversation);
-		message.setBody("LOAD_MORE");
-		return message;
-	}
-
 	@Override
 	public ContentValues getContentValues() {
 		ContentValues values = new ContentValues();
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 4c9cac69..9fee1478 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -1240,8 +1240,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 					checkDeletedFiles(conversation);
 					callback.onMoreMessagesLoaded(messages.size(), conversation);
 				} else if (conversation.hasMessagesLeftOnServer()
-						&& account.isOnlineAndConnected()
-						&& conversation.getLastClearHistory() == 0) {
+						&& account.isOnlineAndConnected()) {
                         Logging.d("mam", "mam activate, account online and connected and messages left on server");
 					if ((conversation.getMode() == Conversation.MODE_SINGLE && account.getXmppConnection().getFeatures().mam())
 							|| (conversation.getMode() == Conversation.MODE_MULTI && conversation.getMucOptions().mamSupport())) {
@@ -2734,7 +2733,6 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
          * Therefore set this flag to true and try to get messages from server
          */
 		conversation.setHasMessagesLeftOnServer(true);
-		conversation.setLastClearHistory(System.currentTimeMillis());
 		Runnable runnable = new Runnable() {
 			@Override
 			public void run() {
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 4e045fea..9b49ea4d 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -1083,9 +1083,6 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 
 	public void updateStatusMessages() {
 		synchronized (this.messageList) {
-			if (showLoadMoreMessages(conversation)) {
-				this.messageList.add(0, Message.createLoadMoreMessage(conversation));
-			}
 			if (conversation.getMode() == Conversation.MODE_SINGLE) {
 				ChatState state = conversation.getIncomingChatState();
 				if (state == ChatState.COMPOSING) {
@@ -1109,13 +1106,6 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 		}
 	}
 
-	private boolean showLoadMoreMessages(final Conversation c) {
-		final XmppConnection connection = c.getAccount().getXmppConnection();
-		final boolean mam = connection != null && connection.getFeatures().mam();
-		final MessageArchiveService service = activity.xmppConnectionService.getMessageArchiveService();
-		return mam && (c.getLastClearHistory() != 0  || (c.countMessages() == 0 && c.hasMessagesLeftOnServer()  && !service.queryInProgress(c)));
-	}
-
 	protected void showSnackbar(final int message, final int action, final OnClickListener clickListener) {
 		snackbar.setVisibility(View.VISIBLE);
 		snackbar.setOnClickListener(null);
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index 8d8ea322..62caaa2d 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -441,19 +441,6 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 		viewHolder.image.setOnLongClickListener(openContextMenu);
 	}
 
-	private void loadMoreMessages(Conversation conversation) {
-		conversation.setLastClearHistory(0);
-		conversation.setHasMessagesLeftOnServer(true);
-		conversation.setFirstMamReference(null);
-		long timestamp = conversation.getLastMessageTransmitted();
-		if (timestamp == 0) {
-			timestamp = System.currentTimeMillis();
-		}
-		activity.setMessagesLoaded();
-		activity.xmppConnectionService.getMessageArchiveService().query(conversation, 0, timestamp);
-		Toast.makeText(activity, R.string.fetching_history_from_server,Toast.LENGTH_LONG).show();
-	}
-
 	@Override
 	public View getView(int position, View view, ViewGroup parent) {
 		final Message message = getItem(position);
@@ -512,7 +499,6 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 					view = activity.getLayoutInflater().inflate(R.layout.message_status, parent, false);
 					viewHolder.contact_picture = (ImageView) view.findViewById(R.id.message_photo);
 					viewHolder.status_message = (TextView) view.findViewById(R.id.status_message);
-					viewHolder.load_more_messages = (Button) view.findViewById(R.id.load_more_messages);
 					break;
 				default:
 					viewHolder = null;
@@ -529,27 +515,14 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 		boolean darkBackground = (type == RECEIVED && !isInValidSession);
 
 		if (type == STATUS) {
-			if ("LOAD_MORE".equals(message.getBody())) {
-				viewHolder.status_message.setVisibility(View.GONE);
-				viewHolder.contact_picture.setVisibility(View.GONE);
-				viewHolder.load_more_messages.setVisibility(View.VISIBLE);
-				viewHolder.load_more_messages.setOnClickListener(new OnClickListener() {
-					@Override
-					public void onClick(View v) {
-						loadMoreMessages(message.getConversation());
-					}
-				});
-			} else {
-				viewHolder.status_message.setVisibility(View.VISIBLE);
-				viewHolder.contact_picture.setVisibility(View.VISIBLE);
-				viewHolder.load_more_messages.setVisibility(View.GONE);
-				if (conversation.getMode() == Conversation.MODE_SINGLE) {
-				viewHolder.contact_picture.setImageBitmap(AvatarService.getInstance().get(conversation.getContact(),
-							activity.getPixel(32)));
-					viewHolder.contact_picture.setAlpha(0.5f);
-				}
-				viewHolder.status_message.setText(message.getBody());
+			viewHolder.status_message.setVisibility(View.VISIBLE);
+			viewHolder.contact_picture.setVisibility(View.VISIBLE);
+			if (conversation.getMode() == Conversation.MODE_SINGLE) {
+			viewHolder.contact_picture.setImageBitmap(AvatarService.getInstance().get(conversation.getContact(),
+						activity.getPixel(32)));
+				viewHolder.contact_picture.setAlpha(0.5f);
 			}
+			viewHolder.status_message.setText(message.getBody());
 			return view;
 		} else {
 			loadAvatar(message, viewHolder.contact_picture);
@@ -702,7 +675,6 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 		protected ImageView contact_picture;
 		protected TextView status_message;
 		protected TextView encryption;
-		public Button load_more_messages;
 		public ImageView edit_indicator;
 	}