Merge branch 'develop' into setup_buttons

[pub/Android/ownCloud.git] / src / eu / alefzero / webdav / WebdavClient.java

diff --git a/src/eu/alefzero/webdav/WebdavClient.java b/src/eu/alefzero/webdav/WebdavClient.java
index 8c54a53..5120928 100644 (file)
--- a/src/eu/alefzero/webdav/WebdavClient.java
+++ b/src/eu/alefzero/webdav/WebdavClient.java
@@ -41,11 +41,12 @@ import org.apache.commons.httpclient.params.HttpMethodParams;
 import org.apache.http.HttpStatus;
 import org.apache.http.params.CoreProtocolPNames;
 
 import org.apache.http.HttpStatus;
 import org.apache.http.params.CoreProtocolPNames;
 

+import com.owncloud.android.Log_OC;
+import com.owncloud.android.MainApp;
+import com.owncloud.android.network.BearerAuthScheme;
+import com.owncloud.android.network.BearerCredentials;
+

 
 

-import de.mobilcom.debitel.cloud.android.Log_OC;
-import de.mobilcom.debitel.cloud.android.MainApp;
-import de.mobilcom.debitel.cloud.android.network.BearerAuthScheme;
-import de.mobilcom.debitel.cloud.android.network.BearerCredentials;

 
 import android.net.Uri;
 
 
 import android.net.Uri;
 


@@ -168,7 +169,7 @@ public class WebdavClient extends HttpClient {
         try {
             method.setFollowRedirects(mFollowRedirects);
         } catch (Exception e) {
         try {
             method.setFollowRedirects(mFollowRedirects);
         } catch (Exception e) {

-            if (mFollowRedirects) Log_OC.d(TAG, "setFollowRedirects failed for " + method.getName() + " method, custom redirection will be used");
+            //if (mFollowRedirects) Log_OC.d(TAG, "setFollowRedirects failed for " + method.getName() + " method, custom redirection will be used if needed");

             customRedirectionNeeded = mFollowRedirects;
         }
         if (mSsoSessionCookie != null && mSsoSessionCookie.length() > 0) {
             customRedirectionNeeded = mFollowRedirects;
         }
         if (mSsoSessionCookie != null && mSsoSessionCookie.length() > 0) {