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

2 files changed, 7 insertions, 7 deletions

diff --git a/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java b/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
index 3d8bba13..8c062c91 100644
--- a/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
+++ b/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
@@ -3,7 +3,7 @@ package eu.siacs.conversations.http;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.SystemClock;
-import android.util.Log;
+import de.thedevstack.conversationsplus.utils.Logging;
 
 import java.io.BufferedInputStream;
 import java.io.IOException;
@@ -145,7 +145,7 @@ public class HttpDownloadConnection implements Transferable {
 				HttpDownloadConnection.this.mXmppConnectionService.getNotificationService().push(message);
 				return;
 			} catch (IOException e) {
-				Log.d(Config.LOGTAG, "io exception in http file size checker: " + e.getMessage());
+				Logging.d(Config.LOGTAG, "io exception in http file size checker: " + e.getMessage());
 				if (interactive) {
 					mXmppConnectionService.showErrorToastInUi(R.string.file_not_found_on_remote_host);
 				}
@@ -164,7 +164,7 @@ public class HttpDownloadConnection implements Transferable {
 		}
 
 		private long retrieveFileSize() throws IOException {
-			Log.d(Config.LOGTAG,"retrieve file size. interactive:"+String.valueOf(interactive));
+			Logging.d(Config.LOGTAG,"retrieve file size. interactive:"+String.valueOf(interactive));
 			changeStatus(STATUS_CHECKING);
 			HttpURLConnection connection = (HttpURLConnection) mUrl.openConnection();
 			connection.setRequestMethod("HEAD");
diff --git a/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java b/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java
index 1fee4e58..5a5d8898 100644
--- a/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java
+++ b/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java
@@ -1,7 +1,7 @@
 package eu.siacs.conversations.http;
 
 import android.app.PendingIntent;
-import android.util.Log;
+import de.thedevstack.conversationsplus.utils.Logging;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -135,7 +135,7 @@ public class HttpUploadConnection implements Transferable {
 			InputStream is = null;
 			HttpURLConnection connection = null;
 			try {
-				Log.d(Config.LOGTAG, "uploading to " + mPutUrl.toString());
+				Logging.d(Config.LOGTAG, "uploading to " + mPutUrl.toString());
 				connection = (HttpURLConnection) mPutUrl.openConnection();
 				if (connection instanceof HttpsURLConnection) {
 					mHttpConnectionManager.setupTrustManager((HttpsURLConnection) connection, true);
@@ -160,7 +160,7 @@ public class HttpUploadConnection implements Transferable {
 				is.close();
 				int code = connection.getResponseCode();
 				if (code == 200 || code == 201) {
-					Log.d(Config.LOGTAG, "finished uploading file");
+					Logging.d(Config.LOGTAG, "finished uploading file");
 					Message.FileParams params = message.getFileParams();
 					if (key != null) {
 						mGetUrl = new URL(mGetUrl.toString() + "#" + CryptoHelper.bytesToHex(key));
@@ -192,7 +192,7 @@ public class HttpUploadConnection implements Transferable {
 					fail();
 				}
 			} catch (IOException e) {
-				Log.d(Config.LOGTAG, e.getMessage());
+				Logging.d(Config.LOGTAG, e.getMessage());
 				fail();
 			} finally {
 				StreamUtil.close(is);