fix lint and compile issues

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/ConnectionValidator.kt

@@ -25,7 +25,7 @@ class ConnectionValidator (
             var validationRetryCount = 0
             val client = OwnCloudClient(baseClient.baseUri, null, false, singleSessionManager)
             if (clearCookiesOnValidation) {
-                client.clearCookies();
+                client.clearCookies()
             } else {
                 client.cookiesForBaseUri = baseClient.cookiesForBaseUri
             }

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/HttpClient.java

@@ -26,7 +26,6 @@ package com.owncloud.android.lib.common.http;
 
 import android.content.Context;
 
-import com.facebook.stetho.okhttp3.StethoInterceptor;
 import com.owncloud.android.lib.common.network.AdvancedX509TrustManager;
 import com.owncloud.android.lib.common.network.NetworkUtils;
 import okhttp3.Cookie;

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/PropfindMethod.kt

@@ -50,7 +50,7 @@ class PropfindMethod(
     public override fun onExecute(): Int {
         davResource.propfind(
             depth = depth,
-            reqProp = *propertiesToRequest,
+            reqProp = propertiesToRequest,
             listOfHeaders = super.getRequestHeadersAsHashMap(),
             callback = { response: Response, hrefRelation: HrefRelation? ->
                 when (hrefRelation) {

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

@@ -27,7 +27,6 @@ import com.owncloud.android.lib.common.OwnCloudClient
 import com.owncloud.android.lib.common.http.HttpConstants
 import com.owncloud.android.lib.common.http.methods.webdav.DavUtils
 import com.owncloud.android.lib.common.http.methods.webdav.PropfindMethod
-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 timber.log.Timber
@@ -58,7 +57,7 @@ class GetBaseUrlRemoteOperation : RemoteOperation<String?>() {
             else RemoteOperationResult<String?>(propFindMethod).apply { data = null }
         } catch (e: Exception) {
             Timber.e(e, "Could not get actuall (or redirected) base URL from base url (/).")
-            RemoteOperationResult<String?>(e);
+            RemoteOperationResult<String?>(e)
         }
     }
 

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.kt

@@ -30,9 +30,7 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult
 import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode
 import com.owncloud.android.lib.resources.status.HttpScheme.HTTPS_PREFIX
 import com.owncloud.android.lib.resources.status.HttpScheme.HTTP_PREFIX
-import com.owncloud.android.lib.resources.status.HttpScheme.HTTP_SCHEME
 import org.json.JSONException
-import timber.log.Timber
 
 /**
  * Checks if the server is valid

sample_client/src/main/java/com/owncloud/android/lib/sampleclient/MainActivity.java

@@ -0,0 +1,302 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2020 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
+package com.owncloud.android.lib.sampleclient;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.res.AssetManager;
+import android.graphics.drawable.BitmapDrawable;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.view.View;
+import android.widget.ListView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.owncloud.android.lib.common.ConnectionValidator;
+import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.SingleSessionManager;
+import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory;
+import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;
+import com.owncloud.android.lib.common.operations.OnRemoteOperationListener;
+import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+import com.owncloud.android.lib.resources.files.DownloadRemoteFileOperation;
+import com.owncloud.android.lib.resources.files.ReadRemoteFolderOperation;
+import com.owncloud.android.lib.resources.files.RemoteFile;
+import com.owncloud.android.lib.resources.files.RemoveRemoteFileOperation;
+import com.owncloud.android.lib.resources.files.UploadRemoteFileOperation;
+import timber.log.Timber;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+public class MainActivity extends Activity implements OnRemoteOperationListener, OnDatatransferProgressListener {
+
+    private Handler mHandler;
+    private OwnCloudClient mClient;
+    private FilesArrayAdapter mFilesAdapter;
+    private View mFrame;
+
+    /**
+     * Called when the activity is first created.
+     */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.main);
+
+        Timber.plant();
+        mHandler = new Handler();
+
+        final Uri serverUri = Uri.parse(getString(R.string.server_base_url));
+
+        SingleSessionManager.setUserAgent(getUserAgent());
+        SingleSessionManager.setConnectionValidator(new ConnectionValidator(this, false));
+        mClient = new OwnCloudClient(serverUri,
+               SingleSessionManager.getConnectionValidator(),
+                true,
+                SingleSessionManager.getDefaultSingleton());
+        mClient.setCredentials(
+                OwnCloudCredentialsFactory.newBasicCredentials(
+                        getString(R.string.username),
+                        getString(R.string.password)
+                )
+        );
+
+        mFilesAdapter = new FilesArrayAdapter(this, R.layout.file_in_list);
+        ((ListView) findViewById(R.id.list_view)).setAdapter(mFilesAdapter);
+
+        // TODO move to background thread or task
+        AssetManager assets = getAssets();
+        try {
+            String sampleFileName = getString(R.string.sample_file_name);
+            File upFolder = new File(getCacheDir(), getString(R.string.upload_folder_path));
+            upFolder.mkdir();
+            File upFile = new File(upFolder, sampleFileName);
+            FileOutputStream fos = new FileOutputStream(upFile);
+            InputStream is = assets.open(sampleFileName);
+            int count;
+            byte[] buffer = new byte[1024];
+            while ((count = is.read(buffer, 0, buffer.length)) >= 0) {
+                fos.write(buffer, 0, count);
+            }
+            is.close();
+            fos.close();
+        } catch (IOException e) {
+            Toast.makeText(this, R.string.error_copying_sample_file, Toast.LENGTH_SHORT).show();
+            Timber.e(e, getString(R.string.error_copying_sample_file));
+        }
+
+        mFrame = findViewById(R.id.frame);
+    }
+
+    @Override
+    public void onDestroy() {
+        File upFolder = new File(getCacheDir(), getString(R.string.upload_folder_path));
+        File upFile = upFolder.listFiles()[0];
+        upFile.delete();
+        upFolder.delete();
+        super.onDestroy();
+    }
+
+    public void onClickHandler(View button) {
+        switch (button.getId()) {
+            case R.id.button_refresh:
+                startRefresh();
+                break;
+            case R.id.button_upload:
+                startUpload();
+                break;
+            case R.id.button_delete_remote:
+                startRemoteDeletion();
+                break;
+            case R.id.button_download:
+                startDownload();
+                break;
+            case R.id.button_delete_local:
+                startLocalDeletion();
+                break;
+            default:
+                Toast.makeText(this, R.string.youre_doing_it_wrong, Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    private void startRefresh() {
+        ReadRemoteFolderOperation refreshOperation = new ReadRemoteFolderOperation(File.separator);
+        refreshOperation.execute(mClient, this, mHandler);
+    }
+
+    private void startUpload() {
+        File upFolder = new File(getCacheDir(), getString(R.string.upload_folder_path));
+        File fileToUpload = upFolder.listFiles()[0];
+        String remotePath = File.separator + fileToUpload.getName();
+        String mimeType = getString(R.string.sample_file_mimetype);
+
+        // Get the last modification date of the file from the file system
+        long timeStampLong = fileToUpload.lastModified() / 1000;
+        String timeStamp = Long.toString(timeStampLong);
+
+        UploadRemoteFileOperation uploadOperation = new UploadRemoteFileOperation(fileToUpload.getAbsolutePath(),
+                remotePath, mimeType, timeStamp);
+        uploadOperation.addDatatransferProgressListener(this);
+        uploadOperation.execute(mClient, this, mHandler);
+    }
+
+    private void startRemoteDeletion() {
+        File upFolder = new File(getCacheDir(), getString(R.string.upload_folder_path));
+        File fileToUpload = upFolder.listFiles()[0];
+        String remotePath = File.separator + fileToUpload.getName();
+
+        RemoveRemoteFileOperation removeOperation = new RemoveRemoteFileOperation(remotePath);
+        removeOperation.execute(mClient, this, mHandler);
+    }
+
+    private void startDownload() {
+        File downFolder = new File(getCacheDir(), getString(R.string.download_folder_path));
+        downFolder.mkdir();
+        File upFolder = new File(getCacheDir(), getString(R.string.upload_folder_path));
+        File fileToUpload = upFolder.listFiles()[0];
+        String remotePath = File.separator + fileToUpload.getName();
+
+        DownloadRemoteFileOperation downloadOperation = new DownloadRemoteFileOperation(remotePath,
+                downFolder.getAbsolutePath());
+        downloadOperation.addDatatransferProgressListener(this);
+        downloadOperation.execute(mClient, this, mHandler);
+    }
+
+    private void startLocalDeletion() {
+        File downFolder = new File(getCacheDir(), getString(R.string.download_folder_path));
+        File downloadedFile = downFolder.listFiles()[0];
+        if (!downloadedFile.delete() && downloadedFile.exists()) {
+            Toast.makeText(this, R.string.error_deleting_local_file, Toast.LENGTH_SHORT).show();
+        } else {
+            ((TextView) findViewById(R.id.download_progress)).setText("0%");
+            findViewById(R.id.frame).setBackgroundDrawable(null);
+        }
+    }
+
+    @Override
+    public void onRemoteOperationFinish(RemoteOperation operation, RemoteOperationResult result) {
+        if (!result.isSuccess()) {
+            Toast.makeText(this, R.string.todo_operation_finished_in_fail, Toast.LENGTH_SHORT).show();
+            Timber.e(result.getException(), result.getLogMessage());
+
+        } else if (operation instanceof ReadRemoteFolderOperation) {
+            onSuccessfulRefresh(result);
+
+        } else if (operation instanceof com.owncloud.android.lib.resources.files.UploadRemoteFileOperation) {
+            onSuccessfulUpload();
+
+        } else if (operation instanceof RemoveRemoteFileOperation) {
+            onSuccessfulRemoteDeletion();
+
+        } else if (operation instanceof DownloadRemoteFileOperation) {
+            onSuccessfulDownload();
+
+        } else {
+            Toast.makeText(this, R.string.todo_operation_finished_in_success, Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    private void onSuccessfulRefresh(RemoteOperationResult result) {
+        mFilesAdapter.clear();
+        List<RemoteFile> files = new ArrayList<>();
+        for (RemoteFile remoteFile : (List<RemoteFile>) result.getData()) {
+            files.add(remoteFile);
+        }
+        for (RemoteFile file : files) {
+            mFilesAdapter.add(file);
+        }
+        mFilesAdapter.remove(mFilesAdapter.getItem(0));
+        mFilesAdapter.notifyDataSetChanged();
+    }
+
+    private void onSuccessfulUpload() {
+        startRefresh();
+    }
+
+    private void onSuccessfulRemoteDeletion() {
+        startRefresh();
+        TextView progressView = findViewById(R.id.upload_progress);
+        if (progressView != null) {
+            progressView.setText("0%");
+        }
+    }
+
+    private void onSuccessfulDownload() {
+        File downFolder = new File(getCacheDir(), getString(R.string.download_folder_path));
+        File downloadedFile = downFolder.listFiles()[0];
+        BitmapDrawable bDraw = new BitmapDrawable(getResources(), downloadedFile.getAbsolutePath());
+        mFrame.setBackgroundDrawable(bDraw);
+    }
+
+    @SuppressLint("SetTextI18n")
+    @Override
+    public void onTransferProgress(long progressRate, long totalTransferredSoFar, long totalToTransfer, String fileName) {
+        final long percentage = (totalToTransfer > 0 ? totalTransferredSoFar * 100 / totalToTransfer : 0);
+        final boolean upload = fileName.contains(getString(R.string.upload_folder_path));
+        Timber.d("progressRate %s", percentage);
+        mHandler.post(() -> {
+            TextView progressView;
+            if (upload) {
+                progressView = findViewById(R.id.upload_progress);
+            } else {
+                progressView = findViewById(R.id.download_progress);
+            }
+            if (progressView != null) {
+                progressView.setText(percentage + "%");
+            }
+        });
+    }
+
+    // user agent
+    @SuppressLint("StringFormatInvalid")
+    private String getUserAgent() {
+        String appString = getResources().getString(R.string.user_agent);
+        String packageName = getPackageName();
+        String version = "";
+
+        PackageInfo pInfo;
+        try {
+            pInfo = getPackageManager().getPackageInfo(packageName, 0);
+            if (pInfo != null) {
+                version = pInfo.versionName;
+            }
+        } catch (PackageManager.NameNotFoundException e) {
+            Timber.e(e);
+        }
+
+        // Mozilla/5.0 (Android) ownCloud-android/1.7.0
+        return String.format(appString, version);
+    }
+}