Merge remote-tracking branch 'origin/saml_based_federated_single_sign_on' into saml_b...

[pub/Android/ownCloud.git] / src / com / owncloud / android / authentication / SsoWebViewClient.java

diff --git a/src/com/owncloud/android/authentication/SsoWebViewClient.java b/src/com/owncloud/android/authentication/SsoWebViewClient.java
index ad5ea12..ff39f63 100644 (file)
--- a/src/com/owncloud/android/authentication/SsoWebViewClient.java
+++ b/src/com/owncloud/android/authentication/SsoWebViewClient.java
@@ -17,15 +17,16 @@
 
 package com.owncloud.android.authentication;
 
-import android.content.Context;
+import java.lang.ref.WeakReference;
+
 import android.graphics.Bitmap;
+import android.os.Handler;
+import android.os.Message;
 import android.view.View;
 import android.webkit.CookieManager;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
-import android.widget.Toast;
 
-import com.owncloud.android.Log_OC;
 
 /**
  * Custom {@link WebViewClient} client aimed to catch the end of a single-sign-on process 
@@ -38,13 +39,19 @@ import com.owncloud.android.Log_OC;
  */
 public class SsoWebViewClient extends WebViewClient {
         
-    private static final String TAG = SsoWebViewClient.class.getSimpleName();
+    //private static final String TAG = SsoWebViewClient.class.getSimpleName();
+    
+    public interface SsoWebViewClientListener {
+        public void onSsoFinished(String sessionCookie);
+    }
     
-    private Context mContext;
+    private Handler mListenerHandler;
+    private WeakReference<SsoWebViewClientListener> mListenerRef;
     private String mTargetUrl;
     
-    public SsoWebViewClient (Context context) {
-        mContext = context;
+    public SsoWebViewClient (Handler listenerHandler, SsoWebViewClientListener listener) {
+        mListenerHandler = listenerHandler;
+        mListenerRef = new WeakReference<SsoWebViewClient.SsoWebViewClientListener>(listener);
         mTargetUrl = "fake://url.to.be.set";
     }
     
@@ -62,12 +69,33 @@ public class SsoWebViewClient extends WebViewClient {
         if (url.startsWith(mTargetUrl)) {
             view.setVisibility(View.GONE);
             CookieManager cookieManager = CookieManager.getInstance();
-            String cookies = cookieManager.getCookie(url);
-            Toast.makeText(mContext, "got cookies: " + cookies, Toast.LENGTH_LONG).show();
+            final String cookies = cookieManager.getCookie(url);
+            //Log_OC.e(TAG, cookies);
+            if (mListenerHandler != null && mListenerRef != null) {
+                // this is good idea because onPageStarted is not running in the UI thread
+                mListenerHandler.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        SsoWebViewClientListener listener = mListenerRef.get();
+                        if (listener != null) {
+                            listener.onSsoFinished(cookies);
+                        }
+                    }
+                });
+            }
         }
     }
     
     @Override
+    public void onFormResubmission (WebView view, Message dontResend, Message resend) {
+        //Log_OC.e(TAG, "onFormResubMission ");
+        
+        // necessary to grant reload of last page when device orientation is changed after sending a form
+        resend.sendToTarget();  
+    }
+
+    /*
+    @Override
     public boolean shouldOverrideUrlLoading(WebView view, String url) {
         //view.loadUrl(url);
         return false;
@@ -78,8 +106,6 @@ public class SsoWebViewClient extends WebViewClient {
         Log_OC.e(TAG, "onReceivedError : " + failingUrl);
     }
 
-    /*
-
     @Override
     public void doUpdateVisitedHistory (WebView view, String url, boolean isReload) {
         Log_OC.e(TAG, "doUpdateVisitedHistory : " + url);
@@ -112,12 +138,6 @@ public class SsoWebViewClient extends WebViewClient {
     }
     
     @Override
-    public void onFormResubmission (WebView view, Message dontResend, Message resend) {
-        Log_OC.e(TAG, "onFormResubMission ");
-        super.onFormResubmission(view, dontResend, resend);
-    }
-    
-    @Override
     public void onReceivedLoginRequest (WebView view, String realm, String account, String args) {
         Log_OC.e(TAG, "onReceivedLoginRequest : " + realm + ", " + account + ", " + args);
     }
@@ -137,6 +157,6 @@ public class SsoWebViewClient extends WebViewClient {
         Log_OC.e(TAG, "shouldOverrideKeyEvent : " + event);
         return false;
     }
-    
     */
+    
 }