diff options
| author | lookshe <github@lookshe.org> | 2016-02-28 18:40:20 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-02-28 19:17:03 +0100 |
| commit | 8fb6204288d55f8af16ae47e32fa6c049284cadd (patch) | |
| tree | 8b5996b3a2dbedef00559cc351a89ade7cd006c3 /src/main/java/eu/siacs/conversations/ui/SettingsActivity.java | |
| parent | bad156913643573ed72bc492734dc0f39a6e8cd8 (diff) | |
Fixes FS#48 and FS#136trz/merge_1.10.0
- corrected preference "confirm_messages" to "confirm_messages_list"
- removed unused "heart message" garbage
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/SettingsActivity.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/SettingsActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java index 83ab83e7..014991ce 100644 --- a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java @@ -163,7 +163,7 @@ public class SettingsActivity extends XmppActivity implements } } else if (name.equals("keep_foreground_service")) { xmppConnectionService.toggleForegroundService(); - } else if (name.equals("confirm_messages") + } else if (name.equals("confirm_messages_list") || name.equals("xa_on_silent_mode") || name.equals("away_when_screen_off")) { if (xmppConnectionServiceBound) { |