1 files changed, 36 insertions, 3 deletions

diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 36d6cd49..b165ede4 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -49,6 +49,7 @@ import java.util.Map;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 import de.duenndns.ssl.MemorizingTrustManager;
+import de.tzur.conversations.Settings;
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.crypto.PgpEngine;
@@ -579,6 +580,25 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		return activeNetwork != null && activeNetwork.isConnected();
 	}
 
+    /**
+     * check whether we are allowed to download at the moment
+     */
+    public boolean isDownloadAllowedInConnection() {
+        if (Settings.DOWNLOAD_ONLY_WLAN) {
+            return isWifiConnected();
+        }
+        return true;
+    }
+
+    /**
+     * check whether wifi is connected
+     */
+    public boolean isWifiConnected() {
+        ConnectivityManager cm = (ConnectivityManager) getApplicationContext().getSystemService(Context.CONNECTIVITY_SERVICE);
+        NetworkInfo niWifi = cm.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
+        return niWifi.isConnected();
+    }
+
 	@SuppressLint("TrulyRandom")
 	@Override
 	public void onCreate() {
@@ -1069,6 +1089,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	public void loadMoreMessages(final Conversation conversation, final long timestamp, final OnMoreMessagesLoaded callback) {
 		Log.d(Config.LOGTAG, "load more messages for " + conversation.getName() + " prior to " + MessageGenerator.getTimestamp(timestamp));
 		if (XmppConnectionService.this.getMessageArchiveService().queryInProgress(conversation,callback)) {
+            Log.d("mam", "Query in progress");
 			return;
 		}
 		Runnable runnable = new Runnable() {
@@ -1076,19 +1097,26 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 			public void run() {
 				final Account account = conversation.getAccount();
 				List<Message> messages = databaseBackend.getMessages(conversation, 50,timestamp);
+                Log.d("mam", "runnable load more messages");
 				if (messages.size() > 0) {
+                    Log.d("mam", "At least one message");
 					conversation.addAll(0, messages);
 					checkDeletedFiles(conversation);
 					callback.onMoreMessagesLoaded(messages.size(), conversation);
 				} else if (conversation.hasMessagesLeftOnServer()
 						&& account.isOnlineAndConnected()
 						&& account.getXmppConnection().getFeatures().mam()) {
+                    Log.d("mam", "mam activate, account online and connected and messages left on server");
 					MessageArchiveService.Query query = getMessageArchiveService().query(conversation,0,timestamp - 1);
 					if (query != null) {
 						query.setCallback(callback);
 					}
 					callback.informUser(R.string.fetching_history_from_server);
-				}
+				} else {
+                    Log.d("mam", ((!conversation.hasMessagesLeftOnServer()) ? "no" : "") + " more messages left on server, mam " + ((account.getXmppConnection().getFeatures().mam()) ? "" : "not") + " activated, account is " + ((account.isOnlineAndConnected()) ? "" : "not") + " online or connected)");
+                    callback.onMoreMessagesLoaded(0, conversation);
+                    callback.informUser(R.string.no_more_history_on_server);
+                }
 			}
 		};
 		mDatabaseExecutor.execute(runnable);
@@ -2371,7 +2399,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	public void sendReadMarker(final Conversation conversation) {
 		final Message markable = conversation.getLatestMarkableMessage();
 		this.markRead(conversation);
-		if (confirmMessages() && markable != null && markable.getRemoteMsgId() != null) {
+		if (Settings.CONFIRM_MESSAGE_READ && markable != null && markable.getRemoteMsgId() != null) {
 			Log.d(Config.LOGTAG, conversation.getAccount().getJid().toBareJid() + ": sending read marker to " + markable.getCounterpart().toString());
 			Account account = conversation.getAccount();
 			final Jid to = markable.getCounterpart();
@@ -2549,7 +2577,12 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 
 	public void clearConversationHistory(final Conversation conversation) {
 		conversation.clearMessages();
-		conversation.setHasMessagesLeftOnServer(false); //avoid messages getting loaded through mam
+        /*
+         * In case the history was loaded completely before.
+         * The flag "hasMessagesLeftOnServer" is set to false and no messages will be loaded anymore
+         * Therefore set this flag to true and try to get messages from server
+         */
+		conversation.setHasMessagesLeftOnServer(true);
 		new Thread(new Runnable() {
 			@Override
 			public void run() {