Fixes FS#47: WiFi only setting in unencrypted chats bug fixed, typo in values for the setting fixed, preferences involved in the decision for auto downloading image links moved to global Utility Class

1 files changed, 3 insertions, 2 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/crypto/PgpEngine.java b/src/main/java/de/thedevstack/conversationsplus/crypto/PgpEngine.java
index 49c8db54..531aca32 100644
--- a/src/main/java/de/thedevstack/conversationsplus/crypto/PgpEngine.java
+++ b/src/main/java/de/thedevstack/conversationsplus/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 de.thedevstack.conversationsplus.R;
 import de.thedevstack.conversationsplus.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);