Update library reference

[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 1752606..ab6fb3f 100644 (file)
--- a/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java
+++ b/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java
@@ -1,5 +1,9 @@
-/* ownCloud Android client application
- *   Copyright (C) 2012-2013 ownCloud Inc.
+/**
+ *   ownCloud Android client application
+ *
+ *   @author Maria Asensio
+ *   @author David A. Velasco
+ *   Copyright (C) 2015 ownCloud Inc.

  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License version 2,
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License version 2,


@@ -23,6 +27,7 @@ import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.os.Handler;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.os.Handler;

+import android.support.v4.app.DialogFragment;

 import android.support.v4.app.FragmentTransaction;
 import android.support.v4.app.FragmentManager;
 import android.view.LayoutInflater;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v4.app.FragmentManager;
 import android.view.LayoutInflater;


@@ -30,25 +35,21 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.webkit.CookieManager;
 import android.webkit.CookieSyncManager;
 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 android.webkit.WebSettings;
 import android.webkit.WebView;

+import android.widget.RelativeLayout;

 
 

-import com.actionbarsherlock.app.SherlockDialogFragment;
+import com.owncloud.android.MainApp;

 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 com.owncloud.android.lib.common.utils.Log_OC;

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

- * 
- * @author Maria Asensio
- * @author David A. Velasco

  */
  */

-public class SamlWebViewDialog extends SherlockDialogFragment {
+public class SamlWebViewDialog extends DialogFragment {

 
     public final String SAML_DIALOG_TAG = "SamlWebViewDialog";
     
 
     public final String SAML_DIALOG_TAG = "SamlWebViewDialog";
     


@@ -56,7 +57,6 @@ public class SamlWebViewDialog extends SherlockDialogFragment {
 
     private static final String ARG_INITIAL_URL = "INITIAL_URL";
     private static final String ARG_TARGET_URL = "TARGET_URL";
 
     private static final String ARG_INITIAL_URL = "INITIAL_URL";
     private static final String ARG_TARGET_URL = "TARGET_URL";

-    private static final String KEY_WEBVIEW_STATE = "WEBVIEW_STATE";

     
     private WebView mSsoWebView;
     private SsoWebViewClient mWebViewClient;
     
     private WebView mSsoWebView;
     private SsoWebViewClient mWebViewClient;


@@ -68,19 +68,15 @@ public class SamlWebViewDialog extends SherlockDialogFragment {
 
     private SsoWebViewClientListener mSsoWebViewClientListener;
 
 
     private SsoWebViewClientListener mSsoWebViewClientListener;
 

-    //private View mSsoRootView;
-
-

     /**
      * Public factory method to get dialog instances.
     /**
      * Public factory method to get dialog instances.

-     * 
-     * @param handler
-     * @param Url           Url to open at WebView
-     * @param targetURL     mHostBaseUrl + AccountUtils.getWebdavPath(mDiscoveredVersion, mCurrentAuthTokenType)
+     *
+     * @param url           Url to open at WebView
+     * @param targetUrl     mBaseUrl + AccountUtils.getWebdavPath(mDiscoveredVersion, m
+     *                      CurrentAuthTokenType)

      * @return              New dialog instance, ready to show.
      */
     public static SamlWebViewDialog newInstance(String url, String targetUrl) {
      * @return              New dialog instance, ready to show.
      */
     public static SamlWebViewDialog newInstance(String url, String targetUrl) {

-        Log_OC.d(TAG, "New instance");

         SamlWebViewDialog fragment = new SamlWebViewDialog();
         Bundle args = new Bundle();
         args.putString(ARG_INITIAL_URL, url);
         SamlWebViewDialog fragment = new SamlWebViewDialog();
         Bundle args = new Bundle();
         args.putString(ARG_INITIAL_URL, url);


@@ -92,21 +88,21 @@ public class SamlWebViewDialog extends SherlockDialogFragment {
     
     public SamlWebViewDialog() {
         super();
     
     public SamlWebViewDialog() {
         super();

-        Log_OC.d(TAG, "constructor");

     }
     
     
     @Override
     public void onAttach(Activity activity) {
     }
     
     
     @Override
     public void onAttach(Activity activity) {

-        Log_OC.d(TAG, "onAttach");
+        Log_OC.v(TAG, "onAttach");

         super.onAttach(activity);
         try {
             mSsoWebViewClientListener = (SsoWebViewClientListener) activity;
             mHandler = new Handler();
         super.onAttach(activity);
         try {
             mSsoWebViewClientListener = (SsoWebViewClientListener) activity;
             mHandler = new Handler();

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

             
        } catch (ClassCastException e) {
             
        } catch (ClassCastException e) {

-            throw new ClassCastException(activity.toString() + " must implement " + SsoWebViewClientListener.class.getSimpleName());
+            throw new ClassCastException(activity.toString() + " must implement " +
+                    SsoWebViewClientListener.class.getSimpleName());

         }
     }
 
         }
     }
 


@@ -114,10 +110,12 @@ public class SamlWebViewDialog extends SherlockDialogFragment {
     @SuppressLint("SetJavaScriptEnabled")
     @Override
     public void onCreate(Bundle savedInstanceState) {
     @SuppressLint("SetJavaScriptEnabled")
     @Override
     public void onCreate(Bundle savedInstanceState) {

-        Log_OC.d(TAG, "onCreate");
+        Log_OC.v(TAG, "onCreate, savedInstanceState is " + savedInstanceState);

         super.onCreate(savedInstanceState);
         
         super.onCreate(savedInstanceState);
         

-        CookieSyncManager.createInstance(getActivity());
+        setRetainInstance(true);
+        
+        CookieSyncManager.createInstance(getActivity().getApplicationContext());

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


@@ -127,84 +125,73 @@ public class SamlWebViewDialog extends SherlockDialogFragment {
             mTargetUrl = savedInstanceState.getString(ARG_TARGET_URL);
         }
         
             mTargetUrl = savedInstanceState.getString(ARG_TARGET_URL);
         }
         

-        setStyle(SherlockDialogFragment.STYLE_NO_TITLE, R.style.Theme_ownCloud_Dialog);
+        setStyle(DialogFragment.STYLE_NO_TITLE, R.style.Theme_ownCloud_Dialog);

     }
     
     }
     

-    @Override
-    public Dialog onCreateDialog(Bundle savedInstanceState) {
-        Log_OC.d(TAG, "onCreateDialog");
-
-        /*
-        // build the dialog
-        AlertDialog.Builder builder = new AlertDialog.Builder(getSherlockActivity());
-        if (mSsoRootView.getParent() != null) {
-            ((ViewGroup)(mSsoRootView.getParent())).removeView(mSsoRootView);
-        }
-        builder.setView(mSsoRootView);
-        //builder.setView(mSsoWebView);
-        Dialog dialog = builder.create();
-        */
-        
-        return super.onCreateDialog(savedInstanceState);
-    }
-
+    @SuppressWarnings("deprecation")

     @SuppressLint("SetJavaScriptEnabled")
     @Override
     @SuppressLint("SetJavaScriptEnabled")
     @Override

-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        Log_OC.d(TAG, "onCreateView");
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        Log_OC.v(TAG, "onCreateView, savedInsanceState is " + savedInstanceState);

         
         // Inflate layout of the dialog  
         
         // Inflate layout of the dialog  

-        View rootView = inflater.inflate(R.layout.sso_dialog, container, false);  // null parent view because it will go in the dialog layout
-        mSsoWebView  = (WebView) rootView.findViewById(R.id.sso_webview);
-            
-        mWebViewClient.setTargetUrl(mTargetUrl);
-        mSsoWebView.setWebViewClient(mWebViewClient);
+        RelativeLayout ssoRootView = (RelativeLayout) inflater.inflate(R.layout.sso_dialog,
+                container, false);  // null parent view because it will go in the dialog layout

         
         

-        if (savedInstanceState == null) {
-            Log_OC.d(TAG,  "   initWebView start");
+        if (mSsoWebView == null) {
+            // initialize the WebView
+            mSsoWebView = new SsoWebView(getActivity().getApplicationContext());
+            mSsoWebView.setFocusable(true);
+            mSsoWebView.setFocusableInTouchMode(true);
+            mSsoWebView.setClickable(true);
+            
+            WebSettings webSettings = mSsoWebView.getSettings();
+            webSettings.setJavaScriptEnabled(true);
+            webSettings.setBuiltInZoomControls(false);
+            webSettings.setLoadWithOverviewMode(false);
+            webSettings.setSavePassword(false);
+            webSettings.setUserAgentString(MainApp.getUserAgent());
+            webSettings.setSaveFormData(false);
+            

             CookieManager cookieManager = CookieManager.getInstance();
             cookieManager.setAcceptCookie(true);
             cookieManager.removeAllCookie();
             CookieManager cookieManager = CookieManager.getInstance();
             cookieManager.setAcceptCookie(true);
             cookieManager.removeAllCookie();

-            mSsoWebView.loadUrl(mInitialUrl);

             
             

-        } else {
-            Log_OC.d(TAG, "   restoreWebView start");
-            WebBackForwardList history = mSsoWebView.restoreState(savedInstanceState.getBundle(KEY_WEBVIEW_STATE));
-            if (history == null) {
-                Log_OC.e(TAG, "Error restoring WebView state ; back to starting URL");
-                mSsoWebView.loadUrl(mInitialUrl);
-            }
+            mSsoWebView.loadUrl(mInitialUrl);

         }
         }

-
-        WebSettings webSettings = mSsoWebView.getSettings();
-        webSettings.setJavaScriptEnabled(true);
-        webSettings.setBuiltInZoomControls(true);
-        webSettings.setLoadWithOverviewMode(false);
-        webSettings.setSavePassword(false);
-        webSettings.setUserAgentString(OwnCloudClient.USER_AGENT);
-        webSettings.setSaveFormData(false);

         
         

-        return rootView;
+        mWebViewClient.setTargetUrl(mTargetUrl);
+        mSsoWebView.setWebViewClient(mWebViewClient);
+        
+        // add the webview into the layout
+        RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(
+                RelativeLayout.LayoutParams.WRAP_CONTENT, 
+                RelativeLayout.LayoutParams.WRAP_CONTENT
+                );
+        ssoRootView.addView(mSsoWebView, layoutParams);
+        ssoRootView.requestLayout();
+        
+        return ssoRootView;

     }
 
     @Override
     public void onSaveInstanceState(Bundle outState) {
     }
 
     @Override
     public void onSaveInstanceState(Bundle outState) {

-        Log_OC.d(SAML_DIALOG_TAG, "onSaveInstanceState being CALLED");
+        Log_OC.v(TAG, "onSaveInstanceState being CALLED");

         super.onSaveInstanceState(outState);
         
         // save URLs
         outState.putString(ARG_INITIAL_URL, mInitialUrl);
         outState.putString(ARG_TARGET_URL, mTargetUrl);
         super.onSaveInstanceState(outState);
         
         // save URLs
         outState.putString(ARG_INITIAL_URL, mInitialUrl);
         outState.putString(ARG_TARGET_URL, mTargetUrl);

-        
-        // Save the state of the WebView
-        Bundle webviewState = new Bundle();
-        mSsoWebView.saveState(webviewState);
-        outState.putBundle(KEY_WEBVIEW_STATE, webviewState);

     }
 
     @Override
     public void onDestroyView() {
     }
 
     @Override
     public void onDestroyView() {

-        Log_OC.d(TAG, "onDestroyView");
+        Log_OC.v(TAG, "onDestroyView");
+        
+        if ((ViewGroup)mSsoWebView.getParent() != null) {
+            ((ViewGroup)mSsoWebView.getParent()).removeView(mSsoWebView);
+        }

         
         mSsoWebView.setWebViewClient(null);
         
         
         mSsoWebView.setWebViewClient(null);
         


@@ -212,8 +199,6 @@ public class SamlWebViewDialog extends SherlockDialogFragment {
         Dialog dialog = getDialog();
         if ((dialog != null)) {
             dialog.setOnDismissListener(null);
         Dialog dialog = getDialog();
         if ((dialog != null)) {
             dialog.setOnDismissListener(null);

-            //dialog.dismiss();
-            //dialog.setDismissMessage(null);

         }
         
         super.onDestroyView();
         }
         
         super.onDestroyView();


@@ -221,13 +206,13 @@ public class SamlWebViewDialog extends SherlockDialogFragment {
     
     @Override
     public void onDestroy() {
     
     @Override
     public void onDestroy() {

-        Log_OC.d(TAG, "onDestroy");
+        Log_OC.v(TAG, "onDestroy");

         super.onDestroy();
     }
 
     @Override
     public void onDetach() {
         super.onDestroy();
     }
 
     @Override
     public void onDetach() {

-        Log_OC.d(TAG, "onDetach");
+        Log_OC.v(TAG, "onDetach");

         mSsoWebViewClientListener = null;
         mWebViewClient = null;
         super.onDetach();
         mSsoWebViewClientListener = null;
         mWebViewClient = null;
         super.onDetach();


@@ -235,50 +220,52 @@ public class SamlWebViewDialog extends SherlockDialogFragment {
     
     @Override
     public void onCancel (DialogInterface dialog) {
     
     @Override
     public void onCancel (DialogInterface dialog) {

-        Log_OC.d(SAML_DIALOG_TAG, "onCancel");
+        Log_OC.d(TAG, "onCancel");

         super.onCancel(dialog);
     }
     
     @Override
     public void onDismiss (DialogInterface dialog) {
         super.onCancel(dialog);
     }
     
     @Override
     public void onDismiss (DialogInterface dialog) {

-        Log_OC.d(SAML_DIALOG_TAG, "onDismiss");
+        Log_OC.d(TAG, "onDismiss");

         super.onDismiss(dialog);
     }
     
     @Override
     public void onStart() {
         super.onDismiss(dialog);
     }
     
     @Override
     public void onStart() {

-        Log_OC.d(SAML_DIALOG_TAG, "onStart");
+        Log_OC.v(TAG, "onStart");

         super.onStart();
     }
 
     @Override
     public void onStop() {
         super.onStart();
     }
 
     @Override
     public void onStop() {

-        Log_OC.d(SAML_DIALOG_TAG, "onStop");
+        Log_OC.v(TAG, "onStop");

         super.onStop();
     }
 
     @Override
     public void onResume() {
         super.onStop();
     }
 
     @Override
     public void onResume() {

-        Log_OC.d(SAML_DIALOG_TAG, "onResume");
+        Log_OC.v(TAG, "onResume");

         super.onResume();
         super.onResume();

+        mSsoWebView.onResume();

     }
 
     @Override
     public void onPause() {
     }
 
     @Override
     public void onPause() {

-        Log_OC.d(SAML_DIALOG_TAG, "onPause");
+        Log_OC.v(TAG, "onPause");
+        mSsoWebView.onPause();

         super.onPause();
     }
     
     @Override
     public int show (FragmentTransaction transaction, String tag) {
         super.onPause();
     }
     
     @Override
     public int show (FragmentTransaction transaction, String tag) {

-        Log_OC.d(SAML_DIALOG_TAG, "show (transaction)");
+        Log_OC.v(TAG, "show (transaction)");

         return super.show(transaction, tag);
     }
 
     @Override
     public void show (FragmentManager manager, String tag) {
         return super.show(transaction, tag);
     }
 
     @Override
     public void show (FragmentManager manager, String tag) {

-        Log_OC.d(SAML_DIALOG_TAG, "show (manager)");
+        Log_OC.v(TAG, "show (manager)");

         super.show(manager, tag);
     }
         super.show(manager, tag);
     }

-
+    

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