Merge tag '1.12.4' into trz/merge_1.12.4 (not tested yet)trz/merge_1.12.4

Conflicts:
	README.md
	art/render.rb
	build.gradle
	src/main/java/eu/siacs/conversations/Config.java
	src/main/java/eu/siacs/conversations/crypto/PgpEngine.java
	src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
	src/main/java/eu/siacs/conversations/crypto/axolotl/SQLiteAxolotlStore.java
	src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlSession.java
	src/main/java/eu/siacs/conversations/entities/Bookmark.java
	src/main/java/eu/siacs/conversations/entities/Contact.java
	src/main/java/eu/siacs/conversations/entities/ListItem.java
	src/main/java/eu/siacs/conversations/entities/Message.java
	src/main/java/eu/siacs/conversations/parser/IqParser.java
	src/main/java/eu/siacs/conversations/parser/PresenceParser.java
	src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
	src/main/java/eu/siacs/conversations/persistance/FileBackend.java
	src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
	src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
	src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
	src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
	src/main/java/eu/siacs/conversations/ui/ShareWithActivity.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/ListItemAdapter.java
	src/main/java/eu/siacs/conversations/utils/DNSHelper.java
	src/main/java/eu/siacs/conversations/utils/UIHelper.java
	src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
	src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
	src/main/res/layout/activity_contact_details.xml
	src/main/res/layout/message_received.xml
	src/main/res/layout/message_sent.xml
	src/main/res/values-bg/strings.xml
	src/main/res/values-de/strings.xml
	src/main/res/values-es/strings.xml
	src/main/res/values-eu/strings.xml
	src/main/res/values-fr/strings.xml
	src/main/res/values-ja/strings.xml
	src/main/res/values-nl/strings.xml
	src/main/res/values-pt-rBR/strings.xml
	src/main/res/values-pt/strings.xml
	src/main/res/values-ro-rRO/strings.xml
	src/main/res/values-sr/strings.xml
	src/main/res/values-sv/strings.xml
	src/main/res/values-tr-rTR/strings.xml

1 files changed, 14 insertions, 6 deletions

diff --git a/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java
index c83a0275..203ffa48 100644
--- a/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java
@@ -121,9 +121,11 @@ public class ManageAccountActivity extends XmppActivity implements OnAccountUpda
 			menu.findItem(R.id.mgmt_account_disable).setVisible(false);
 			menu.findItem(R.id.mgmt_account_announce_pgp).setVisible(false);
 			menu.findItem(R.id.mgmt_account_publish_avatar).setVisible(false);
+			menu.findItem(R.id.mgmt_account_change_presence).setVisible(false);
 		} else {
 			menu.findItem(R.id.mgmt_account_enable).setVisible(false);
 			menu.findItem(R.id.mgmt_account_announce_pgp).setVisible(Config.supportOpenPgp());
+			menu.findItem(R.id.mgmt_account_change_presence).setVisible(manuallyChangePresence());
 		}
 		menu.setHeaderTitle(this.selectedAccount.getJid().toBareJid().toString());
 	}
@@ -154,10 +156,7 @@ public class ManageAccountActivity extends XmppActivity implements OnAccountUpda
 		if (Config.X509_VERIFICATION) {
 			addAccount.setVisible(false);
 			addAccountWithCertificate.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
-		} else {
-			addAccount.setVisible(!Config.LOCK_SETTINGS);
 		}
-		addAccountWithCertificate.setVisible(!Config.LOCK_SETTINGS);
 
 		if (!accountsLeftToEnable()) {
 			enableAll.setVisible(false);
@@ -187,6 +186,9 @@ public class ManageAccountActivity extends XmppActivity implements OnAccountUpda
 			case R.id.mgmt_account_announce_pgp:
 				publishOpenPGPPublicKey(selectedAccount);
 				return true;
+			case R.id.mgmt_account_change_presence:
+				changePresence(selectedAccount);
+				return true;
 			default:
 				return super.onContextItemSelected(item);
 		}
@@ -235,6 +237,12 @@ public class ManageAccountActivity extends XmppActivity implements OnAccountUpda
 		}
 	}
 
+	private void changePresence(Account account) {
+		Intent intent = new Intent(this, SetPresenceActivity.class);
+		intent.putExtra(SetPresenceActivity.EXTRA_ACCOUNT,account.getJid().toBareJid().toString());
+		startActivity(intent);
+	}
+
 	public void onClickTglAccountState(Account account, boolean enable) {
 		if (enable) {
 			enableAccount(account);
@@ -320,7 +328,7 @@ public class ManageAccountActivity extends XmppActivity implements OnAccountUpda
 
 	private void publishOpenPGPPublicKey(Account account) {
 		if (ManageAccountActivity.this.hasPgp()) {
-			choosePgpSignId(selectedAccount);
+			announcePgp(selectedAccount, null, onOpenPGPKeyPublished);
 		} else {
 			this.showInstallPgpDialog();
 		}
@@ -352,12 +360,12 @@ public class ManageAccountActivity extends XmppActivity implements OnAccountUpda
 				if (requestCode == REQUEST_CHOOSE_PGP_ID) {
 					if (data.getExtras().containsKey(OpenPgpApi.EXTRA_SIGN_KEY_ID)) {
 						selectedAccount.setPgpSignId(data.getExtras().getLong(OpenPgpApi.EXTRA_SIGN_KEY_ID));
-						announcePgp(selectedAccount, null);
+						announcePgp(selectedAccount, null, onOpenPGPKeyPublished);
 					} else {
 						choosePgpSignId(selectedAccount);
 					}
 				} else if (requestCode == REQUEST_ANNOUNCE_PGP) {
-					announcePgp(selectedAccount, null);
+					announcePgp(selectedAccount, null, onOpenPGPKeyPublished);
 				}
 				this.mPostponedActivityResult = null;
 			} else {