Merge master-origin

Conflicts:
	src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
	src/main/java/eu/siacs/conversations/ui/XmppActivity.java
	src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
	src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
	src/main/java/eu/siacs/conversations/utils/UIHelper.java
	src/main/res/values-de/strings.xml

1 files changed, 9 insertions, 0 deletions

diff --git a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
index 352652de..136108ef 100644
--- a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
@@ -75,6 +75,15 @@ public class SettingsActivity extends XmppActivity implements
             case "keep_foreground_service":
                 xmppConnectionService.toggleForegroundService();
                 break;
+			case "confirm_messages":
+				if (xmppConnectionServiceBound) {
+					for (Account account : xmppConnectionService.getAccounts()) {
+						if (!account.isOptionSet(Account.OPTION_DISABLED)) {
+							xmppConnectionService.sendPresence(account);
+						}
+					}
+				}
+				break;
         }
         Settings.synchronizeSettingsClassWithPreferences(getPreferences(), name);
 	}