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

Unverified Commit f726720c authored by tobiasKaminsky's avatar tobiasKaminsky Committed by AndyScherzinger
Browse files

reformat to have little diffs

parent 96d12f9a

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

+44 −44
Original line number Diff line number Diff line
@@ -24,39 +24,39 @@ 


package com.owncloud.android.lib.sampleclient;



import android.app.Activity;

import android.content.res.AssetManager;

import android.graphics.drawable.BitmapDrawable;

import android.net.Uri;

import android.os.Bundle;

import android.os.Handler;

import android.util.Log;

import android.view.View;

import android.widget.ListView;

import android.widget.TextView;

import android.widget.Toast;

import java.io.File;

import java.io.FileOutputStream;

import java.io.IOException;

import java.io.InputStream;

import java.util.ArrayList;

import java.util.Iterator;

import java.util.List;



import com.owncloud.android.lib.common.OwnCloudClient;

import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;

import com.owncloud.android.lib.common.OwnCloudClientFactory;

import com.owncloud.android.lib.common.OwnCloudClient;

import com.owncloud.android.lib.common.OwnCloudCredentialsFactory;

import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;

import com.owncloud.android.lib.common.operations.OnRemoteOperationListener;

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

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.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.FileUtils;



import java.io.File;

import java.io.FileOutputStream;

import java.io.IOException;

import java.io.InputStream;

import java.util.ArrayList;

import java.util.Iterator;

import java.util.List;

import android.app.Activity;

import android.content.res.AssetManager;

import android.graphics.drawable.BitmapDrawable;

import android.net.Uri;

import android.os.Bundle;

import android.os.Handler;

import android.util.Log;

import android.view.View;

import android.widget.ListView;

import android.widget.TextView;

import android.widget.Toast;



public class MainActivity extends Activity implements OnRemoteOperationListener, OnDatatransferProgressListener {

src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java

+2 −2
Original line number Diff line number Diff line
@@ -59,7 +59,8 @@ public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation 
    private Context mContext;



    public ChunkedUploadRemoteFileOperation(

            Context context, String storagePath, String remotePath, String mimeType, String requiredEtag, String fileLastModifTimestamp) {

            Context context, String storagePath, String remotePath, String mimeType, String requiredEtag,

            String fileLastModifTimestamp) {

        super(storagePath, remotePath, mimeType, requiredEtag, fileLastModifTimestamp);

        mContext = context;

    }
@@ -119,7 +120,6 @@ public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation 
                mPutMethod.addRequestHeader(OC_CHUNKED_HEADER, OC_CHUNKED_HEADER);

                mPutMethod.addRequestHeader(OC_CHUNK_SIZE_HEADER, chunkSizeStr);

                mPutMethod.addRequestHeader(OC_TOTAL_LENGTH_HEADER, totalLengthStr);



                mPutMethod.addRequestHeader(OC_CHUNK_X_OC_MTIME_HEADER, mFileLastModifTimestamp);



                ((ChunkFromFileChannelRequestEntity) mEntity).setOffset(offset);

src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java

+117 −117
Original line number Diff line number Diff line
@@ -61,8 +61,8 @@ public class UploadRemoteFileOperation extends RemoteOperation { 
	private static final String TAG = UploadRemoteFileOperation.class.getSimpleName();



	protected static final String OC_TOTAL_LENGTH_HEADER = "OC-Total-Length";

    protected static final String OC_X_OC_MTIME_HEADER = "X-OC-Mtime";

	protected static final String IF_MATCH_HEADER = "If-Match";

    protected static final String OC_X_OC_MTIME_HEADER = "X-OC-Mtime";



	protected String mLocalPath;

	protected String mRemotePath;
@@ -77,14 +77,16 @@ public class UploadRemoteFileOperation extends RemoteOperation { 


	protected RequestEntity mEntity = null;



    public UploadRemoteFileOperation(String localPath, String remotePath, String mimeType, String fileLastModifTimestamp) {

	public UploadRemoteFileOperation(String localPath, String remotePath, String mimeType,

									 String fileLastModifTimestamp) {

		mLocalPath = localPath;

		mRemotePath = remotePath;

		mMimeType = mimeType;

		mFileLastModifTimestamp = fileLastModifTimestamp;

	}



    public UploadRemoteFileOperation(String localPath, String remotePath, String mimeType, String requiredEtag, String fileLastModifTimestamp) {

	public UploadRemoteFileOperation(String localPath, String remotePath, String mimeType, String requiredEtag,

									 String fileLastModifTimestamp) {

		this(localPath, remotePath, mimeType, fileLastModifTimestamp);

		mRequiredEtag = requiredEtag;

	}
@@ -155,9 +157,7 @@ public class UploadRemoteFileOperation extends RemoteOperation { 
				mPutMethod.addRequestHeader(IF_MATCH_HEADER, "\"" + mRequiredEtag + "\"");

			}

			mPutMethod.addRequestHeader(OC_TOTAL_LENGTH_HEADER, String.valueOf(f.length()));



            mPutMethod.addRequestHeader(OC_X_OC_MTIME_HEADER, mFileLastModifTimestamp);



			mPutMethod.setRequestEntity(mEntity);

			status = client.executeMethod(mPutMethod);