Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase

4 files changed, 55 insertions, 55 deletions

diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
index 7a070a7e..cf969dc0 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
@@ -11,9 +11,9 @@ import java.util.concurrent.ConcurrentHashMap;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.SystemClock;
-import android.util.Log;
 
 import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
+import de.thedevstack.conversationsplus.utils.Logging;
 
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.entities.Account;
@@ -102,7 +102,7 @@ public class JingleConnection implements Transferable {
 					file.delete();
 				}
 			}
-			Log.d(Config.LOGTAG,"successfully transmitted file:" + file.getAbsolutePath()+" ("+file.getSha1Sum()+")");
+			Logging.d(Config.LOGTAG,"successfully transmitted file:" + file.getAbsolutePath()+" ("+file.getSha1Sum()+")");
 			if (message.getEncryption() != Message.ENCRYPTION_PGP) {
 				Intent intent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE);
 				intent.setData(Uri.fromFile(file));
@@ -122,17 +122,17 @@ public class JingleConnection implements Transferable {
 		@Override
 		public void success() {
 			if (initiator.equals(account.getJid())) {
-				Log.d(Config.LOGTAG, "we were initiating. sending file");
+				Logging.d(Config.LOGTAG, "we were initiating. sending file");
 				transport.send(file, onFileTransmissionSatusChanged);
 			} else {
 				transport.receive(file, onFileTransmissionSatusChanged);
-				Log.d(Config.LOGTAG, "we were responding. receiving file");
+				Logging.d(Config.LOGTAG, "we were responding. receiving file");
 			}
 		}
 
 		@Override
 		public void failed() {
-			Log.d(Config.LOGTAG, "proxy activation failed");
+			Logging.d(Config.LOGTAG, "proxy activation failed");
 		}
 	};
 
@@ -178,13 +178,13 @@ public class JingleConnection implements Transferable {
 				returnResult = this.receiveFallbackToIbb(packet);
 			} else {
 				returnResult = false;
-				Log.d(Config.LOGTAG, "trying to fallback to something unknown"
+				Logging.d(Config.LOGTAG, "trying to fallback to something unknown"
 						+ packet.toString());
 			}
 		} else if (packet.isAction("transport-accept")) {
 			returnResult = this.receiveTransportAccept(packet);
 		} else {
-			Log.d(Config.LOGTAG, "packet arrived in connection. action was "
+			Logging.d(Config.LOGTAG, "packet arrived in connection. action was "
 					+ packet.getAction());
 			returnResult = false;
 		}
@@ -227,14 +227,14 @@ public class JingleConnection implements Transferable {
 
 											@Override
 											public void failed() {
-												Log.d(Config.LOGTAG,
+												Logging.d(Config.LOGTAG,
 														"connection to our own primary candidete failed");
 												sendInitRequest();
 											}
 
 											@Override
 											public void established() {
-												Log.d(Config.LOGTAG,
+												Logging.d(Config.LOGTAG,
 														"succesfully connected to our own primary candidate");
 												mergeCandidate(candidate);
 												sendInitRequest();
@@ -242,7 +242,7 @@ public class JingleConnection implements Transferable {
 										});
 								mergeCandidate(candidate);
 							} else {
-								Log.d(Config.LOGTAG,
+								Logging.d(Config.LOGTAG,
 										"no primary candidate of our own was found");
 								sendInitRequest();
 							}
@@ -325,13 +325,13 @@ public class JingleConnection implements Transferable {
 				mXmppConnectionService.updateConversationUi();
 				if (size <= ConversationsPlusPreferences.autoAcceptFileSize()
                         && mXmppConnectionService.isDownloadAllowedInConnection()) {
-					Log.d(Config.LOGTAG, "auto accepting file from "
+					Logging.d(Config.LOGTAG, "auto accepting file from "
 							+ packet.getFrom());
 					this.acceptedAutomatically = true;
 					this.sendAccept();
 				} else {
 					message.markUnread();
-					Log.d(Config.LOGTAG,
+					Logging.d(Config.LOGTAG,
 							"not auto accepting new file offer with size: "
 									+ size
 									+ " allowed size:"
@@ -370,7 +370,7 @@ public class JingleConnection implements Transferable {
 			if (message.getEncryption() == Message.ENCRYPTION_OTR) {
 				Conversation conversation = this.message.getConversation();
 				if (!this.mXmppConnectionService.renewSymmetricKey(conversation)) {
-					Log.d(Config.LOGTAG,account.getJid().toBareJid()+": could not set symmetric key");
+					Logging.d(Config.LOGTAG,account.getJid().toBareJid()+": could not set symmetric key");
 					cancel();
 				}
 				content.setFileOffer(this.file, true);
@@ -387,7 +387,7 @@ public class JingleConnection implements Transferable {
 				@Override
 				public void onIqPacketReceived(Account account, IqPacket packet) {
 					if (packet.getType() != IqPacket.TYPE.ERROR) {
-						Log.d(Config.LOGTAG,account.getJid().toBareJid()+": other party received offer");
+						Logging.d(Config.LOGTAG,account.getJid().toBareJid()+": other party received offer");
 						mJingleStatus = JINGLE_STATUS_INITIATED;
 						mXmppConnectionService.markMessage(message, Message.STATUS_OFFERED);
 					} else {
@@ -429,7 +429,7 @@ public class JingleConnection implements Transferable {
 
 						@Override
 						public void failed() {
-							Log.d(Config.LOGTAG,"connection to our own primary candidate failed");
+							Logging.d(Config.LOGTAG,"connection to our own primary candidate failed");
 							content.socks5transport().setChildren(getCandidatesAsElements());
 							packet.setContent(content);
 							sendJinglePacket(packet);
@@ -438,7 +438,7 @@ public class JingleConnection implements Transferable {
 
 						@Override
 						public void established() {
-							Log.d(Config.LOGTAG, "connected to primary candidate");
+							Logging.d(Config.LOGTAG, "connected to primary candidate");
 							mergeCandidate(candidate);
 							content.socks5transport().setChildren(getCandidatesAsElements());
 							packet.setContent(content);
@@ -447,7 +447,7 @@ public class JingleConnection implements Transferable {
 						}
 					});
 				} else {
-					Log.d(Config.LOGTAG,"did not find a primary candidate for ourself");
+					Logging.d(Config.LOGTAG,"did not find a primary candidate for ourself");
 					content.socks5transport().setChildren(getCandidatesAsElements());
 					packet.setContent(content);
 					sendJinglePacket(packet);
@@ -493,13 +493,13 @@ public class JingleConnection implements Transferable {
 					onProxyActivated.success();
 				} else {
 					String cid = content.socks5transport().findChild("activated").getAttribute("cid");
-					Log.d(Config.LOGTAG, "received proxy activated (" + cid
+					Logging.d(Config.LOGTAG, "received proxy activated (" + cid
 							+ ")prior to choosing our own transport");
 					JingleSocks5Transport connection = this.connections.get(cid);
 					if (connection != null) {
 						connection.setActivated(true);
 					} else {
-						Log.d(Config.LOGTAG, "activated connection not found");
+						Logging.d(Config.LOGTAG, "activated connection not found");
 						this.sendCancel();
 						this.fail();
 					}
@@ -509,7 +509,7 @@ public class JingleConnection implements Transferable {
 				onProxyActivated.failed();
 				return true;
 			} else if (content.socks5transport().hasChild("candidate-error")) {
-				Log.d(Config.LOGTAG, "received candidate error");
+				Logging.d(Config.LOGTAG, "received candidate error");
 				this.receivedCandidate = true;
 				if ((mJingleStatus == JINGLE_STATUS_ACCEPTED)
 						&& (this.sentCandidate)) {
@@ -520,7 +520,7 @@ public class JingleConnection implements Transferable {
 				String cid = content.socks5transport()
 						.findChild("candidate-used").getAttribute("cid");
 				if (cid != null) {
-					Log.d(Config.LOGTAG, "candidate used by counterpart:" + cid);
+					Logging.d(Config.LOGTAG, "candidate used by counterpart:" + cid);
 					JingleCandidate candidate = getCandidate(cid);
 					candidate.flagAsUsedByCounterpart();
 					this.receivedCandidate = true;
@@ -528,7 +528,7 @@ public class JingleConnection implements Transferable {
 							&& (this.sentCandidate)) {
 						this.connect();
 					} else {
-						Log.d(Config.LOGTAG,
+						Logging.d(Config.LOGTAG,
 								"ignoring because file is already in transmission or we havent sent our candidate yet");
 					}
 					return true;
@@ -547,7 +547,7 @@ public class JingleConnection implements Transferable {
 		final JingleSocks5Transport connection = chooseConnection();
 		this.transport = connection;
 		if (connection == null) {
-			Log.d(Config.LOGTAG, "could not find suitable candidate");
+			Logging.d(Config.LOGTAG, "could not find suitable candidate");
 			this.disconnectSocks5Connections();
 			if (this.initiator.equals(account.getJid())) {
 				this.sendFallbackToIbb();
@@ -556,7 +556,7 @@ public class JingleConnection implements Transferable {
 			this.mJingleStatus = JINGLE_STATUS_TRANSMITTING;
 			if (connection.needsActivation()) {
 				if (connection.getCandidate().isOurs()) {
-					Log.d(Config.LOGTAG, "candidate "
+					Logging.d(Config.LOGTAG, "candidate "
 							+ connection.getCandidate().getCid()
 							+ " was our proxy. going to activate");
 					IqPacket activation = new IqPacket(IqPacket.TYPE.SET);
@@ -581,17 +581,17 @@ public class JingleConnection implements Transferable {
 								}
 							});
 				} else {
-					Log.d(Config.LOGTAG,
+					Logging.d(Config.LOGTAG,
 							"candidate "
 									+ connection.getCandidate().getCid()
 									+ " was a proxy. waiting for other party to activate");
 				}
 			} else {
 				if (initiator.equals(account.getJid())) {
-					Log.d(Config.LOGTAG, "we were initiating. sending file");
+					Logging.d(Config.LOGTAG, "we were initiating. sending file");
 					connection.send(file, onFileTransmissionSatusChanged);
 				} else {
-					Log.d(Config.LOGTAG, "we were responding. receiving file");
+					Logging.d(Config.LOGTAG, "we were responding. receiving file");
 					connection.receive(file, onFileTransmissionSatusChanged);
 				}
 			}
@@ -603,11 +603,11 @@ public class JingleConnection implements Transferable {
 		for (Entry<String, JingleSocks5Transport> cursor : connections
 				.entrySet()) {
 			JingleSocks5Transport currentConnection = cursor.getValue();
-			// Log.d(Config.LOGTAG,"comparing candidate: "+currentConnection.getCandidate().toString());
+			// Logging.d(Config.LOGTAG,"comparing candidate: "+currentConnection.getCandidate().toString());
 			if (currentConnection.isEstablished()
 					&& (currentConnection.getCandidate().isUsedByCounterpart() || (!currentConnection
 							.getCandidate().isOurs()))) {
-				// Log.d(Config.LOGTAG,"is usable");
+				// Logging.d(Config.LOGTAG,"is usable");
 				if (connection == null) {
 					connection = currentConnection;
 				} else {
@@ -616,7 +616,7 @@ public class JingleConnection implements Transferable {
 						connection = currentConnection;
 					} else if (connection.getCandidate().getPriority() == currentConnection
 							.getCandidate().getPriority()) {
-						// Log.d(Config.LOGTAG,"found two candidates with same priority");
+						// Logging.d(Config.LOGTAG,"found two candidates with same priority");
 						if (initiator.equals(account.getJid())) {
 							if (currentConnection.getCandidate().isOurs()) {
 								connection = currentConnection;
@@ -648,7 +648,7 @@ public class JingleConnection implements Transferable {
 	}
 
 	private void sendFallbackToIbb() {
-		Log.d(Config.LOGTAG, "sending fallback to ibb");
+		Logging.d(Config.LOGTAG, "sending fallback to ibb");
 		JinglePacket packet = this.bootstrapPacket("transport-replace");
 		Content content = new Content(this.contentCreator, this.contentName);
 		this.transportId = this.mJingleConnectionManager.nextRandomId();
@@ -660,7 +660,7 @@ public class JingleConnection implements Transferable {
 	}
 
 	private boolean receiveFallbackToIbb(JinglePacket packet) {
-		Log.d(Config.LOGTAG, "receiving fallack to ibb");
+		Logging.d(Config.LOGTAG, "receiving fallack to ibb");
 		String receivedBlockSize = packet.getJingleContent().ibbTransport()
 				.getAttribute("block-size");
 		if (receivedBlockSize != null) {
@@ -697,7 +697,7 @@ public class JingleConnection implements Transferable {
 
 				@Override
 				public void failed() {
-					Log.d(Config.LOGTAG, "ibb open failed");
+					Logging.d(Config.LOGTAG, "ibb open failed");
 				}
 
 				@Override
@@ -792,7 +792,7 @@ public class JingleConnection implements Transferable {
 
 			@Override
 			public void failed() {
-				Log.d(Config.LOGTAG,
+				Logging.d(Config.LOGTAG,
 						"connection failed with " + candidate.getHost() + ":"
 								+ candidate.getPort());
 				connectNextCandidate();
@@ -800,7 +800,7 @@ public class JingleConnection implements Transferable {
 
 			@Override
 			public void established() {
-				Log.d(Config.LOGTAG,
+				Logging.d(Config.LOGTAG,
 						"established connection with " + candidate.getHost()
 								+ ":" + candidate.getPort());
 				sendCandidateUsed(candidate.getCid());
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
index cadf9df3..3353beb1 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
@@ -6,7 +6,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 import android.annotation.SuppressLint;
-import android.util.Log;
+import de.thedevstack.conversationsplus.utils.Logging;
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.entities.Transferable;
@@ -153,9 +153,9 @@ public class JingleConnectionManager extends AbstractConnectionManager {
 					}
 				}
 			}
-			Log.d(Config.LOGTAG,"couldn't deliver payload: " + payload.toString());
+			Logging.d(Config.LOGTAG,"couldn't deliver payload: " + payload.toString());
 		} else {
-			Log.d(Config.LOGTAG, "no sid found in incoming ibb packet");
+			Logging.d(Config.LOGTAG, "no sid found in incoming ibb packet");
 		}
 	}
 
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java
index 02f58750..3b4bc4d8 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java
@@ -8,7 +8,7 @@ import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
 
 import android.util.Base64;
-import android.util.Log;
+import de.thedevstack.conversationsplus.utils.Logging;
 
 import de.thedevstack.conversationsplus.utils.StreamUtil;
 
@@ -97,13 +97,13 @@ public class JingleInbandTransport extends JingleTransport {
 			file.createNewFile();
 			this.fileOutputStream = file.createOutputStream();
 			if (this.fileOutputStream == null) {
-				Log.d(Config.LOGTAG,account.getJid().toBareJid()+": could not create output stream");
+				Logging.d(Config.LOGTAG,account.getJid().toBareJid()+": could not create output stream");
 				callback.onFileTransferAborted();
 				return;
 			}
 			this.remainingSize = this.fileSize = file.getExpectedSize();
 		} catch (final NoSuchAlgorithmException | IOException e) {
-			Log.d(Config.LOGTAG,account.getJid().toBareJid()+" "+e.getMessage());
+			Logging.d(Config.LOGTAG,account.getJid().toBareJid()+" "+e.getMessage());
 			callback.onFileTransferAborted();
 		}
     }
@@ -124,7 +124,7 @@ public class JingleInbandTransport extends JingleTransport {
 			this.digest.reset();
 			fileInputStream = this.file.createInputStream();
 			if (fileInputStream == null) {
-				Log.d(Config.LOGTAG,account.getJid().toBareJid()+": could no create input stream");
+				Logging.d(Config.LOGTAG,account.getJid().toBareJid()+": could no create input stream");
 				callback.onFileTransferAborted();
 				return;
 			}
@@ -133,7 +133,7 @@ public class JingleInbandTransport extends JingleTransport {
 			}
 		} catch (NoSuchAlgorithmException e) {
 			callback.onFileTransferAborted();
-			Log.d(Config.LOGTAG,account.getJid().toBareJid()+": "+e.getMessage());
+			Logging.d(Config.LOGTAG,account.getJid().toBareJid()+": "+e.getMessage());
 		}
 	}
 
@@ -191,7 +191,7 @@ public class JingleInbandTransport extends JingleTransport {
 				fileInputStream.close();
 			}
 		} catch (IOException e) {
-			Log.d(Config.LOGTAG,account.getJid().toBareJid()+": "+e.getMessage());
+			Logging.d(Config.LOGTAG,account.getJid().toBareJid()+": "+e.getMessage());
 			StreamUtil.close(fileInputStream);
 			this.onFileTransmissionStatusChanged.onFileTransferAborted();
 		}
@@ -215,7 +215,7 @@ public class JingleInbandTransport extends JingleTransport {
 				connection.updateProgress((int) ((((double) (this.fileSize - this.remainingSize)) / this.fileSize) * 100));
 			}
 		} catch (IOException e) {
-			Log.d(Config.LOGTAG,account.getJid().toBareJid()+": "+e.getMessage());
+			Logging.d(Config.LOGTAG,account.getJid().toBareJid()+": "+e.getMessage());
 			StreamUtil.close(fileOutputStream);
 			this.onFileTransmissionStatusChanged.onFileTransferAborted();
 		}
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 6e708f56..29d77417 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java
@@ -1,6 +1,6 @@
 package eu.siacs.conversations.xmpp.jingle;
 
-import android.util.Log;
+import de.thedevstack.conversationsplus.utils.Logging;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -110,7 +110,7 @@ public class JingleSocks5Transport extends JingleTransport {
 					digest.reset();
 					fileInputStream = file.createInputStream();
 					if (fileInputStream == null) {
-						Log.d(Config.LOGTAG, connection.getAccount().getJid().toBareJid() + ": could not create input stream");
+						Logging.d(Config.LOGTAG, connection.getAccount().getJid().toBareJid() + ": could not create input stream");
 						callback.onFileTransferAborted();
 						return;
 					}
@@ -130,13 +130,13 @@ public class JingleSocks5Transport extends JingleTransport {
 						callback.onFileTransmitted(file);
 					}
 				} catch (FileNotFoundException e) {
-					Log.d(Config.LOGTAG, connection.getAccount().getJid().toBareJid() + ": "+e.getMessage());
+					Logging.d(Config.LOGTAG, connection.getAccount().getJid().toBareJid() + ": "+e.getMessage());
 					callback.onFileTransferAborted();
 				} catch (IOException e) {
-					Log.d(Config.LOGTAG, connection.getAccount().getJid().toBareJid() + ": "+e.getMessage());
+					Logging.d(Config.LOGTAG, connection.getAccount().getJid().toBareJid() + ": "+e.getMessage());
 					callback.onFileTransferAborted();
 				} catch (NoSuchAlgorithmException e) {
-					Log.d(Config.LOGTAG, connection.getAccount().getJid().toBareJid() + ": "+e.getMessage());
+					Logging.d(Config.LOGTAG, connection.getAccount().getJid().toBareJid() + ": "+e.getMessage());
 					callback.onFileTransferAborted();
 				} finally {
 					StreamUtil.close(fileInputStream);
@@ -162,7 +162,7 @@ public class JingleSocks5Transport extends JingleTransport {
 					fileOutputStream = file.createOutputStream();
 					if (fileOutputStream == null) {
 						callback.onFileTransferAborted();
-						Log.d(Config.LOGTAG, connection.getAccount().getJid().toBareJid() + ": could not create output stream");
+						Logging.d(Config.LOGTAG, connection.getAccount().getJid().toBareJid() + ": could not create output stream");
 						return;
 					}
 					double size = file.getExpectedSize();
@@ -173,7 +173,7 @@ public class JingleSocks5Transport extends JingleTransport {
 						count = inputStream.read(buffer);
 						if (count == -1) {
 							callback.onFileTransferAborted();
-							Log.d(Config.LOGTAG, connection.getAccount().getJid().toBareJid() + ": file ended prematurely with "+remainingSize+" bytes remaining");
+							Logging.d(Config.LOGTAG, connection.getAccount().getJid().toBareJid() + ": file ended prematurely with "+remainingSize+" bytes remaining");
 							return;
 						} else {
 							fileOutputStream.write(buffer, 0, count);
@@ -187,13 +187,13 @@ public class JingleSocks5Transport extends JingleTransport {
 					file.setSha1Sum(CryptoHelper.bytesToHex(digest.digest()));
 					callback.onFileTransmitted(file);
 				} catch (FileNotFoundException e) {
-					Log.d(Config.LOGTAG, connection.getAccount().getJid().toBareJid() + ": "+e.getMessage());
+					Logging.d(Config.LOGTAG, connection.getAccount().getJid().toBareJid() + ": "+e.getMessage());
 					callback.onFileTransferAborted();
 				} catch (IOException e) {
-					Log.d(Config.LOGTAG, connection.getAccount().getJid().toBareJid() + ": "+e.getMessage());
+					Logging.d(Config.LOGTAG, connection.getAccount().getJid().toBareJid() + ": "+e.getMessage());
 					callback.onFileTransferAborted();
 				} catch (NoSuchAlgorithmException e) {
-					Log.d(Config.LOGTAG, connection.getAccount().getJid().toBareJid() + ": "+e.getMessage());
+					Logging.d(Config.LOGTAG, connection.getAccount().getJid().toBareJid() + ": "+e.getMessage());
 					callback.onFileTransferAborted();
 				} finally {
 					StreamUtil.close(fileOutputStream);