Merge branch 'trz/rebase' into trz/rename

Conflicts:
	build.gradle
	src/main/java/de/thedevstack/conversationsplus/crypto/OtrEngine.java
	src/main/java/de/thedevstack/conversationsplus/entities/Account.java
	src/main/java/de/thedevstack/conversationsplus/entities/Contact.java
	src/main/java/de/thedevstack/conversationsplus/entities/Downloadable.java
	src/main/java/de/thedevstack/conversationsplus/entities/DownloadableFile.java
	src/main/java/de/thedevstack/conversationsplus/entities/DownloadablePlaceholder.java
	src/main/java/de/thedevstack/conversationsplus/entities/Message.java
	src/main/java/de/thedevstack/conversationsplus/generator/IqGenerator.java
	src/main/java/de/thedevstack/conversationsplus/http/HttpConnection.java
	src/main/java/de/thedevstack/conversationsplus/http/HttpConnectionManager.java
	src/main/java/de/thedevstack/conversationsplus/parser/AbstractParser.java
	src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java
	src/main/java/de/thedevstack/conversationsplus/parser/PresenceParser.java
	src/main/java/de/thedevstack/conversationsplus/persistance/DatabaseBackend.java
	src/main/java/de/thedevstack/conversationsplus/persistance/FileBackend.java
	src/main/java/de/thedevstack/conversationsplus/services/NotificationService.java
	src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java
	src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java
	src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java
	src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java
	src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java
	src/main/java/de/thedevstack/conversationsplus/ui/adapter/AccountAdapter.java
	src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java
	src/main/java/de/thedevstack/conversationsplus/ui/adapter/ListItemAdapter.java
	src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java
	src/main/java/de/thedevstack/conversationsplus/utils/UIHelper.java
	src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnection.java
	src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnectionManager.java
	src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleInbandTransport.java
	src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleSocks5Transport.java
	src/main/java/de/thedevstack/conversationsplus/xmpp/stanzas/MessagePacket.java
	src/main/java/eu/siacs/conversations/crypto/OtrEngine.java
	src/main/java/eu/siacs/conversations/crypto/OtrService.java
	src/main/java/eu/siacs/conversations/entities/DownloadablePlaceholder.java
	src/main/java/eu/siacs/conversations/entities/TransferablePlaceholder.java
	src/main/java/eu/siacs/conversations/http/HttpConnection.java
	src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
	src/main/res/layout/activity_about.xml

1 files changed, 269 insertions, 0 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/http/HttpDownloadConnection.java b/src/main/java/de/thedevstack/conversationsplus/http/HttpDownloadConnection.java
new file mode 100644
index 00000000..3f66be21
--- /dev/null
+++ b/src/main/java/de/thedevstack/conversationsplus/http/HttpDownloadConnection.java
@@ -0,0 +1,269 @@
+package de.thedevstack.conversationsplus.http;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.os.SystemClock;
+import android.util.Log;
+
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Arrays;
+
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLHandshakeException;
+
+import de.thedevstack.conversationsplus.Config;
+import de.thedevstack.conversationsplus.R;
+import de.thedevstack.conversationsplus.entities.Transferable;
+import de.thedevstack.conversationsplus.entities.DownloadableFile;
+import de.thedevstack.conversationsplus.entities.Message;
+import de.thedevstack.conversationsplus.services.XmppConnectionService;
+import de.thedevstack.conversationsplus.utils.CryptoHelper;
+
+public class HttpDownloadConnection implements Transferable {
+
+	private HttpConnectionManager mHttpConnectionManager;
+	private XmppConnectionService mXmppConnectionService;
+
+	private URL mUrl;
+	private Message message;
+	private DownloadableFile file;
+	private int mStatus = Transferable.STATUS_UNKNOWN;
+	private boolean acceptedAutomatically = false;
+	private int mProgress = 0;
+	private long mLastGuiRefresh = 0;
+
+	public HttpDownloadConnection(HttpConnectionManager manager) {
+		this.mHttpConnectionManager = manager;
+		this.mXmppConnectionService = manager.getXmppConnectionService();
+	}
+
+	@Override
+	public boolean start() {
+		if (mXmppConnectionService.hasInternetConnection()) {
+			if (this.mStatus == STATUS_OFFER_CHECK_FILESIZE) {
+				checkFileSize(true);
+			} else {
+				new Thread(new FileDownloader(true)).start();
+			}
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	public void init(Message message) {
+		init(message, false);
+	}
+
+	public void init(Message message, boolean interactive) {
+		this.message = message;
+		this.message.setTransferable(this);
+		try {
+			mUrl = new URL(message.getBody());
+			String[] parts = mUrl.getPath().toLowerCase().split("\\.");
+			String lastPart = parts.length >= 1 ? parts[parts.length - 1] : null;
+			String secondToLast = parts.length >= 2 ? parts[parts.length -2] : null;
+			if ("pgp".equals(lastPart) || "gpg".equals(lastPart)) {
+				this.message.setEncryption(Message.ENCRYPTION_PGP);
+			} else if (message.getEncryption() != Message.ENCRYPTION_OTR) {
+				this.message.setEncryption(Message.ENCRYPTION_NONE);
+			}
+			String extension;
+			if (Arrays.asList(VALID_CRYPTO_EXTENSIONS).contains(lastPart)) {
+				extension = secondToLast;
+			} else {
+				extension = lastPart;
+			}
+			message.setRelativeFilePath(message.getUuid()+"."+extension);
+			this.file = mXmppConnectionService.getFileBackend().getFile(message, false);
+			String reference = mUrl.getRef();
+			if (reference != null && reference.length() == 96) {
+				this.file.setKey(CryptoHelper.hexToBytes(reference));
+			}
+
+			if (this.message.getEncryption() == Message.ENCRYPTION_OTR
+					&& this.file.getKey() == null) {
+				this.message.setEncryption(Message.ENCRYPTION_NONE);
+					}
+			checkFileSize(interactive);
+		} catch (MalformedURLException e) {
+			this.cancel();
+		}
+	}
+
+	private void checkFileSize(boolean interactive) {
+		new Thread(new FileSizeChecker(interactive)).start();
+	}
+
+	public void cancel() {
+		mHttpConnectionManager.finishConnection(this);
+		message.setTransferable(null);
+		mXmppConnectionService.updateConversationUi();
+	}
+
+	private void finish() {
+		Intent intent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE);
+		intent.setData(Uri.fromFile(file));
+		mXmppConnectionService.sendBroadcast(intent);
+		message.setTransferable(null);
+		mHttpConnectionManager.finishConnection(this);
+		mXmppConnectionService.updateConversationUi();
+		if (acceptedAutomatically) {
+			mXmppConnectionService.getNotificationService().push(message);
+		}
+	}
+
+	private void changeStatus(int status) {
+		this.mStatus = status;
+		mXmppConnectionService.updateConversationUi();
+	}
+
+	private class FileSizeChecker implements Runnable {
+
+		private boolean interactive = false;
+
+		public FileSizeChecker(boolean interactive) {
+			this.interactive = interactive;
+		}
+
+		@Override
+		public void run() {
+			long size;
+			try {
+				size = retrieveFileSize();
+			} catch (SSLHandshakeException e) {
+				changeStatus(STATUS_OFFER_CHECK_FILESIZE);
+				HttpDownloadConnection.this.acceptedAutomatically = false;
+				HttpDownloadConnection.this.mXmppConnectionService.getNotificationService().push(message);
+				return;
+			} catch (IOException e) {
+				Log.d(Config.LOGTAG, "io exception in http file size checker: " + e.getMessage());
+				if (interactive) {
+					mXmppConnectionService.showErrorToastInUi(R.string.file_not_found_on_remote_host);
+				}
+				cancel();
+				return;
+			}
+			file.setExpectedSize(size);
+			if (size <= mHttpConnectionManager.getAutoAcceptFileSize()) {
+				HttpDownloadConnection.this.acceptedAutomatically = true;
+				new Thread(new FileDownloader(interactive)).start();
+			} else {
+				changeStatus(STATUS_OFFER);
+				HttpDownloadConnection.this.acceptedAutomatically = false;
+				HttpDownloadConnection.this.mXmppConnectionService.getNotificationService().push(message);
+			}
+		}
+
+		private long retrieveFileSize() throws IOException {
+			Log.d(Config.LOGTAG,"retrieve file size. interactive:"+String.valueOf(interactive));
+			changeStatus(STATUS_CHECKING);
+			HttpURLConnection connection = (HttpURLConnection) mUrl.openConnection();
+			connection.setRequestMethod("HEAD");
+			if (connection instanceof HttpsURLConnection) {
+				mHttpConnectionManager.setupTrustManager((HttpsURLConnection) connection, interactive);
+			}
+			connection.connect();
+			String contentLength = connection.getHeaderField("Content-Length");
+			if (contentLength == null) {
+				throw new IOException();
+			}
+			try {
+				return Long.parseLong(contentLength, 10);
+			} catch (NumberFormatException e) {
+				throw new IOException();
+			}
+		}
+
+	}
+
+	private class FileDownloader implements Runnable {
+
+		private boolean interactive = false;
+
+		public FileDownloader(boolean interactive) {
+			this.interactive = interactive;
+		}
+
+		@Override
+		public void run() {
+			try {
+				changeStatus(STATUS_DOWNLOADING);
+				download();
+				updateImageBounds();
+				finish();
+			} catch (SSLHandshakeException e) {
+				changeStatus(STATUS_OFFER);
+			} catch (IOException e) {
+				mXmppConnectionService.showErrorToastInUi(R.string.file_not_found_on_remote_host);
+				cancel();
+			}
+		}
+
+		private void download() throws SSLHandshakeException, IOException {
+			HttpURLConnection connection = (HttpURLConnection) mUrl.openConnection();
+			if (connection instanceof HttpsURLConnection) {
+				mHttpConnectionManager.setupTrustManager((HttpsURLConnection) connection, interactive);
+			}
+			connection.connect();
+			BufferedInputStream is = new BufferedInputStream(connection.getInputStream());
+			file.getParentFile().mkdirs();
+			file.createNewFile();
+			OutputStream os = file.createOutputStream();
+			if (os == null) {
+				throw new IOException();
+			}
+			long transmitted = 0;
+			long expected = file.getExpectedSize();
+			int count = -1;
+			byte[] buffer = new byte[1024];
+			while ((count = is.read(buffer)) != -1) {
+				transmitted += count;
+				os.write(buffer, 0, count);
+				updateProgress((int) ((((double) transmitted) / expected) * 100));
+			}
+			os.flush();
+			os.close();
+			is.close();
+		}
+
+		private void updateImageBounds() {
+			message.setType(Message.TYPE_FILE);
+			mXmppConnectionService.getFileBackend().updateFileParams(message, mUrl);
+			mXmppConnectionService.updateMessage(message);
+		}
+
+	}
+
+	public void updateProgress(int i) {
+		this.mProgress = i;
+		if (SystemClock.elapsedRealtime() - this.mLastGuiRefresh > Config.PROGRESS_UI_UPDATE_INTERVAL) {
+			this.mLastGuiRefresh = SystemClock.elapsedRealtime();
+			mXmppConnectionService.updateConversationUi();
+		}
+	}
+
+	@Override
+	public int getStatus() {
+		return this.mStatus;
+	}
+
+	@Override
+	public long getFileSize() {
+		if (this.file != null) {
+			return this.file.getExpectedSize();
+		} else {
+			return 0;
+		}
+	}
+
+	@Override
+	public int getProgress() {
+		return this.mProgress;
+	}
+}