X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/b6213a0d5fbc40568c32b36fa12ce24c1780c58b..2ca8f569620deb2d63ffced1ee4a8b0a44280183:/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 9ed8a446..35bb5794 100644 --- a/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java +++ b/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java @@ -29,17 +29,18 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.webkit.CookieManager; +import android.webkit.CookieSyncManager; import android.webkit.WebBackForwardList; import android.webkit.WebSettings; 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.lib.common.OwnCloudClient; +import com.owncloud.android.utils.Log_OC; -import eu.alefzero.webdav.WebdavClient; /** * Dialog to show the WebView for SAML Authentication @@ -102,7 +103,7 @@ public class SamlWebViewDialog extends SherlockDialogFragment { 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()); @@ -115,6 +116,8 @@ public class SamlWebViewDialog extends SherlockDialogFragment { public void onCreate(Bundle savedInstanceState) { Log_OC.d(TAG, "onCreate"); super.onCreate(savedInstanceState); + + CookieSyncManager.createInstance(getActivity()); if (savedInstanceState == null) { mInitialUrl = getArguments().getString(ARG_INITIAL_URL); @@ -178,7 +181,7 @@ public class SamlWebViewDialog extends SherlockDialogFragment { webSettings.setBuiltInZoomControls(true); webSettings.setLoadWithOverviewMode(false); webSettings.setSavePassword(false); - webSettings.setUserAgentString(WebdavClient.USER_AGENT); + webSettings.setUserAgentString(OwnCloudClient.USER_AGENT); webSettings.setSaveFormData(false); return rootView; @@ -277,5 +280,10 @@ public class SamlWebViewDialog extends SherlockDialogFragment { Log_OC.d(SAML_DIALOG_TAG, "show (manager)"); super.show(manager, tag); } + + public void reloadWebView() { + mSsoWebView.reload(); + } + } \ No newline at end of file