Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase

6 files changed, 19 insertions, 13 deletions

diff --git a/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java b/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java
index f393264c..5baf836e 100644
--- a/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java
+++ b/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java
@@ -13,6 +13,7 @@ import org.openintents.openpgp.OpenPgpSignatureResult;
 import org.openintents.openpgp.util.OpenPgpApi;
 import org.openintents.openpgp.util.OpenPgpApi.IOpenPgpCallback;
 
+import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
 import de.tzur.conversations.Settings;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.entities.Account;
@@ -61,9 +62,9 @@ public class PgpEngine {
 								final HttpConnectionManager manager = mXmppConnectionService.getHttpConnectionManager();
 								if (message.trusted()
 										&& message.treatAsDownloadable() != Message.Decision.NEVER
-                                        && Settings.DOWNLOAD_IMAGE_LINKS
+                                        && ConversationsPlusPreferences.autoDownloadFileLink()
                                         && mXmppConnectionService.isDownloadAllowedInConnection()
-										&& manager.getAutoAcceptFileSize() > 0) {
+										&& ConversationsPlusPreferences.autoAcceptFileSize() > 0) {
 									manager.createNewDownloadConnection(message);
 								}
 								callback.success(message);
diff --git a/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java b/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
index 45f1e965..94a76837 100644
--- a/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
+++ b/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
@@ -16,6 +16,7 @@ import java.util.Arrays;
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLHandshakeException;
 
+import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.entities.Transferable;
@@ -150,7 +151,7 @@ public class HttpDownloadConnection implements Transferable {
 				return;
 			}
 			file.setExpectedSize(size);
-			if (size != -1 && size <= mHttpConnectionManager.getAutoAcceptFileSize()) {
+			if (size != -1 && size <= ConversationsPlusPreferences.autoAcceptFileSize()) {
 				HttpDownloadConnection.this.acceptedAutomatically = true;
 				new Thread(new FileDownloader(interactive)).start();
 			} else {
diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index 91d22487..f2f0898e 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -7,6 +7,7 @@ import net.java.otr4j.session.Session;
 import net.java.otr4j.session.SessionStatus;
 
 import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
+import de.tzur.conversations.Settings;
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.entities.Contact;
@@ -368,7 +369,11 @@ public class MessageParser extends AbstractParser implements
 				mXmppConnectionService.databaseBackend.createMessage(message);
 			}
 			final HttpConnectionManager manager = this.mXmppConnectionService.getHttpConnectionManager();
-			if (message.trusted() && message.treatAsDownloadable() != Message.Decision.NEVER && manager.getAutoAcceptFileSize() > 0) {
+			if (message.trusted()
+                    && message.treatAsDownloadable() != Message.Decision.NEVER
+                    && ConversationsPlusPreferences.autoAcceptFileSize() > 0
+                    && ConversationsPlusPreferences.autoDownloadFileLink()
+                    && mXmppConnectionService.isDownloadAllowedInConnection()) {
 				manager.createNewDownloadConnection(message);
 			} else if (!message.isRead()) {
 				mXmppConnectionService.getNotificationService().push(message);
diff --git a/src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java b/src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java
index 297c7c67..2dcd858f 100644
--- a/src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java
+++ b/src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java
@@ -12,8 +12,4 @@ public class AbstractConnectionManager {
 	public XmppConnectionService getXmppConnectionService() {
 		return this.mXmppConnectionService;
 	}
-
-	public long getAutoAcceptFileSize() {
-		return ConversationsPlusPreferences.autoAcceptFileSize();
-	}
 }
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index e9b6b133..cd82dce1 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -47,6 +47,7 @@ import java.util.Map;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 import de.duenndns.ssl.MemorizingTrustManager;
+import de.thedevstack.conversationsplus.ConversationsPlusApplication;
 import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
 import de.tzur.conversations.Settings;
 import eu.siacs.conversations.Config;
@@ -578,7 +579,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
      * check whether we are allowed to download at the moment
      */
     public boolean isDownloadAllowedInConnection() {
-        if (Settings.DOWNLOAD_ONLY_WLAN) {
+        if (ConversationsPlusPreferences.autoDownloadFileWLAN()) {
             return isWifiConnected();
         }
         return true;
@@ -588,7 +589,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
      * check whether wifi is connected
      */
     public boolean isWifiConnected() {
-        ConnectivityManager cm = (ConnectivityManager) getApplicationContext().getSystemService(Context.CONNECTIVITY_SERVICE);
+        ConnectivityManager cm = (ConnectivityManager) ConversationsPlusApplication.getInstance().getSystemService(Context.CONNECTIVITY_SERVICE);
         NetworkInfo niWifi = cm.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
         return niWifi.isConnected();
     }
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
index 2c56488d..8d378824 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
@@ -12,6 +12,9 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.SystemClock;
 import android.util.Log;
+
+import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
+
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.entities.Conversation;
@@ -319,7 +322,7 @@ public class JingleConnection implements Transferable {
 				message.setBody(Long.toString(size));
 				conversation.add(message);
 				mXmppConnectionService.updateConversationUi();
-				if (size <= this.mJingleConnectionManager.getAutoAcceptFileSize()
+				if (size <= ConversationsPlusPreferences.autoAcceptFileSize()
                         && mXmppConnectionService.isDownloadAllowedInConnection()) {
 					Log.d(Config.LOGTAG, "auto accepting file from "
 							+ packet.getFrom());
@@ -331,8 +334,7 @@ public class JingleConnection implements Transferable {
 							"not auto accepting new file offer with size: "
 									+ size
 									+ " allowed size:"
-									+ this.mJingleConnectionManager
-											.getAutoAcceptFileSize());
+									+ ConversationsPlusPreferences.autoAcceptFileSize());
 					this.mXmppConnectionService.getNotificationService()
 							.push(message);
 				}