From: David A. Velasco Date: Tue, 19 Nov 2013 11:11:07 +0000 (+0100) Subject: Small tweaks in rename operation X-Git-Tag: oc-android-1.5.5~123^2~1 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/04327e1f16bf2ccf30fa24505cd9f25f2c7416e9?ds=sidebyside Small tweaks in rename operation --- diff --git a/oc_framework/src/com/owncloud/android/oc_framework/network/webdav/OwnCloudClientFactory.java b/oc_framework/src/com/owncloud/android/oc_framework/network/webdav/OwnCloudClientFactory.java index 0c0c2072..5c41edb0 100644 --- a/oc_framework/src/com/owncloud/android/oc_framework/network/webdav/OwnCloudClientFactory.java +++ b/oc_framework/src/com/owncloud/android/oc_framework/network/webdav/OwnCloudClientFactory.java @@ -78,8 +78,8 @@ public class OwnCloudClientFactory { } else { String username = account.name.substring(0, account.name.lastIndexOf('@')); - String password = am.getPassword(account); - //String password = am.blockingGetAuthToken(account, AccountTypeUtils.getAuthTokenTypePass(account.type), false); + //String password = am.getPassword(account); + String password = am.blockingGetAuthToken(account, AccountTypeUtils.getAuthTokenTypePass(account.type), false); client.setBasicCredentials(username, password); } diff --git a/src/com/owncloud/android/operations/RenameFileOperation.java b/src/com/owncloud/android/operations/RenameFileOperation.java index ebeac791..9aa573ab 100644 --- a/src/com/owncloud/android/operations/RenameFileOperation.java +++ b/src/com/owncloud/android/operations/RenameFileOperation.java @@ -110,14 +110,10 @@ public class RenameFileOperation extends RemoteOperation { saveLocalFile(); } } - } catch (HttpException e) { - Log_OC.e(TAG, "Rename " + mFile.getRemotePath() + " to " + ((mNewRemotePath==null) ? mNewName : mNewRemotePath) + ": " + - ((result!= null) ? result.getLogMessage() : ""), e); - e.printStackTrace(); + } catch (IOException e) { Log_OC.e(TAG, "Rename " + mFile.getRemotePath() + " to " + ((mNewRemotePath==null) ? mNewName : mNewRemotePath) + ": " + ((result!= null) ? result.getLogMessage() : ""), e); - e.printStackTrace(); } return result;