diff options
| author | lookshe <github@lookshe.org> | 2016-03-07 23:42:13 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-03-07 23:42:13 +0100 |
| commit | 5eda297b145558b4bcdbd0fb94f8a2675691971f (patch) | |
| tree | 684e9c2b287566c4c1ec001889b82e34a5ca29b3 /src/main/java/de/thedevstack/conversationsplus/crypto | |
| parent | d620dcdc575ff1ce4cbdaf78e3182f3418e2142d (diff) | |
| parent | c8759af913b775645b5394eb3c1f08d8c5fe9238 (diff) | |
Merge branch 'trz/rebase' into trz/rename
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/crypto')
| -rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/crypto/PgpEngine.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/crypto/PgpEngine.java b/src/main/java/de/thedevstack/conversationsplus/crypto/PgpEngine.java index 8a5c6101..d01dc867 100644 --- a/src/main/java/de/thedevstack/conversationsplus/crypto/PgpEngine.java +++ b/src/main/java/de/thedevstack/conversationsplus/crypto/PgpEngine.java @@ -64,7 +64,6 @@ public class PgpEngine { if (message.trusted() && message.treatAsDownloadable() != Message.Decision.NEVER && ConversationsPlusPreferences.autoDownloadFileLink() - && mXmppConnectionService.isDownloadAllowedInConnection() && ConversationsPlusPreferences.autoAcceptFileSize() > 0) { manager.createNewDownloadConnection(message); } |