From 073a91c58031fa18c62ce328d597f9ac5697e061 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Abel=20Garc=C3=ADa=20de=20Prada?= <abelgardep@gmail.com>
Date: Mon, 13 Jan 2020 14:17:48 +0100
Subject: [PATCH] Update logcat library

---
 owncloudComLibrary/build.gradle                               | 2 +-
 .../java/com/owncloud/android/lib/common/OwnCloudClient.java  | 4 ++--
 .../com/owncloud/android/lib/common/SimpleFactoryManager.java | 2 +-
 .../com/owncloud/android/lib/common/utils/LoggingHelper.kt    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/owncloudComLibrary/build.gradle b/owncloudComLibrary/build.gradle
index a9a1825c..031b5383 100644
--- a/owncloudComLibrary/build.gradle
+++ b/owncloudComLibrary/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     api 'com.squareup.okhttp3:okhttp:3.12.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
     api 'com.gitlab.ownclouders:dav4android:oc_support_1.0.1'
-    api 'com.github.hannesa2:Logcat:1.5.6'
+    api 'com.github.hannesa2:Logcat:1.6.0'
 }
 
 allOpen {
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/OwnCloudClient.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/OwnCloudClient.java
index cbe88718..fc970891 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/OwnCloudClient.java
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/OwnCloudClient.java
@@ -84,7 +84,7 @@ public class OwnCloudClient extends HttpClient {
         mBaseUri = baseUri;
 
         mInstanceNumber = sIntanceCounter++;
-        Timber.d(" #" + mInstanceNumber + "Creating OwnCloudClient");
+        Timber.d("#" + mInstanceNumber + "Creating OwnCloudClient");
 
         clearCredentials();
         clearCookies();
@@ -161,7 +161,7 @@ public class OwnCloudClient extends HttpClient {
         // Header to allow tracing requests in apache and ownCloud logs
         addHeaderForAllRequests(OC_X_REQUEST_ID, requestId);
 
-        Timber.d("Executing " + method.getClass().getSimpleName() + " in request with id " + requestId);
+        Timber.d("Executing in request with id %s", requestId);
     }
 
     public RedirectionPath followRedirection(HttpBaseMethod method) throws Exception {
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/SimpleFactoryManager.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/SimpleFactoryManager.java
index d039162e..4d5ebfa3 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/SimpleFactoryManager.java
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/SimpleFactoryManager.java
@@ -46,7 +46,7 @@ public class SimpleFactoryManager implements OwnCloudClientManager {
                 context.getApplicationContext(),
                 true);
 
-        Timber.v("    new client {" + (account.getName() != null ? account.getName() :
+        Timber.v("new client {" + (account.getName() != null ? account.getName() :
                 AccountUtils.buildAccountName(account.getBaseUri(), "")) + ", " + client.hashCode() + "}");
 
         if (account.getCredentials() == null) {
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/utils/LoggingHelper.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/utils/LoggingHelper.kt
index b2fd1627..1418f500 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/utils/LoggingHelper.kt
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/utils/LoggingHelper.kt
@@ -13,7 +13,7 @@ object LoggingHelper {
         }
         if (!directory.exists())
             directory.mkdirs()
-        Timber.plant(FileLoggingTree(directory, filename = storagePath, delegator = Timber::class.java))
+        Timber.plant(FileLoggingTree(directory, filename = storagePath))
     }
 
     fun stopLogging() {