X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/4867bb32c3a1d4fcafa7b557247f34ef4564fa03..f728c502c55c85f950d142a99fac2fce49c4a9a3:/src/com/owncloud/android/MainApp.java

diff --git a/src/com/owncloud/android/MainApp.java b/src/com/owncloud/android/MainApp.java
index ca59cb31..072469d2 100644
--- a/src/com/owncloud/android/MainApp.java
+++ b/src/com/owncloud/android/MainApp.java
@@ -19,26 +19,6 @@ package com.owncloud.android;
 import android.app.Application;
 import android.content.Context;
 
-import com.owncloud.android.authentication.AccountUtils;
-import com.owncloud.android.datamodel.ThumbnailsCacheManager;
-import android.app.Application;
-import android.content.Context;
-
-import com.owncloud.android.authentication.AccountUtils;
-import com.owncloud.android.datamodel.ThumbnailsCacheManager;
-import android.app.Application;
-import android.content.Context;
-
-import com.owncloud.android.authentication.AccountUtils;
-import com.owncloud.android.datamodel.ThumbnailsCacheManager;
-import android.app.Application;
-import android.content.Context;
-
-import com.owncloud.android.datamodel.ThumbnailsCacheManager;
-import android.app.Application;
-import android.content.Context;
-
-import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.datamodel.ThumbnailsCacheManager;
 import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
 import com.owncloud.android.lib.common.OwnCloudClientManagerFactory.Policy;
@@ -56,26 +36,15 @@ 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();
-        
-        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);
-        }
 
+        // keep a single session per account handling session cookie in requests (& all the other cookies)
+        OwnCloudClientManagerFactory.setDefaultPolicy(Policy.SINGLE_SESSION_PER_ACCOUNT);
+            
         // initialise thumbnails cache on background thread
         new ThumbnailsCacheManager.InitDiskCacheTask().execute();