From 11a2ec1d3ed3e3dcd182e30ded3bd93e2286795e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Abel=20Garc=C3=ADa=20de=20Prada?= Date: Thu, 16 Jan 2020 13:00:12 +0100 Subject: [PATCH] Replace stacktrace with timber log --- .../android/lib/common/accounts/AccountUtils.java | 2 +- .../authentication/OwnCloudBasicCredentials.java | 2 -- .../authentication/oauth/OAuth2QueryParser.java | 2 -- .../lib/common/network/AdvancedX509TrustManager.java | 3 --- .../android/lib/common/network/FileRequestBody.java | 10 +++------- .../lib/resources/files/CopyRemoteFileOperation.java | 11 +++-------- .../lib/resources/files/MoveRemoteFileOperation.java | 12 ++++-------- .../lib/resources/files/ReadRemoteFileOperation.java | 3 +-- .../android/lib/resources/shares/ShareXMLParser.kt | 2 -- 9 files changed, 12 insertions(+), 35 deletions(-) diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/accounts/AccountUtils.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/accounts/AccountUtils.java index 649fb630..309344fa 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/accounts/AccountUtils.java +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/accounts/AccountUtils.java @@ -64,7 +64,7 @@ public class AccountUtils { webDavUrlForAccount = getBaseUrlForAccount(context, account) + OwnCloudClient.WEBDAV_FILES_PATH_4_0 + ownCloudCredentials.getUsername(); } catch (OperationCanceledException | AuthenticatorException | IOException e) { - e.printStackTrace(); + Timber.e(e); } return webDavUrlForAccount; diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java index ab1ba3ef..29c5ee54 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java @@ -31,8 +31,6 @@ import okhttp3.internal.Util; public class OwnCloudBasicCredentials implements OwnCloudCredentials { - private static final String TAG = OwnCloudCredentials.class.getSimpleName(); - private String mUsername; private String mPassword; diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/authentication/oauth/OAuth2QueryParser.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/authentication/oauth/OAuth2QueryParser.java index 152ffdbe..6ef50447 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/authentication/oauth/OAuth2QueryParser.java +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/authentication/oauth/OAuth2QueryParser.java @@ -33,8 +33,6 @@ import java.util.Map; public class OAuth2QueryParser { - private static final String TAG = OAuth2QueryParser.class.getName(); - private Map mOAuth2ParsedAuthorizationResponse; public OAuth2QueryParser() { diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/network/AdvancedX509TrustManager.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/network/AdvancedX509TrustManager.java index f2513c3c..d76ecbca 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/network/AdvancedX509TrustManager.java +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/network/AdvancedX509TrustManager.java @@ -43,11 +43,8 @@ import java.security.cert.X509Certificate; */ public class AdvancedX509TrustManager implements X509TrustManager { - private static final String TAG = AdvancedX509TrustManager.class.getSimpleName(); - private X509TrustManager mStandardTrustManager; private KeyStore mKnownServersKeyStore; - /** * Constructor for AdvancedX509TrustManager * diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/network/FileRequestBody.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/network/FileRequestBody.java index 520d9a37..c7456ca5 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/network/FileRequestBody.java +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/network/FileRequestBody.java @@ -24,13 +24,12 @@ package com.owncloud.android.lib.common.network; -import android.util.Log; - import okhttp3.MediaType; import okhttp3.RequestBody; import okio.BufferedSink; import okio.Okio; import okio.Source; +import timber.log.Timber; import java.io.File; import java.util.Collection; @@ -45,8 +44,6 @@ import java.util.Set; */ public class FileRequestBody extends RequestBody implements ProgressiveDataTransferer { - private static final String TAG = FileRequestBody.class.getSimpleName(); - protected File mFile; private MediaType mContentType; final Set mDataTransferListeners = new HashSet<>(); @@ -87,11 +84,10 @@ public class FileRequestBody extends RequestBody implements ProgressiveDataTrans } } - Log.d(TAG, "File with name " + mFile.getName() + " and size " + mFile.length() + - " written in request body"); + Timber.d("File with name " + mFile.getName() + " and size " + mFile.length() + " written in request body"); } catch (Exception e) { - e.printStackTrace(); + Timber.e(e); } } diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java index f41c8220..258f44bc 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java @@ -24,8 +24,6 @@ package com.owncloud.android.lib.resources.files; -import android.util.Log; - import com.owncloud.android.lib.common.OwnCloudClient; import com.owncloud.android.lib.common.http.HttpConstants; import com.owncloud.android.lib.common.http.methods.webdav.CopyMethod; @@ -33,6 +31,7 @@ import com.owncloud.android.lib.common.network.WebdavUtils; import com.owncloud.android.lib.common.operations.RemoteOperation; import com.owncloud.android.lib.common.operations.RemoteOperationResult; import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode; +import timber.log.Timber; import java.net.URL; import java.util.concurrent.TimeUnit; @@ -49,8 +48,6 @@ import java.util.concurrent.TimeUnit; */ public class CopyRemoteFileOperation extends RemoteOperation { - private static final String TAG = CopyRemoteFileOperation.class.getSimpleName(); - private static final int COPY_READ_TIMEOUT = 600000; private static final int COPY_CONNECTION_TIMEOUT = 5000; @@ -120,13 +117,11 @@ public class CopyRemoteFileOperation extends RemoteOperation { client.exhaustResponse(copyMethod.getResponseBodyAsStream()); } - Log.i(TAG, "Copy " + mSrcRemotePath + " to " + mTargetRemotePath + ": " + - result.getLogMessage()); + Timber.i("Copy " + mSrcRemotePath + " to " + mTargetRemotePath + ": " + result.getLogMessage()); } catch (Exception e) { result = new RemoteOperationResult<>(e); - Log.e(TAG, "Copy " + mSrcRemotePath + " to " + mTargetRemotePath + ": " + - result.getLogMessage(), e); + Timber.e(e, "Copy " + mSrcRemotePath + " to " + mTargetRemotePath + ": " + result.getLogMessage()); } return result; diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java index d6275c1d..d131fe67 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java @@ -25,7 +25,6 @@ package com.owncloud.android.lib.resources.files; import android.net.Uri; -import android.util.Log; import com.owncloud.android.lib.common.OwnCloudClient; import com.owncloud.android.lib.common.http.HttpConstants; @@ -34,6 +33,7 @@ import com.owncloud.android.lib.common.network.WebdavUtils; import com.owncloud.android.lib.common.operations.RemoteOperation; import com.owncloud.android.lib.common.operations.RemoteOperationResult; import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode; +import timber.log.Timber; import java.net.URL; import java.util.concurrent.TimeUnit; @@ -49,8 +49,6 @@ import java.util.concurrent.TimeUnit; */ public class MoveRemoteFileOperation extends RemoteOperation { - private static final String TAG = MoveRemoteFileOperation.class.getSimpleName(); - private static final int MOVE_READ_TIMEOUT = 600000; private static final int MOVE_CONNECTION_TIMEOUT = 5000; @@ -132,13 +130,11 @@ public class MoveRemoteFileOperation extends RemoteOperation { client.exhaustResponse(move.getResponseBodyAsStream()); } - Log.i(TAG, "Move " + mSrcRemotePath + " to " + mTargetRemotePath + ": " + - result.getLogMessage()); + Timber.i("Move " + mSrcRemotePath + " to " + mTargetRemotePath + ": " + result.getLogMessage()); } catch (Exception e) { result = new RemoteOperationResult<>(e); - Log.e(TAG, "Move " + mSrcRemotePath + " to " + mTargetRemotePath + ": " + - result.getLogMessage(), e); + Timber.e(e, "Move " + mSrcRemotePath + " to " + mTargetRemotePath + ": " + result.getLogMessage()); } return result; @@ -147,4 +143,4 @@ public class MoveRemoteFileOperation extends RemoteOperation { protected boolean isSuccess(int status) { return status == HttpConstants.HTTP_CREATED || status == HttpConstants.HTTP_NO_CONTENT; } -} \ No newline at end of file +} diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java index d18be319..9149e6d3 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java @@ -99,8 +99,7 @@ public class ReadRemoteFileOperation extends RemoteOperation { } catch (Exception e) { result = new RemoteOperationResult<>(e); - e.printStackTrace(); - Timber.e(result.getException(), "Synchronizing file " + mRemotePath + ": " + result.getLogMessage()); + Timber.e(e, "Synchronizing file %s", mRemotePath); } return result; diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/ShareXMLParser.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/ShareXMLParser.kt index c9ef0c12..105fb4d6 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/ShareXMLParser.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/ShareXMLParser.kt @@ -383,8 +383,6 @@ class ShareXMLParser { companion object { - //private static final String TAG = ShareXMLParser.class.getSimpleName(); - // No namespaces private val ns: String? = null