瀏覽代碼

changes due to rebase

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
tobiasKaminsky 6 年之前
父節點
當前提交
aa9caf84b3

+ 2 - 2
src/main/java/com/owncloud/android/operations/RestoreFileVersionOperation.java

@@ -69,8 +69,8 @@ public class RestoreFileVersionOperation extends SyncOperation {
 
 
         RemoteOperationResult result;
         RemoteOperationResult result;
         try {
         try {
-            String source = client.getNewWebdavUri(false) + "/versions/" + userId + "/versions/" + fileId + "/" + fileName;
-            String target = client.getNewWebdavUri(false) + "/versions/" + userId + "/restore/" + fileId;
+            String source = client.getNewWebdavUri() + "/versions/" + userId + "/versions/" + fileId + "/" + fileName;
+            String target = client.getNewWebdavUri() + "/versions/" + userId + "/restore/" + fileId;
 
 
             MoveMethod move = new MoveMethod(source, target, true);
             MoveMethod move = new MoveMethod(source, target, true);
             int status = client.executeMethod(move, RESTORE_READ_TIMEOUT, RESTORE_CONNECTION_TIMEOUT);
             int status = client.executeMethod(move, RESTORE_READ_TIMEOUT, RESTORE_CONNECTION_TIMEOUT);

+ 0 - 10
src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java

@@ -439,16 +439,6 @@ public class FileOperationsHelper {
         }
         }
     }
     }
 
 
-
-    /**
-     * @return 'True' if the server supports the Share API
-     */
-    public boolean isSharedSupported() {
-        return mFileActivity.getAccount() != null &&
-                AccountUtils.getServerVersion(mFileActivity.getAccount()).isSharedSupported();
-    }
-
-
     /**
     /**
      * Helper method to unshare a file publicly shared via link.
      * Helper method to unshare a file publicly shared via link.
      * Starts a request to do it in {@link OperationsService}
      * Starts a request to do it in {@link OperationsService}