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, 33 insertions, 54 deletions

diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java
index 41cf4d96..c4c96ea2 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java
@@ -1,10 +1,15 @@
 package eu.siacs.conversations.xmpp.jingle;
 
+import android.os.PowerManager;
+import android.util.Log;
+
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.InetAddress;
 import java.net.InetSocketAddress;
+import java.net.Proxy;
 import java.net.Socket;
 import java.net.SocketAddress;
 import java.net.UnknownHostException;
@@ -19,6 +24,7 @@ import eu.siacs.conversations.Config;
 import eu.siacs.conversations.entities.DownloadableFile;
 import eu.siacs.conversations.persistance.FileBackend;
 import eu.siacs.conversations.utils.CryptoHelper;
+import eu.siacs.conversations.utils.SocksSocketFactory;
 
 public class JingleSocks5Transport extends JingleTransport {
 	private JingleCandidate candidate;
@@ -59,34 +65,19 @@ public class JingleSocks5Transport extends JingleTransport {
 			@Override
 			public void run() {
 				try {
-					socket = new Socket();
-					SocketAddress address = new InetSocketAddress(candidate.getHost(),candidate.getPort());
-					socket.connect(address,Config.SOCKET_TIMEOUT * 1000);
-					inputStream = socket.getInputStream();
-					outputStream = socket.getOutputStream();
-					byte[] login = { 0x05, 0x01, 0x00 };
-					byte[] expectedReply = { 0x05, 0x00 };
-					byte[] reply = new byte[2];
-					outputStream.write(login);
-					inputStream.read(reply);
-					final String connect = Character.toString('\u0005')
-							+ '\u0001' + '\u0000' + '\u0003' + '\u0028'
-							+ destination + '\u0000' + '\u0000';
-					if (Arrays.equals(reply, expectedReply)) {
-						outputStream.write(connect.getBytes());
-						byte[] result = new byte[2];
-						inputStream.read(result);
-						int status = result[1];
-						if (status == 0) {
-							isEstablished = true;
-							callback.established();
-						} else {
-							callback.failed();
-						}
+					final boolean useTor = connection.getAccount().isOnion() || connection.getConnectionManager().getXmppConnectionService().useTorToConnect();
+					if (useTor) {
+						socket = SocksSocketFactory.createSocketOverTor(candidate.getHost(),candidate.getPort());
 					} else {
-						socket.close();
-						callback.failed();
+						socket = new Socket();
+						SocketAddress address = new InetSocketAddress(candidate.getHost(),candidate.getPort());
+						socket.connect(address,Config.SOCKET_TIMEOUT * 1000);
 					}
+					inputStream = socket.getInputStream();
+					outputStream = socket.getOutputStream();
+					SocksSocketFactory.createSocksConnection(socket,destination,0);
+					isEstablished = true;
+					callback.established();
 				} catch (UnknownHostException e) {
 					callback.failed();
 				} catch (IOException e) {
@@ -97,23 +88,24 @@ public class JingleSocks5Transport extends JingleTransport {
 
 	}
 
-	public void send(final DownloadableFile file,
-			final OnFileTransmissionStatusChanged callback) {
+	public void send(final DownloadableFile file, final OnFileTransmissionStatusChanged callback) {
 		new Thread(new Runnable() {
 
 			@Override
 			public void run() {
 				InputStream fileInputStream = null;
+				final PowerManager.WakeLock wakeLock = connection.getConnectionManager().createWakeLock("jingle_send_"+connection.getSessionId());
 				try {
+					wakeLock.acquire();
 					MessageDigest digest = MessageDigest.getInstance("SHA-1");
 					digest.reset();
-					fileInputStream = file.createInputStream();
+					fileInputStream = connection.getFileInputStream();
 					if (fileInputStream == null) {
 						Logging.d(Config.LOGTAG, connection.getAccount().getJid().toBareJid() + ": could not create input stream");
 						callback.onFileTransferAborted();
 						return;
 					}
-					long size = file.getSize();
+					long size = file.getExpectedSize();
 					long transmitted = 0;
 					int count;
 					byte[] buffer = new byte[8192];
@@ -139,6 +131,7 @@ public class JingleSocks5Transport extends JingleTransport {
 					callback.onFileTransferAborted();
 				} finally {
 					StreamUtil.close(fileInputStream);
+					wakeLock.release();
 				}
 			}
 		}).start();
@@ -151,14 +144,16 @@ public class JingleSocks5Transport extends JingleTransport {
 			@Override
 			public void run() {
 				OutputStream fileOutputStream = null;
+				final PowerManager.WakeLock wakeLock = connection.getConnectionManager().createWakeLock("jingle_receive_"+connection.getSessionId());
 				try {
+					wakeLock.acquire();
 					MessageDigest digest = MessageDigest.getInstance("SHA-1");
 					digest.reset();
-					inputStream.skip(45);
+					//inputStream.skip(45);
 					socket.setSoTimeout(30000);
 					file.getParentFile().mkdirs();
 					file.createNewFile();
-					fileOutputStream = file.createOutputStream();
+					fileOutputStream = connection.getFileOutputStream();
 					if (fileOutputStream == null) {
 						callback.onFileTransferAborted();
 						Logging.d(Config.LOGTAG, connection.getAccount().getJid().toBareJid() + ": could not create output stream");
@@ -167,7 +162,7 @@ public class JingleSocks5Transport extends JingleTransport {
 					double size = file.getExpectedSize();
 					long remainingSize = file.getExpectedSize();
 					byte[] buffer = new byte[8192];
-					int count = buffer.length;
+					int count;
 					while (remainingSize > 0) {
 						count = inputStream.read(buffer);
 						if (count == -1) {
@@ -195,7 +190,9 @@ public class JingleSocks5Transport extends JingleTransport {
 					Logging.d(Config.LOGTAG, connection.getAccount().getJid().toBareJid() + ": "+e.getMessage());
 					callback.onFileTransferAborted();
 				} finally {
+					wakeLock.release();
 					StreamUtil.close(fileOutputStream);
+					StreamUtil.close(inputStream);
 				}
 			}
 		}).start();
@@ -210,27 +207,9 @@ public class JingleSocks5Transport extends JingleTransport {
 	}
 
 	public void disconnect() {
-		if (this.outputStream != null) {
-			try {
-				this.outputStream.close();
-			} catch (IOException e) {
-
-			}
-		}
-		if (this.inputStream != null) {
-			try {
-				this.inputStream.close();
-			} catch (IOException e) {
-
-			}
-		}
-		if (this.socket != null) {
-			try {
-				this.socket.close();
-			} catch (IOException e) {
-
-			}
-		}
+		StreamUtil.close(inputStream);
+		StreamUtil.close(outputStream);
+		StreamUtil.close(socket);
 	}
 
 	public boolean isEstablished() {