Merge branch 'develop' into refactor_remote_operation_to_create_folder

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / dialog / SamlWebViewDialog.java

diff --git a/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java b/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java
index fe20d81..91c607e 100644 (file)
--- a/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java
+++ b/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java
@@ -35,12 +35,12 @@ import android.webkit.WebSettings;
 import android.webkit.WebView;
 
 import com.actionbarsherlock.app.SherlockDialogFragment;
 import android.webkit.WebView;
 
 import com.actionbarsherlock.app.SherlockDialogFragment;

-import com.owncloud.android.Log_OC;

 import com.owncloud.android.R;
 import com.owncloud.android.authentication.SsoWebViewClient;
 import com.owncloud.android.authentication.SsoWebViewClient.SsoWebViewClientListener;
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.SsoWebViewClient;
 import com.owncloud.android.authentication.SsoWebViewClient.SsoWebViewClientListener;

+import com.owncloud.android.oc_framework.network.webdav.WebdavClient;
+import com.owncloud.android.utils.Log_OC;

 
 

-import eu.alefzero.webdav.WebdavClient;

 
 /**
  * Dialog to show the WebView for SAML Authentication
 
 /**
  * Dialog to show the WebView for SAML Authentication


@@ -118,7 +118,7 @@ public class SamlWebViewDialog extends SherlockDialogFragment {
         super.onCreate(savedInstanceState);
         
         CookieSyncManager.createInstance(getActivity());
         super.onCreate(savedInstanceState);
         
         CookieSyncManager.createInstance(getActivity());

-        
+

         if (savedInstanceState == null) {
             mInitialUrl = getArguments().getString(ARG_INITIAL_URL);
             mTargetUrl = getArguments().getString(ARG_TARGET_URL);
         if (savedInstanceState == null) {
             mInitialUrl = getArguments().getString(ARG_INITIAL_URL);
             mTargetUrl = getArguments().getString(ARG_TARGET_URL);