Remove content resolver parameter from UriUploader constructor and renamed UriUloadResult var

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

@@ -751,7 +751,6 @@ public class FileDisplayActivity extends HookActivity
                 mStreamsToUpload,
                 remotePath,
                 getAccount(),
-                getContentResolver(),
                 behaviour);
 
         uploader.uploadUris();

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

@@ -27,10 +27,8 @@ import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AuthenticatorException;
 import android.annotation.SuppressLint;
-import android.app.Activity;
 import android.app.Dialog;
 import android.content.BroadcastReceiver;
-import android.content.ContentResolver;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.IntentFilter;
@@ -481,24 +479,23 @@ public class ReceiveExternalFilesActivity extends FileActivity
                 mStreamsToUpload,
                 mUploadPath,
                 getAccount(),
-                getContentResolver(),
                 FileUploader.LOCAL_BEHAVIOUR_FORGET);
 
-        UriUploader.UriUploadCode resultCode = uploader.uploadUris();
+        UriUploader.UriUploaderResultCode resultCode = uploader.uploadUris();
 
-        if (resultCode == UriUploader.UriUploadCode.OK) {
+        if (resultCode == UriUploader.UriUploaderResultCode.OK) {
             finish();
         } else {
 
             int messageResTitle = R.string.uploader_error_title_file_cannot_be_uploaded;
             int messageResId = R.string.common_error_unknown;
 
-            if (resultCode == UriUploader.UriUploadCode.ERROR_NO_FILE_TO_UPLOAD) {
+            if (resultCode == UriUploader.UriUploaderResultCode.ERROR_NO_FILE_TO_UPLOAD) {
                 messageResId = R.string.uploader_error_message_no_file_to_upload;
                 messageResTitle = R.string.uploader_error_title_no_file_to_upload;
-            } else if (resultCode == UriUploader.UriUploadCode.ERROR_READ_PERMISSION_NOT_GRANTED) {
+            } else if (resultCode == UriUploader.UriUploaderResultCode.ERROR_READ_PERMISSION_NOT_GRANTED) {
                 messageResId = R.string.uploader_error_message_read_permission_not_granted;
-            } else if (resultCode == UriUploader.UriUploadCode.ERROR_UNKNOWN) {
+            } else if (resultCode == UriUploader.UriUploaderResultCode.ERROR_UNKNOWN) {
                 messageResId = R.string.common_error_unknown;
             }
 

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

@@ -51,11 +51,10 @@ public class UriUploader implements
 
     private String mUploadPath;
     private Account mAccount;
-    private ContentResolver mContentResolver;
 
-    private UriUploadCode mCode = UriUploadCode.OK;
+    private UriUploaderResultCode mCode = UriUploaderResultCode.OK;
 
-    public enum UriUploadCode {
+    public enum UriUploaderResultCode {
         OK,
         ERROR_UNKNOWN,
         ERROR_NO_FILE_TO_UPLOAD,
@@ -67,14 +66,12 @@ public class UriUploader implements
             ArrayList<Parcelable> uris,
             String uploadPath,
             Account account,
-            ContentResolver contentResolver,
             int behaviour
     ) {
         mActivity = context;
         mUrisToUpload = uris;
         mUploadPath = uploadPath;
         mAccount = account;
-        mContentResolver = contentResolver;
         mBehaviour = behaviour;
     }
 
@@ -82,7 +79,7 @@ public class UriUploader implements
         this.mBehaviour = behaviour;
     }
 
-    public UriUploadCode uploadUris() {
+    public UriUploaderResultCode uploadUris() {
 
         try {
 
@@ -118,16 +115,16 @@ public class UriUploader implements
                         contentRemotePaths.toArray(new String[contentRemotePaths.size()]));
 
             } else if (schemeFileCounter == 0) {
-                mCode = UriUploadCode.ERROR_NO_FILE_TO_UPLOAD;
+                mCode = UriUploaderResultCode.ERROR_NO_FILE_TO_UPLOAD;
 
             }
 
         } catch (SecurityException e) {
-            mCode = UriUploadCode.ERROR_READ_PERMISSION_NOT_GRANTED;
+            mCode = UriUploaderResultCode.ERROR_READ_PERMISSION_NOT_GRANTED;
             Log_OC.e(TAG, "Permissions fail", e);
 
         } catch (Exception e) {
-            mCode = UriUploadCode.ERROR_UNKNOWN;
+            mCode = UriUploaderResultCode.ERROR_UNKNOWN;
             Log_OC.e(TAG, "Unexpted error", e);
 
         } finally {
@@ -184,7 +181,7 @@ public class UriUploader implements
                         mAccount,
                         sourceUris,
                         remotePaths,
-                        mContentResolver
+                        mActivity.getContentResolver()
                 )
         );
     }