From: David A. Velasco <dvelasco@solidgear.es>
Date: Mon, 9 Feb 2015 09:35:25 +0000 (+0100)
Subject: Revert "Enable session support for all authentication methods in the app"
X-Git-Tag: oc-android-1.7.0_signed~4
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/64435cab254f16b4676a1333c0d47dab9fb34ab2?hp=-c

Revert "Enable session support for all authentication methods in the app"

This reverts commit 02372fde243e41187bc034df4ba51bb30600af47.
---

64435cab254f16b4676a1333c0d47dab9fb34ab2
diff --git a/src/com/owncloud/android/MainApp.java b/src/com/owncloud/android/MainApp.java
index 072469d2..c2a4c68b 100644
--- a/src/com/owncloud/android/MainApp.java
+++ b/src/com/owncloud/android/MainApp.java
@@ -36,15 +36,26 @@ public class MainApp extends Application {
     
     private static final String AUTH_ON = "on";
     
+    @SuppressWarnings("unused")
+    private static final String POLICY_SINGLE_SESSION_PER_ACCOUNT = "single session per account";
+    @SuppressWarnings("unused")
+    private static final String POLICY_ALWAYS_NEW_CLIENT = "always new client";
+
     private static Context mContext;
     
     public void onCreate(){
         super.onCreate();
         MainApp.mContext = getApplicationContext();
-
-        // keep a single session per account handling session cookie in requests (& all the other cookies)
-        OwnCloudClientManagerFactory.setDefaultPolicy(Policy.SINGLE_SESSION_PER_ACCOUNT);
+        
+        boolean isSamlAuth = AUTH_ON.equals(getString(R.string.auth_method_saml_web_sso));
+        
+        if (isSamlAuth) {   
+            OwnCloudClientManagerFactory.setDefaultPolicy(Policy.SINGLE_SESSION_PER_ACCOUNT);
             
+        } else {
+            OwnCloudClientManagerFactory.setDefaultPolicy(Policy.ALWAYS_NEW_CLIENT);
+        }
+
         // initialise thumbnails cache on background thread
         new ThumbnailsCacheManager.InitDiskCacheTask().execute();