Added comments and cleaned code

src/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -37,7 +37,6 @@ import android.content.SharedPreferences;
 import android.content.SyncRequest;
 import android.content.pm.PackageManager;
 import android.content.res.Resources.NotFoundException;
-import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
@@ -739,12 +738,14 @@ public class FileDisplayActivity extends HookActivity
         OCFile currentDir = getCurrentDir();
         String remotePath = (currentDir != null) ? currentDir.getRemotePath() : OCFile.ROOT_PATH;
 
-        UriUploader uploader = new UriUploader(this,
+        UriUploader uploader = new UriUploader(
+                this,
                 mStreamsToUpload,
                 remotePath,
                 getAccount(),
                 behaviour,
-                false);
+                false // Not show waiting dialog while file is being copied from private storage
+        );
 
         uploader.uploadUris();
 

src/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java

@@ -36,12 +36,10 @@ import android.content.DialogInterface.OnCancelListener;
 import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
 import android.content.res.Resources.NotFoundException;
-import android.net.Uri;
 import android.os.Bundle;
 import android.os.Parcelable;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AlertDialog.Builder;
@@ -67,12 +65,10 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCo
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.operations.CreateFolderOperation;
 import com.owncloud.android.operations.RefreshFolderOperation;
-import com.owncloud.android.operations.UploadFileOperation;
 import com.owncloud.android.syncadapter.FileSyncAdapter;
 import com.owncloud.android.ui.adapter.UploaderAdapter;
 import com.owncloud.android.ui.dialog.ConfirmationDialogFragment;
 import com.owncloud.android.ui.dialog.CreateFolderDialogFragment;
-import com.owncloud.android.ui.dialog.LoadingDialog;
 import com.owncloud.android.ui.asynctasks.CopyAndUploadContentUrisTask;
 import com.owncloud.android.ui.helpers.UriUploader;
 import com.owncloud.android.utils.DisplayUtils;
@@ -475,12 +471,14 @@ public class ReceiveExternalFilesActivity extends FileActivity
     @SuppressLint("NewApi")
     public void uploadFiles() {
 
-        UriUploader uploader = new UriUploader(this,
+        UriUploader uploader = new UriUploader(
+                this,
                 mStreamsToUpload,
                 mUploadPath,
                 getAccount(),
                 FileUploader.LOCAL_BEHAVIOUR_FORGET,
-                true);
+                true // Show waiting dialog while file is being copied from private storage
+        );
 
         UriUploader.UriUploaderResultCode resultCode = uploader.uploadUris();
 

src/com/owncloud/android/ui/helpers/UriUploader.java

@@ -36,7 +36,9 @@ import com.owncloud.android.utils.UriUtils;
 import java.util.ArrayList;
 import java.util.List;
 
-
+/**
+ * This class handle both file:// and content:// URIs pointing to files to upload.
+ */
 public class UriUploader {
 
     private final String TAG = UriUploader.class.getSimpleName();
@@ -75,10 +77,6 @@ public class UriUploader {
         mShowWaitingDialog = showWaitingDialog;
     }
 
-    public void setBehaviour(int behaviour) {
-        this.mBehaviour = behaviour;
-    }
-
     public UriUploaderResultCode uploadUris() {
 
         try {
@@ -187,6 +185,4 @@ public class UriUploader {
                 )
         );
     }
-
-
 }