Merge pull request #435 from owncloud/ssl_dialogs_refactored_in_just_one

[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..35bb579 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.lib.common.OwnCloudClient;
+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


@@ -103,7 +103,7 @@ public class SamlWebViewDialog extends SherlockDialogFragment {
         try {
             mSsoWebViewClientListener = (SsoWebViewClientListener) activity;
             mHandler = new Handler();
         try {
             mSsoWebViewClientListener = (SsoWebViewClientListener) activity;
             mHandler = new Handler();

-            mWebViewClient = new SsoWebViewClient(mHandler, mSsoWebViewClientListener);
+            mWebViewClient = new SsoWebViewClient(activity, mHandler, mSsoWebViewClientListener);

             
        } catch (ClassCastException e) {
             throw new ClassCastException(activity.toString() + " must implement " + SsoWebViewClientListener.class.getSimpleName());
             
        } catch (ClassCastException e) {
             throw new ClassCastException(activity.toString() + " must implement " + SsoWebViewClientListener.class.getSimpleName());


@@ -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);


@@ -181,7 +181,7 @@ public class SamlWebViewDialog extends SherlockDialogFragment {
         webSettings.setBuiltInZoomControls(true);
         webSettings.setLoadWithOverviewMode(false);
         webSettings.setSavePassword(false);
         webSettings.setBuiltInZoomControls(true);
         webSettings.setLoadWithOverviewMode(false);
         webSettings.setSavePassword(false);

-        webSettings.setUserAgentString(WebdavClient.USER_AGENT);
+        webSettings.setUserAgentString(OwnCloudClient.USER_AGENT);

         webSettings.setSaveFormData(false);
         
         return rootView;
         webSettings.setSaveFormData(false);
         
         return rootView;


@@ -280,5 +280,10 @@ public class SamlWebViewDialog extends SherlockDialogFragment {
         Log_OC.d(SAML_DIALOG_TAG, "show (manager)");
         super.show(manager, tag);
     }
         Log_OC.d(SAML_DIALOG_TAG, "show (manager)");
         super.show(manager, tag);
     }

+    
+    public void reloadWebView() {
+        mSsoWebView.reload();
+    }

 
 

+    

 }
\ No newline at end of file
 }
\ No newline at end of file