Implements FS#67: Introduce central logging class to use log prefix, new activity to show logcat output and button to copy contents

2 files changed, 7 insertions, 7 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/http/HttpDownloadConnection.java b/src/main/java/de/thedevstack/conversationsplus/http/HttpDownloadConnection.java
index b958e57e..c0a169ee 100644
--- a/src/main/java/de/thedevstack/conversationsplus/http/HttpDownloadConnection.java
+++ b/src/main/java/de/thedevstack/conversationsplus/http/HttpDownloadConnection.java
@@ -3,7 +3,7 @@ package de.thedevstack.conversationsplus.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;
@@ -144,7 +144,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);
 				}
@@ -163,7 +163,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/de/thedevstack/conversationsplus/http/HttpUploadConnection.java b/src/main/java/de/thedevstack/conversationsplus/http/HttpUploadConnection.java
index 05d3a129..3d12681f 100644
--- a/src/main/java/de/thedevstack/conversationsplus/http/HttpUploadConnection.java
+++ b/src/main/java/de/thedevstack/conversationsplus/http/HttpUploadConnection.java
@@ -1,7 +1,7 @@
 package de.thedevstack.conversationsplus.http;
 
 import android.app.PendingIntent;
-import android.util.Log;
+import de.thedevstack.conversationsplus.utils.Logging;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -134,7 +134,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);
@@ -159,7 +159,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));
@@ -191,7 +191,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);