From: masensio <masensio@solidgear.es>
Date: Fri, 23 Aug 2013 11:28:02 +0000 (+0200)
Subject: OC-1055: Remove follow instruction.
X-Git-Tag: oc-android-1.4.6~18^2~4^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/3072a29730c5d3af409a7f0a0e07598caf3b36c3?hp=--cc

OC-1055: Remove follow instruction.
---

3072a29730c5d3af409a7f0a0e07598caf3b36c3
diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
index 477af967..4fd50c7f 100644
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -716,6 +716,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
         mAuthCheckOperation = new  ExistenceCheckOperation("", this, false);
         WebdavClient client = OwnCloudClientUtils.createOwnCloudClient(Uri.parse(mHostBaseUrl + webdav_path), this, false);
         mOperationThread = mAuthCheckOperation.execute(client, this, mHandler);
+      
     }
 
     /**
@@ -758,8 +759,8 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
             mSamlDialog = SamlWebViewDialog.newInstance(url, targetUrl);            
             mSamlDialog.show(getSupportFragmentManager(), TAG_SAML_DIALOG);
             
-            mAuthStatusIcon = android.R.drawable.ic_secure;
-            mAuthStatusText = R.string.auth_follow_auth_server;
+            mAuthStatusIcon = 0;
+            mAuthStatusText = 0;
             
         } else {
             mAuthStatusIcon = R.drawable.common_error;
@@ -1102,6 +1103,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
             showAuthStatus();
             Log_OC.d(TAG, "Access failed: " + result.getLogMessage());
         }
+
     }
 
 
@@ -1540,6 +1542,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
                 finish();
             }
         }
+
             
     }
 
@@ -1563,8 +1566,8 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
             // TODO - show fail
             Log_OC.d(TAG, "SSO failed");
         }
-    }
     
+    }
     
 
 }
diff --git a/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java b/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java
index 9ed8a446..fe20d815 100644
--- a/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java
+++ b/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java
@@ -29,6 +29,7 @@ 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;
@@ -115,7 +116,9 @@ 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);
             mTargetUrl = getArguments().getString(ARG_TARGET_URL);