Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 15c0f0df authored by Andy Scherzinger's avatar Andy Scherzinger Committed by GitHub
Browse files

Merge pull request #205 from nextcloud/operationToLibrary 

Move operation to library
parents bf635c84 46f20467

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

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ import android.view.ViewGroup; 
import android.widget.ArrayAdapter;

import android.widget.TextView;



import com.owncloud.android.lib.resources.files.RemoteFile;

import com.owncloud.android.lib.resources.files.model.RemoteFile;



public class FilesArrayAdapter extends ArrayAdapter<RemoteFile> {

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

+26 −26
Original line number Diff line number Diff line
@@ -43,12 +43,12 @@ 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.DownloadFileRemoteOperation;

import com.owncloud.android.lib.resources.files.FileUtils;

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 com.owncloud.android.lib.resources.files.ReadFolderRemoteOperation;

import com.owncloud.android.lib.resources.files.RemoveFileRemoteOperation;

import com.owncloud.android.lib.resources.files.UploadFileRemoteOperation;

import com.owncloud.android.lib.resources.files.model.RemoteFile;



import java.io.File;

import java.io.FileOutputStream;
@@ -148,7 +148,7 @@ public class MainActivity extends Activity implements OnRemoteOperationListener, 
    }



    private void startRefresh() {

    	ReadRemoteFolderOperation refreshOperation = new ReadRemoteFolderOperation(FileUtils.PATH_SEPARATOR);

        ReadFolderRemoteOperation refreshOperation = new ReadFolderRemoteOperation(FileUtils.PATH_SEPARATOR);

    	refreshOperation.execute(mClient, this, mHandler);

    }
@@ -162,8 +162,8 @@ public class MainActivity extends Activity implements OnRemoteOperationListener, 
		Long timeStampLong = fileToUpload.lastModified() / 1000;

		String timeStamp = timeStampLong.toString();



    	UploadRemoteFileOperation uploadOperation =

            new UploadRemoteFileOperation(fileToUpload.getAbsolutePath(), remotePath, mimeType, timeStamp);

        UploadFileRemoteOperation uploadOperation =

                new UploadFileRemoteOperation(fileToUpload.getAbsolutePath(), remotePath, mimeType, timeStamp);

    	uploadOperation.addDatatransferProgressListener(this);

    	uploadOperation.execute(mClient, this, mHandler);

    }
@@ -172,7 +172,7 @@ public class MainActivity extends Activity implements OnRemoteOperationListener, 
    	File upFolder = new File(getCacheDir(), getString(R.string.upload_folder_path));

    	File fileToUpload = upFolder.listFiles()[0];

    	String remotePath = FileUtils.PATH_SEPARATOR + fileToUpload.getName();

    	RemoveRemoteFileOperation removeOperation = new RemoveRemoteFileOperation(remotePath);

        RemoveFileRemoteOperation removeOperation = new RemoveFileRemoteOperation(remotePath);

    	removeOperation.execute(mClient, this, mHandler);

    }
@@ -182,7 +182,7 @@ public class MainActivity extends Activity implements OnRemoteOperationListener, 
    	File upFolder = new File(getCacheDir(), getString(R.string.upload_folder_path));

    	File fileToUpload = upFolder.listFiles()[0];

    	String remotePath = FileUtils.PATH_SEPARATOR + fileToUpload.getName();

    	DownloadRemoteFileOperation downloadOperation = new DownloadRemoteFileOperation(remotePath, downFolder.getAbsolutePath());

        DownloadFileRemoteOperation downloadOperation = new DownloadFileRemoteOperation(remotePath, downFolder.getAbsolutePath());

    	downloadOperation.addDatatransferProgressListener(this);

    	downloadOperation.execute(mClient, this, mHandler);

    }
@@ -205,24 +205,24 @@ public class MainActivity extends Activity implements OnRemoteOperationListener, 
			Toast.makeText(this, R.string.todo_operation_finished_in_fail, Toast.LENGTH_SHORT).show();

			Log.e(LOG_TAG, result.getLogMessage(), result.getException());



		} else if (operation instanceof ReadRemoteFolderOperation) {

			onSuccessfulRefresh((ReadRemoteFolderOperation)operation, result);

        } else if (operation instanceof ReadFolderRemoteOperation) {

            onSuccessfulRefresh((ReadFolderRemoteOperation) operation, result);



		} else if (operation instanceof UploadRemoteFileOperation ) {

			onSuccessfulUpload((UploadRemoteFileOperation)operation, result);

        } else if (operation instanceof UploadFileRemoteOperation) {

            onSuccessfulUpload((UploadFileRemoteOperation) operation, result);



		} else if (operation instanceof RemoveRemoteFileOperation ) {

			onSuccessfulRemoteDeletion((RemoveRemoteFileOperation)operation, result);

        } else if (operation instanceof RemoveFileRemoteOperation) {

            onSuccessfulRemoteDeletion((RemoveFileRemoteOperation) operation, result);



		} else if (operation instanceof DownloadRemoteFileOperation ) {

			onSuccessfulDownload((DownloadRemoteFileOperation)operation, result);

        } else if (operation instanceof DownloadFileRemoteOperation) {

            onSuccessfulDownload((DownloadFileRemoteOperation) operation, result);

			

		} else {

			Toast.makeText(this, R.string.todo_operation_finished_in_success, Toast.LENGTH_SHORT).show();

		}

	}



	private void onSuccessfulRefresh(ReadRemoteFolderOperation operation, RemoteOperationResult result) {

    private void onSuccessfulRefresh(ReadFolderRemoteOperation operation, RemoteOperationResult result) {

		mFilesAdapter.clear();

		List<RemoteFile> files = new ArrayList<RemoteFile>();

        for(Object obj: result.getData()) {
@@ -238,11 +238,11 @@ public class MainActivity extends Activity implements OnRemoteOperationListener, 
		mFilesAdapter.notifyDataSetChanged();

	}



	private void onSuccessfulUpload(UploadRemoteFileOperation operation, RemoteOperationResult result) {

    private void onSuccessfulUpload(UploadFileRemoteOperation operation, RemoteOperationResult result) {

		startRefresh();

	}



	private void onSuccessfulRemoteDeletion(RemoveRemoteFileOperation operation, RemoteOperationResult result) {

    private void onSuccessfulRemoteDeletion(RemoveFileRemoteOperation operation, RemoteOperationResult result) {

		startRefresh();

		TextView progressView = findViewById(R.id.upload_progress);

		if (progressView != null) {
@@ -251,7 +251,7 @@ public class MainActivity extends Activity implements OnRemoteOperationListener, 
	}



	@SuppressWarnings("deprecation")

	private void onSuccessfulDownload(DownloadRemoteFileOperation operation, RemoteOperationResult result) {

    private void onSuccessfulDownload(DownloadFileRemoteOperation operation, RemoteOperationResult result) {

    	File downFolder = new File(getCacheDir(), getString(R.string.download_folder_path));

    	File downloadedFile = downFolder.listFiles()[0];

    	BitmapDrawable bDraw = new BitmapDrawable(getResources(), downloadedFile.getAbsolutePath());

sample_client/src/main/res/drawable-v26/ic_launcher_background.xml

+13 −12
Original line number Diff line number Diff line 
<!--

  Nextcloud Android client application



  @author Andy Scherzinger

  Copyright (C) 2017 Andy Scherzinger

  Copyright (C) 2017 Nextcloud.

  Copyright (C) 2017 Nextcloud GmbH

 

  This program is free software; you can redistribute it and/or

  modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE

  License as published by the Free Software Foundation; either

  version 3 of the License, or any later version.

  This program is free software: you can redistribute it and/or modify

  it under the terms of the GNU General Public License as published by

  the Free Software Foundation, either version 3 of the License, or

  (at your option) any later version.

 

  This program is distributed in the hope that it will be useful,

  but WITHOUT ANY WARRANTY; without even the implied warranty of

  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

  GNU AFFERO GENERAL PUBLIC LICENSE for more details.

  GNU General Public License for more details.

 

  You should have received a copy of the GNU Affero General Public

  License along with this program. If not, see <http://www.gnu.org/licenses/>.

  You should have received a copy of the GNU General Public License

  along with this program. If not, see <https://www.gnu.org/licenses/>.

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="108dp"

sample_client/src/main/res/drawable-v26/ic_launcher_foreground.xml

+13 −12
Original line number Diff line number Diff line 
<!--

  Nextcloud Android client application



  @author Andy Scherzinger

  Copyright (C) 2017 Andy Scherzinger

  Copyright (C) 2017 Nextcloud.

  Copyright (C) 2017 Nextcloud GmbH

 

  This program is free software; you can redistribute it and/or

  modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE

  License as published by the Free Software Foundation; either

  version 3 of the License, or any later version.

  This program is free software: you can redistribute it and/or modify

  it under the terms of the GNU General Public License as published by

  the Free Software Foundation, either version 3 of the License, or

  (at your option) any later version.

 

  This program is distributed in the hope that it will be useful,

  but WITHOUT ANY WARRANTY; without even the implied warranty of

  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

  GNU AFFERO GENERAL PUBLIC LICENSE for more details.

  GNU General Public License for more details.

 

  You should have received a copy of the GNU Affero General Public

  License along with this program. If not, see <http://www.gnu.org/licenses/>.

  You should have received a copy of the GNU General Public License

  along with this program. If not, see <https://www.gnu.org/licenses/>.

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="108dp"

sample_client/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

+13 −12
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?><!--

  Nextcloud Android client application



  @author Andy Scherzinger

  Copyright (C) 2017 Andy Scherzinger

  Copyright (C) 2017 Nextcloud.

  Copyright (C) 2017 Nextcloud GmbH

 

  This program is free software; you can redistribute it and/or

  modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE

  License as published by the Free Software Foundation; either

  version 3 of the License, or any later version.

  This program is free software: you can redistribute it and/or modify

  it under the terms of the GNU General Public License as published by

  the Free Software Foundation, either version 3 of the License, or

  (at your option) any later version.

 

  This program is distributed in the hope that it will be useful,

  but WITHOUT ANY WARRANTY; without even the implied warranty of

  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

  GNU AFFERO GENERAL PUBLIC LICENSE for more details.

  GNU General Public License for more details.

 

  You should have received a copy of the GNU Affero General Public

  License along with this program. If not, see <http://www.gnu.org/licenses/>.

  You should have received a copy of the GNU General Public License

  along with this program. If not, see <https://www.gnu.org/licenses/>.

-->

<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">

    <background android:drawable="@drawable/ic_launcher_background" />