changes due to rebase

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

src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java

@@ -53,7 +53,6 @@ import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.files.ServerFileInterface;
 import com.owncloud.android.lib.resources.files.TrashbinFile;
-import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 import com.owncloud.android.ui.TextDrawable;
 import com.owncloud.android.ui.adapter.DiskLruImageCache;
 import com.owncloud.android.ui.fragment.FileFragment;

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

@@ -79,7 +79,7 @@ public class CommentFileOperation extends SyncOperation {
 
         RemoteOperationResult result;
         try {
-            String url = client.getNewWebdavUri(false) + "/comments/files/" + fileId;
+            String url = client.getNewWebdavUri() + "/comments/files/" + fileId;
             PostMethod postMethod = new PostMethod(url);
             postMethod.addRequestHeader("Content-type", "application/json");
 

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

@@ -63,7 +63,7 @@ public class EmptyTrashbinFileOperation extends SyncOperation {
 
         RemoteOperationResult result;
         try {
-            DeleteMethod delete = new DeleteMethod(client.getNewWebdavUri(false) + "/trashbin/" + userId + "/trash");
+            DeleteMethod delete = new DeleteMethod(client.getNewWebdavUri() + "/trashbin/" + userId + "/trash");
             int status = client.executeMethod(delete, RESTORE_READ_TIMEOUT, RESTORE_CONNECTION_TIMEOUT);
 
             result = new RemoteOperationResult(isSuccess(status), delete);

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

@@ -70,8 +70,8 @@ public class RestoreTrashbinFileOperation extends SyncOperation {
 
         RemoteOperationResult result;
         try {
-            String source = client.getNewWebdavUri(false) + WebdavUtils.encodePath(sourcePath);
-            String target = client.getNewWebdavUri(false) + "/trashbin/" + userId + "/restore/" + fileName;
+            String source = client.getNewWebdavUri() + WebdavUtils.encodePath(sourcePath);
+            String target = client.getNewWebdavUri() + "/trashbin/" + userId + "/restore/" + fileName;
 
             MoveMethod move = new MoveMethod(source, target, true);
             int status = client.executeMethod(move, RESTORE_READ_TIMEOUT, RESTORE_CONNECTION_TIMEOUT);