Merge tag '1.9.3' into trz/merge_1.9.3

Conflicts:
	.travis.yml
	CHANGELOG.md
	README.md
	art/render.rb
	build.gradle
	libs/openpgp-api-lib/build.gradle
	settings.gradle
	src/main/AndroidManifest.xml
	src/main/java/eu/siacs/conversations/Config.java
	src/main/java/eu/siacs/conversations/crypto/OtrService.java
	src/main/java/eu/siacs/conversations/crypto/PgpEngine.java
	src/main/java/eu/siacs/conversations/entities/Account.java
	src/main/java/eu/siacs/conversations/entities/Contact.java
	src/main/java/eu/siacs/conversations/entities/Conversation.java
	src/main/java/eu/siacs/conversations/entities/DownloadableFile.java
	src/main/java/eu/siacs/conversations/entities/Message.java
	src/main/java/eu/siacs/conversations/entities/MucOptions.java
	src/main/java/eu/siacs/conversations/entities/Transferable.java
	src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
	src/main/java/eu/siacs/conversations/generator/IqGenerator.java
	src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
	src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java
	src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java
	src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
	src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java
	src/main/java/eu/siacs/conversations/parser/AbstractParser.java
	src/main/java/eu/siacs/conversations/parser/IqParser.java
	src/main/java/eu/siacs/conversations/parser/MessageParser.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/AbstractConnectionManager.java
	src/main/java/eu/siacs/conversations/services/AvatarService.java
	src/main/java/eu/siacs/conversations/services/MessageArchiveService.java
	src/main/java/eu/siacs/conversations/services/NotificationService.java
	src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
	src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
	src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
	src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
	src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
	src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
	src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java
	src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.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/AccountAdapter.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/ui/adapter/MessageAdapter.java
	src/main/java/eu/siacs/conversations/utils/CryptoHelper.java
	src/main/java/eu/siacs/conversations/utils/DNSHelper.java
	src/main/java/eu/siacs/conversations/utils/ExceptionHelper.java
	src/main/java/eu/siacs/conversations/utils/MimeUtils.java
	src/main/java/eu/siacs/conversations/utils/PhoneHelper.java
	src/main/java/eu/siacs/conversations/utils/UIHelper.java
	src/main/java/eu/siacs/conversations/utils/Xmlns.java
	src/main/java/eu/siacs/conversations/xml/XmlReader.java
	src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
	src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
	src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
	src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java
	src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java
	src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java
	src/main/res/drawable-hdpi/ic_launcher.png
	src/main/res/drawable-hdpi/ic_notification.png
	src/main/res/drawable-mdpi/ic_launcher.png
	src/main/res/drawable-mdpi/ic_notification.png
	src/main/res/drawable-xhdpi/ic_launcher.png
	src/main/res/drawable-xhdpi/ic_notification.png
	src/main/res/drawable-xxhdpi/ic_launcher.png
	src/main/res/drawable-xxhdpi/ic_notification.png
	src/main/res/drawable-xxxhdpi/ic_launcher.png
	src/main/res/drawable-xxxhdpi/ic_notification.png
	src/main/res/layout/account_row.xml
	src/main/res/layout/activity_about.xml
	src/main/res/layout/activity_change_password.xml
	src/main/res/layout/activity_contact_details.xml
	src/main/res/layout/activity_edit_account.xml
	src/main/res/layout/activity_muc_details.xml
	src/main/res/layout/activity_publish_profile_picture.xml
	src/main/res/layout/activity_verify_otr.xml
	src/main/res/layout/contact.xml
	src/main/res/layout/contact_key.xml
	src/main/res/layout/conversation_list_row.xml
	src/main/res/layout/enter_jid_dialog.xml
	src/main/res/layout/fragment_conversation.xml
	src/main/res/layout/join_conference_dialog.xml
	src/main/res/layout/message_received.xml
	src/main/res/layout/message_sent.xml
	src/main/res/layout/message_status.xml
	src/main/res/layout/quickedit.xml
	src/main/res/values-ar-rEG/strings.xml
	src/main/res/values-bg/strings.xml
	src/main/res/values-ca/strings.xml
	src/main/res/values-cs/strings.xml
	src/main/res/values-de/strings.xml
	src/main/res/values-el/strings.xml
	src/main/res/values-es/strings.xml
	src/main/res/values-eu/strings.xml
	src/main/res/values-fa-rIR/strings.xml
	src/main/res/values-fr/strings.xml
	src/main/res/values-id/strings.xml
	src/main/res/values-it/strings.xml
	src/main/res/values-iw/strings.xml
	src/main/res/values-ja/strings.xml
	src/main/res/values-ko/strings.xml
	src/main/res/values-nl/strings.xml
	src/main/res/values-pl/strings.xml
	src/main/res/values-pt/strings.xml
	src/main/res/values-ru/strings.xml
	src/main/res/values-sk/strings.xml
	src/main/res/values-sr/strings.xml
	src/main/res/values-sv/strings.xml
	src/main/res/values-v21/themes.xml
	src/main/res/values-zh-rCN/strings.xml
	src/main/res/values/arrays.xml
	src/main/res/values/colors.xml
	src/main/res/values/dimens.xml
	src/main/res/values/strings.xml
	src/main/res/values/themes.xml
	src/main/res/xml/preferences.xml

1 files changed, 74 insertions, 24 deletions

diff --git a/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java b/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java
index cb08afe9..d0cfe558 100644
--- a/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java
@@ -4,6 +4,7 @@ import android.app.PendingIntent;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -14,8 +15,10 @@ import android.widget.Toast;
 
 import java.net.URLConnection;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
+import eu.siacs.conversations.Config;
 import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
 import de.thedevstack.conversationsplus.ui.dialogs.UserDecisionDialog;
 import de.thedevstack.conversationsplus.ui.listeners.ResizePictureUserDecisionListener;
@@ -31,12 +34,13 @@ import eu.siacs.conversations.xmpp.jid.Jid;
 
 public class ShareWithActivity extends XmppActivity {
 
-	public class Share {
+	private class Share {
 		public List<Uri> uris = new ArrayList<>();
 		public boolean image;
 		public String account;
 		public String contact;
 		public String text;
+		public String uuid;
 	}
 
 	private Share share;
@@ -44,6 +48,7 @@ public class ShareWithActivity extends XmppActivity {
 	private static final int REQUEST_START_NEW_CONVERSATION = 0x0501;
 	private ListView mListView;
 	private List<Conversation> mConversations = new ArrayList<>();
+	private Toast mToast;
 
 	private UiCallback<Message> attachFileCallback = new UiCallback<Message>() {
 
@@ -54,8 +59,22 @@ public class ShareWithActivity extends XmppActivity {
 		}
 
 		@Override
-		public void success(Message message) {
+		public void success(final Message message) {
 			xmppConnectionService.sendMessage(message);
+			runOnUiThread(new Runnable() {
+				@Override
+				public void run() {
+					if (mToast != null) {
+						mToast.cancel();
+					}
+					if (share.uuid != null) {
+						mToast = Toast.makeText(getApplicationContext(),
+								getString(share.image ? R.string.shared_image_with_x : R.string.shared_file_with_x,message.getConversation().getName()),
+								Toast.LENGTH_SHORT);
+						mToast.show();
+					}
+				}
+			});
 		}
 
 		@Override
@@ -70,7 +89,7 @@ public class ShareWithActivity extends XmppActivity {
 		if (requestCode == REQUEST_START_NEW_CONVERSATION
 				&& resultCode == RESULT_OK) {
 			share.contact = data.getStringExtra("contact");
-			share.account = data.getStringExtra("account");
+			share.account = data.getStringExtra(EXTRA_ACCOUNT);
 		}
 		if (xmppConnectionServiceBound
 				&& share != null
@@ -132,9 +151,12 @@ public class ShareWithActivity extends XmppActivity {
 			return;
 		}
 		final String type = intent.getType();
+		Log.d(Config.LOGTAG, "action: "+intent.getAction()+ ", type:"+type);
+		share.uuid = intent.getStringExtra("uuid");
 		if (Intent.ACTION_SEND.equals(intent.getAction())) {
 			final Uri uri = getIntent().getParcelableExtra(Intent.EXTRA_STREAM);
 			if (type != null && uri != null && !type.equalsIgnoreCase("text/plain")) {
+				this.share.uris.clear();
 				this.share.uris.add(uri);
 				this.share.image = type.startsWith("image/") || isImage(uri);
 			} else {
@@ -149,7 +171,11 @@ public class ShareWithActivity extends XmppActivity {
 			this.share.uris = intent.getParcelableArrayListExtra(Intent.EXTRA_STREAM);
 		}
 		if (xmppConnectionServiceBound) {
-			xmppConnectionService.populateWithOrderedConversations(mConversations, this.share.uris.size() == 0);
+			if (share.uuid != null) {
+				share();
+			} else {
+				xmppConnectionService.populateWithOrderedConversations(mConversations, this.share.uris.size() == 0);
+			}
 		}
 
 	}
@@ -166,7 +192,7 @@ public class ShareWithActivity extends XmppActivity {
 	@Override
 	void onBackendConnected() {
 		if (xmppConnectionServiceBound && share != null
-				&& share.contact != null && share.account != null) {
+				&& ((share.contact != null && share.account != null) || share.uuid != null)) {
 			share();
 			return;
 		}
@@ -175,26 +201,43 @@ public class ShareWithActivity extends XmppActivity {
 	}
 
 	private void share() {
-		Account account;
-		try {
-			account = xmppConnectionService.findAccountByJid(Jid.fromString(share.account));
-		} catch (final InvalidJidException e) {
-			account = null;
-		}
-		if (account == null) {
-			return;
-		}
 		final Conversation conversation;
-		try {
-			conversation = xmppConnectionService
-					.findOrCreateConversation(account, Jid.fromString(share.contact), false);
-		} catch (final InvalidJidException e) {
-			return;
+		if (share.uuid != null) {
+			conversation = xmppConnectionService.findConversationByUuid(share.uuid);
+			if (conversation == null) {
+				return;
+			}
+		}else{
+			Account account;
+			try {
+				account = xmppConnectionService.findAccountByJid(Jid.fromString(share.account));
+			} catch (final InvalidJidException e) {
+				account = null;
+			}
+			if (account == null) {
+				return;
+			}
+
+			try {
+				conversation = xmppConnectionService
+						.findOrCreateConversation(account, Jid.fromString(share.contact), false);
+			} catch (final InvalidJidException e) {
+				return;
+			}
 		}
 		share(conversation);
 	}
 
 	private void share(final Conversation conversation) {
+		if (conversation.getNextEncryption() == Message.ENCRYPTION_PGP && !hasPgp()) {
+			if (share.uuid == null) {
+				showInstallPgpDialog();
+			} else {
+				Toast.makeText(this,R.string.openkeychain_not_installed,Toast.LENGTH_SHORT).show();
+				finish();
+			}
+			return;
+		}
 		if (share.uris.size() != 0) {
 			OnPresenceSelected callback;
             if (this.share.image) {
@@ -210,22 +253,25 @@ public class ShareWithActivity extends XmppActivity {
                 callback = new OnPresenceSelected() {
                     @Override
                     public void onPresenceSelected() {
-                        Toast.makeText(getApplicationContext(),
+                        mToast = Toast.makeText(getApplicationContext(),
                                 getText(R.string.preparing_file),
-                                Toast.LENGTH_LONG).show();
+                                Toast.LENGTH_LONG);
+                        mToast.show();
                         ShareWithActivity.this.xmppConnectionService
                                 .attachFileToConversation(conversation, share.uris.get(0),
                                         attachFileCallback);
-                        switchToConversation(conversation, null, true);
+					if (share.uuid == null) {
+						switchToConversation(conversation, null, true);
+					}
                         finish();
                     }
                 };
             }
 
 			if (conversation.getAccount().httpUploadAvailable()) {
-                callback.onPresenceSelected();
+				callback.onPresenceSelected();
 			} else {
-                selectPresence(conversation, callback);
+				selectPresence(conversation, callback);
 			}
 		} else {
 			switchToConversation(conversation, this.share.text, true);
@@ -234,4 +280,8 @@ public class ShareWithActivity extends XmppActivity {
 
 	}
 
+	public void refreshUiReal() {
+		//nothing to do. This Activity doesn't implement any listeners
+	}
+
 }