changes due to CR

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

src/androidTest/java/com/owncloud/android/UploadIT.java

@@ -27,7 +27,6 @@ public class UploadIT extends AbstractIT {
                 null,
                 ocUpload,
                 false,
-                false,
                 FileUploader.LOCAL_BEHAVIOUR_COPY,
                 context,
                 false,
@@ -52,7 +51,6 @@ public class UploadIT extends AbstractIT {
                 null,
                 ocUpload,
                 false,
-                false,
                 FileUploader.LOCAL_BEHAVIOUR_COPY,
                 context,
                 false,

src/main/java/com/owncloud/android/files/services/FileUploader.java

@@ -632,7 +632,6 @@ public class FileUploader extends Service
                             account,
                             files[i],
                             ocUpload,
-                            true,
                             forceOverwrite,
                             localAction,
                             this,
@@ -691,7 +690,6 @@ public class FileUploader extends Service
                     account,
                     null,
                     upload,
-                    true,
                     upload.isForceOverwrite(),  // TODO should be read from DB?
                     upload.getLocalAction(),    // TODO should be read from DB?
                     this,

src/main/java/com/owncloud/android/operations/UploadFileOperation.java

@@ -113,7 +113,6 @@ public class UploadFileOperation extends SyncOperation {
     private OCFile mOldFile;
     private String mRemotePath = null;
     private String mFolderUnlockToken;
-    private boolean mChunked = false;
     private boolean mRemoteFolderToBeCreated = false;
     private boolean mForceOverwrite = false;
     private int mLocalBehaviour = FileUploader.LOCAL_BEHAVIOUR_COPY;
@@ -175,7 +174,6 @@ public class UploadFileOperation extends SyncOperation {
     public UploadFileOperation(Account account,
                                OCFile file,
                                OCUpload upload,
-                               boolean chunked,
                                boolean forceOverwrite,
                                int localBehaviour,
                                Context context,
@@ -208,7 +206,6 @@ public class UploadFileOperation extends SyncOperation {
         mOnWifiOnly = onWifiOnly;
         mWhileChargingOnly = whileChargingOnly;
         mRemotePath = upload.getRemotePath();
-        mChunked = chunked;
         mForceOverwrite = forceOverwrite;
         mLocalBehaviour = localBehaviour;
         mOriginalStoragePath = mFile.getStoragePath();
@@ -342,10 +339,6 @@ public class UploadFileOperation extends SyncOperation {
         mRenameUploadListener = listener;
     }
 
-    public boolean isChunkedUploadSupported() {
-        return mChunked;
-    }
-
     public Context getContext() {
         return mContext;
     }
@@ -579,7 +572,7 @@ public class UploadFileOperation extends SyncOperation {
             }
 
             /// perform the upload
-            if (mChunked && (size > ChunkedUploadRemoteFileOperation.CHUNK_SIZE)) {
+            if (size > ChunkedUploadRemoteFileOperation.CHUNK_SIZE) {
                 mUploadOperation = new ChunkedUploadRemoteFileOperation(mContext, encryptedTempFile.getAbsolutePath(),
                         mFile.getParentRemotePath() + encryptedFileName, mFile.getMimeType(),
                         mFile.getEtagInConflict(), timeStamp);
@@ -820,7 +813,7 @@ public class UploadFileOperation extends SyncOperation {
             }
 
             // perform the upload
-            if (mChunked && (size > ChunkedUploadRemoteFileOperation.CHUNK_SIZE)) {
+            if (size > ChunkedUploadRemoteFileOperation.CHUNK_SIZE) {
                 mUploadOperation = new ChunkedUploadRemoteFileOperation(mContext, mFile.getStoragePath(),
                         mFile.getRemotePath(), mFile.getMimeType(), mFile.getEtagInConflict(), timeStamp);
             } else {

src/main/java/com/owncloud/android/ui/fragment/ShareFileFragment.java

@@ -226,17 +226,8 @@ public class ShareFileFragment extends Fragment implements ShareUserListAdapter.
         addUserGroupButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                boolean shareWithUsersEnable = true;
-                if (shareWithUsersEnable) {
-                    // Show Search Fragment
-                    mListener.showSearchUsersAndGroups();
-                } else {
-                    Snackbar.make(
-                            getActivity().findViewById(android.R.id.content),
-                            getString(R.string.share_sharee_unavailable),
-                            Snackbar.LENGTH_LONG
-                    ).show();
-                }
+                // Show Search Fragment
+                mListener.showSearchUsersAndGroups();
             }
         });
 

src/main/java/com/owncloud/android/utils/glide/HttpStreamFetcher.java

@@ -71,7 +71,7 @@ public class HttpStreamFetcher implements DataFetcher<InputStream> {
                     mClient.exhaustResponse(get.getResponseBodyAsStream());
                 }
             } catch (Exception e) {
-                Log_OC.d(TAG, e.getMessage(), e);
+                Log_OC.e(TAG, e.getMessage(), e);
             }
         }
         return null;