Build sample app successful

.gitignore

@@ -19,11 +19,6 @@ gen/
 # Local configuration files (sdk path, etc)
 .gradle/
 local.properties
-sample_client/local.properties
 
 # Mac .DS_Store files
 .DS_Store
-
-# Proguard README
-proguard-project.txt
-sample_client/proguard-project.txt

build.gradle

@@ -1,15 +1,15 @@
 buildscript {
     ext {
         // Libraries
-        kotlinVersion = '1.3.50'
+        kotlinVersion = '1.3.61'
     }
 
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.2'
+        classpath 'com.android.tools.build:gradle:3.5.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlinVersion"
     }

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-all.zip

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/accounts/AccountUtils.java

@@ -64,7 +64,7 @@ public static String getWebDavUrlForAccount(Context context, Account account)
             webDavUrlForAccount = getBaseUrlForAccount(context, account) + OwnCloudClient.WEBDAV_FILES_PATH_4_0
                     + ownCloudCredentials.getUsername();
         } catch (OperationCanceledException | AuthenticatorException | IOException e) {
-            e.printStackTrace();
+            Timber.e(e);
         }
 
         return webDavUrlForAccount;

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java

@@ -31,8 +31,6 @@
 
 public class OwnCloudBasicCredentials implements OwnCloudCredentials {
 
-    private static final String TAG = OwnCloudCredentials.class.getSimpleName();
-
     private String mUsername;
     private String mPassword;
 

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/authentication/oauth/OAuth2QueryParser.java

@@ -33,8 +33,6 @@
 
 public class OAuth2QueryParser {
 
-    private static final String TAG = OAuth2QueryParser.class.getName();
-
     private Map<String, String> mOAuth2ParsedAuthorizationResponse;
 
     public OAuth2QueryParser() {

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/network/AdvancedX509TrustManager.java

@@ -43,11 +43,8 @@
  */
 public class AdvancedX509TrustManager implements X509TrustManager {
 
-    private static final String TAG = AdvancedX509TrustManager.class.getSimpleName();
-
     private X509TrustManager mStandardTrustManager;
     private KeyStore mKnownServersKeyStore;
-
     /**
      * Constructor for AdvancedX509TrustManager
      *

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 @@
  */
 public class FileRequestBody extends RequestBody implements ProgressiveDataTransferer {
 
-    private static final String TAG = FileRequestBody.class.getSimpleName();
-
     protected File mFile;
     private MediaType mContentType;
     final Set<OnDatatransferProgressListener> mDataTransferListeners = new HashSet<>();
@@ -87,11 +84,10 @@ public void writeTo(BufferedSink sink) {
                 }
             }
 
-            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);
         }
     }
 

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java

@@ -24,15 +24,14 @@
 
 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;
 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 @@
  */
 public class CopyRemoteFileOperation extends RemoteOperation<String> {
 
-    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 @@ protected RemoteOperationResult<String> run(OwnCloudClient client) {
                 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;

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.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 @@
  */
 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 @@ protected RemoteOperationResult run(OwnCloudClient client) {
                 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 @@ protected RemoteOperationResult run(OwnCloudClient client) {
     protected boolean isSuccess(int status) {
         return status == HttpConstants.HTTP_CREATED || status == HttpConstants.HTTP_NO_CONTENT;
     }
-}
+}

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java

@@ -99,8 +99,7 @@ protected RemoteOperationResult<RemoteFile> run(OwnCloudClient client) {
 
         } 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;

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