Browse Source

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

This reverts commit 02372fde243e41187bc034df4ba51bb30600af47.
David A. Velasco 10 years ago
parent
commit
64435cab25
1 changed files with 14 additions and 3 deletions
  1. 14 3
      src/com/owncloud/android/MainApp.java

+ 14 - 3
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();