Simplifying introduction of new XEP implementations, implements FS#250 and FS#251 (Privacy and Security settings), refactoring of location of some interfaces

1 files changed, 0 insertions, 421 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/services/MessageArchiveService.java b/src/main/java/de/thedevstack/conversationsplus/services/MessageArchiveService.java
deleted file mode 100644
index 6402f4ed..00000000
--- a/src/main/java/de/thedevstack/conversationsplus/services/MessageArchiveService.java
+++ /dev/null
@@ -1,421 +0,0 @@
-package de.thedevstack.conversationsplus.services;
-
-import android.util.Pair;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-
-import de.thedevstack.android.logcat.Logging;
-import de.thedevstack.conversationsplus.Config;
-import de.thedevstack.conversationsplus.ConversationsPlusApplication;
-import de.thedevstack.conversationsplus.R;
-import de.thedevstack.conversationsplus.entities.Account;
-import de.thedevstack.conversationsplus.entities.Conversation;
-import de.thedevstack.conversationsplus.generator.AbstractGenerator;
-import de.thedevstack.conversationsplus.xml.Element;
-import de.thedevstack.conversationsplus.xmpp.OnAdvancedStreamFeaturesLoaded;
-import de.thedevstack.conversationsplus.xmpp.OnIqPacketReceived;
-import de.thedevstack.conversationsplus.xmpp.jid.Jid;
-import de.thedevstack.conversationsplus.xmpp.stanzas.IqPacket;
-
-public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded {
-
-	private final XmppConnectionService mXmppConnectionService;
-
-	private final HashSet<Query> queries = new HashSet<>();
-	private final ArrayList<Query> pendingQueries = new ArrayList<>();
-
-	public enum PagingOrder {
-		NORMAL,
-		REVERSE
-	};
-
-	public MessageArchiveService(final XmppConnectionService service) {
-		this.mXmppConnectionService = service;
-	}
-
-	private void catchup(final Account account) {
-		synchronized (this.queries) {
-			for(Iterator<Query> iterator = this.queries.iterator(); iterator.hasNext();) {
-				Query query = iterator.next();
-				if (query.getAccount() == account) {
-					iterator.remove();
-				}
-			}
-		}
-		Pair<Long,String> pair = mXmppConnectionService.databaseBackend.getLastMessageReceived(account);
-		long startCatchup = pair == null ? 0 : pair.first;
-		long endCatchup = account.getXmppConnection().getLastSessionEstablished();
-		final Query query;
-		if (startCatchup == 0) {
-			return;
-		} else if (endCatchup - startCatchup >= Config.MAM_MAX_CATCHUP) {
-			startCatchup = endCatchup - Config.MAM_MAX_CATCHUP;
-			List<Conversation> conversations = mXmppConnectionService.getConversations();
-			for (Conversation conversation : conversations) {
-				if (conversation.getMode() == Conversation.MODE_SINGLE && conversation.getAccount() == account && startCatchup > conversation.getLastMessageTransmitted()) {
-					this.query(conversation,startCatchup);
-				}
-			}
-			query = new Query(account, startCatchup, endCatchup);
-		} else {
-			query = new Query(account, startCatchup, endCatchup);
-			query.reference = pair.second;
-		}
-		this.queries.add(query);
-		this.execute(query);
-	}
-
-	public void catchupMUC(final Conversation conversation) {
-		if (conversation.getLastMessageTransmitted() < 0 && conversation.countMessages() == 0) {
-			query(conversation,
-					0,
-					System.currentTimeMillis());
-		} else {
-			query(conversation,
-					conversation.getLastMessageTransmitted(),
-					System.currentTimeMillis());
-		}
-	}
-
-	public Query query(final Conversation conversation) {
-		if (conversation.getLastMessageTransmitted() < 0 && conversation.countMessages() == 0) {
-			return query(conversation,
-					0,
-					System.currentTimeMillis());
-		} else {
-			return query(conversation,
-					conversation.getLastMessageTransmitted(),
-					conversation.getAccount().getXmppConnection().getLastSessionEstablished());
-		}
-	}
-
-	public Query query(final Conversation conversation, long end) {
-		return this.query(conversation,conversation.getLastMessageTransmitted(),end);
-	}
-
-    public Query query(Conversation conversation, long start, long end) {
-       return this.query(conversation, start, end, null);
-    }
-
-    public Query query(Conversation conversation, long start, long end, XmppConnectionService.OnMoreMessagesLoaded callback) {
-        synchronized (this.queries) {
-            if (start > end) {
-                return null;
-            }
-            final Query query = new Query(conversation, start, end,PagingOrder.REVERSE);
-            query.reference = conversation.getFirstMamReference();
-            this.queries.add(query);
-            if (null != callback) {
-                query.setCallback(callback);
-            }
-            this.execute(query);
-            return query;
-        }
-    }
-
-	public void executePendingQueries(final Account account) {
-		List<Query> pending = new ArrayList<>();
-		synchronized(this.pendingQueries) {
-			for(Iterator<Query> iterator = this.pendingQueries.iterator(); iterator.hasNext();) {
-				Query query = iterator.next();
-				if (query.getAccount() == account) {
-					pending.add(query);
-					iterator.remove();
-				}
-			}
-		}
-		for(Query query : pending) {
-			this.execute(query);
-		}
-	}
-
-	private void execute(final Query query) {
-		final Account account=  query.getAccount();
-		if (account.getStatus() == Account.State.ONLINE) {
-			Logging.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": running mam query " + query.toString());
-			IqPacket packet = this.mXmppConnectionService.getIqGenerator().queryMessageArchiveManagement(query);
-			this.mXmppConnectionService.sendIqPacket(account, packet, new OnIqPacketReceived() {
-				@Override
-				public void onIqPacketReceived(Account account, IqPacket packet) {
-					if (packet.getType() == IqPacket.TYPE.TIMEOUT) {
-						synchronized (MessageArchiveService.this.queries) {
-							MessageArchiveService.this.queries.remove(query);
-							if (query.hasCallback()) {
-								query.callback();
-							}
-						}
-					} else if (packet.getType() != IqPacket.TYPE.RESULT) {
-						Logging.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": error executing mam: " + packet.toString());
-						finalizeQuery(query, true);
-					}
-				}
-			});
-		} else {
-			synchronized (this.pendingQueries) {
-				this.pendingQueries.add(query);
-			}
-		}
-	}
-
-	private void finalizeQuery(Query query, boolean done) {
-		synchronized (this.queries) {
-			this.queries.remove(query);
-		}
-		final Conversation conversation = query.getConversation();
-		if (conversation != null) {
-			conversation.sort();
-			conversation.setHasMessagesLeftOnServer(!done);
-		} else {
-			for(Conversation tmp : this.mXmppConnectionService.getConversations()) {
-				if (tmp.getAccount() == query.getAccount()) {
-					tmp.sort();
-				}
-			}
-		}
-		if (query.hasCallback()) {
-			query.callback();
-		} else {
-            if (null != conversation) {
-                conversation.setHasMessagesLeftOnServer(query.getMessageCount() > 0);
-            }
-			this.mXmppConnectionService.updateConversationUi();
-		}
-	}
-
-	public boolean queryInProgress(Conversation conversation, XmppConnectionService.OnMoreMessagesLoaded callback) {
-		synchronized (this.queries) {
-			for(Query query : queries) {
-				if (query.conversation == conversation) {
-					if (!query.hasCallback() && callback != null) {
-						query.setCallback(callback);
-					}
-					return true;
-				}
-			}
-			return false;
-		}
-	}
-
-	public boolean queryInProgress(Conversation conversation) {
-		return queryInProgress(conversation, null);
-	}
-
-	public void processFin(Element fin, Jid from) {
-		if (fin == null) {
-			return;
-		}
-		Query query = findQuery(fin.getAttribute("queryid"));
-		if (query == null || !query.validFrom(from)) {
-			return;
-		}
-		boolean complete = fin.getAttributeAsBoolean("complete");
-		Element set = fin.findChild("set","http://jabber.org/protocol/rsm");
-		Element last = set == null ? null : set.findChild("last");
-		Element first = set == null ? null : set.findChild("first");
-		Element relevant = query.getPagingOrder() == PagingOrder.NORMAL ? last : first;
-		boolean abort = (query.getStart() == 0 && query.getTotalCount() >= Config.PAGE_SIZE) || query.getTotalCount() >= Config.MAM_MAX_MESSAGES;
-		if (query.getConversation() != null) {
-			query.getConversation().setFirstMamReference(first == null ? null : first.getContent());
-		}
-		if (complete || relevant == null || abort) {
-			final boolean done = (complete || query.getMessageCount() == 0) && query.getStart() == 0;
-			this.finalizeQuery(query, done);
-			Logging.d(Config.LOGTAG,query.getAccount().getJid().toBareJid()+": finished mam after "+query.getTotalCount()+" messages. messages left="+Boolean.toString(!done));
-			if (query.getWith() == null && query.getMessageCount() > 0) {
-				mXmppConnectionService.getNotificationService().finishBacklog(true);
-			}
-		} else {
-			final Query nextQuery;
-			if (query.getPagingOrder() == PagingOrder.NORMAL) {
-				nextQuery = query.next(last == null ? null : last.getContent());
-			} else {
-				nextQuery = query.prev(first == null ? null : first.getContent());
-			}
-			this.execute(nextQuery);
-			this.finalizeQuery(query, false);
-			synchronized (this.queries) {
-				this.queries.add(nextQuery);
-			}
-		}
-	}
-
-	public Query findQuery(String id) {
-		if (id == null) {
-			return null;
-		}
-		synchronized (this.queries) {
-			for(Query query : this.queries) {
-				if (query.getQueryId().equals(id)) {
-					return query;
-				}
-			}
-			return null;
-		}
-	}
-
-	@Override
-	public void onAdvancedStreamFeaturesAvailable(Account account) {
-		if (account.getXmppConnection() != null && account.getXmppConnection().getFeatures().mam()) {
-			this.catchup(account);
-		}
-	}
-
-	public class Query {
-		private int totalCount = 0;
-		private int messageCount = 0;
-		private long start;
-		private long end;
-		private String queryId;
-		private String reference = null;
-		private Account account;
-		private Conversation conversation;
-		private PagingOrder pagingOrder = PagingOrder.NORMAL;
-		private XmppConnectionService.OnMoreMessagesLoaded callback = null;
-
-
-		public Query(Conversation conversation, long start, long end) {
-			this(conversation.getAccount(), start, end);
-			this.conversation = conversation;
-		}
-
-		public Query(Conversation conversation, long start, long end, PagingOrder order) {
-			this(conversation,start,end);
-			this.pagingOrder = order;
-		}
-
-		public Query(Account account, long start, long end) {
-			this.account = account;
-			this.start = start;
-			this.end = end;
-			this.queryId = new BigInteger(50, ConversationsPlusApplication.getSecureRandom()).toString(32);
-		}
-		
-		private Query page(String reference) {
-			Query query = new Query(this.account,this.start,this.end);
-			query.reference = reference;
-			query.conversation = conversation;
-			query.totalCount = totalCount;
-			query.callback = callback;
-			return query;
-		}
-
-		public Query next(String reference) {
-			Query query = page(reference);
-			query.pagingOrder = PagingOrder.NORMAL;
-			return query;
-		}
-
-		public Query prev(String reference) {
-			Query query = page(reference);
-			query.pagingOrder = PagingOrder.REVERSE;
-			return query;
-		}
-
-		public String getReference() {
-			return reference;
-		}
-
-		public PagingOrder getPagingOrder() {
-			return this.pagingOrder;
-		}
-
-		public String getQueryId() {
-			return queryId;
-		}
-
-		public Jid getWith() {
-			return conversation == null ? null : conversation.getJid().toBareJid();
-		}
-
-		public boolean muc() {
-			return conversation != null && conversation.getMode() == Conversation.MODE_MULTI;
-		}
-
-		public long getStart() {
-			return start;
-		}
-
-		public void setCallback(XmppConnectionService.OnMoreMessagesLoaded callback) {
-			this.callback = callback;
-		}
-
-		public void callback() {
-			if (this.callback != null) {
-				this.callback.onMoreMessagesLoaded(messageCount,conversation);
-				if (messageCount <= 0) {
-					this.callback.informUser(R.string.no_more_history_on_server);
-				}
-			}
-		}
-
-		public long getEnd() {
-			return end;
-		}
-
-		public Conversation getConversation() {
-			return conversation;
-		}
-
-		public Account getAccount() {
-			return this.account;
-		}
-
-		public void incrementMessageCount() {
-			this.messageCount++;
-			this.totalCount++;
-		}
-
-		public int getTotalCount() {
-			return this.totalCount;
-		}
-
-		public int getMessageCount() {
-			return this.messageCount;
-		}
-
-		public boolean validFrom(Jid from) {
-			if (muc()) {
-				return getWith().equals(from);
-			} else {
-				return (from == null) || account.getJid().toBareJid().equals(from.toBareJid());
-			}
-		}
-
-		@Override
-		public String toString() {
-			StringBuilder builder = new StringBuilder();
-			if (this.muc()) {
-				builder.append("to=");
-				builder.append(this.getWith().toString());
-			} else {
-				builder.append("with=");
-				if (this.getWith() == null) {
-					builder.append("*");
-				} else {
-					builder.append(getWith().toString());
-				}
-			}
-			builder.append(", start=");
-			builder.append(AbstractGenerator.getTimestamp(this.start));
-			builder.append(", end=");
-			builder.append(AbstractGenerator.getTimestamp(this.end));
-			if (this.reference!=null) {
-				if (this.pagingOrder == PagingOrder.NORMAL) {
-					builder.append(", after=");
-				} else {
-					builder.append(", before=");
-				}
-				builder.append(this.reference);
-			}
-			return builder.toString();
-		}
-
-		public boolean hasCallback() {
-			return this.callback != null;
-		}
-	}
-}