diff options
author | lookshe <github@lookshe.org> | 2015-04-14 23:48:28 +0200 |
---|---|---|
committer | lookshe <github@lookshe.org> | 2015-04-14 23:48:28 +0200 |
commit | 549810783ce651f27bdd386488b6690195522372 (patch) | |
tree | be050d54e7c591370c5c0dc9667ab6eb5056887b /src/main/java/eu/siacs/conversations/generator | |
parent | 8932dd9fb320b4641e707ae44de2c1d00996c358 (diff) |
changed received and read confirmation setting to one list and put it to settings class
Diffstat (limited to '')
-rw-r--r-- | src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java b/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java index 79626511..186b4b98 100644 --- a/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java +++ b/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java @@ -12,6 +12,7 @@ import java.util.List; import java.util.Locale; import java.util.TimeZone; +import de.tzur.conversations.Settings; import eu.siacs.conversations.services.XmppConnectionService; import eu.siacs.conversations.utils.PhoneHelper; @@ -81,7 +82,7 @@ public abstract class AbstractGenerator { public List<String> getFeatures() { ArrayList<String> features = new ArrayList<>(); features.addAll(Arrays.asList(FEATURES)); - if (mXmppConnectionService.confirmMessages()) { + if (Settings.CONFIRM_MESSAGE_RECEIVED) { features.addAll(Arrays.asList(MESSAGE_CONFIRMATION_FEATURES)); } Collections.sort(features); |