Merge branch 'develop' of https://github.com/tobiasKaminsky/android into thumbnails_f...

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

diff --git a/src/com/owncloud/android/MainApp.java b/src/com/owncloud/android/MainApp.java
index 85718ff..08efe34 100644 (file)
--- a/src/com/owncloud/android/MainApp.java
+++ b/src/com/owncloud/android/MainApp.java
@@ -16,22 +16,44 @@
  */
 package com.owncloud.android;
 
  */
 package com.owncloud.android;
 

+import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
+import com.owncloud.android.lib.common.OwnCloudClientManagerFactory.Policy;
+

 import android.app.Application;
 import android.content.Context;
 /**
  * Main Application of the project
  * 
 import android.app.Application;
 import android.content.Context;
 /**
  * Main Application of the project
  * 

- * Contains methods to build the "static" strings. These strings were before constants in different classes
+ * Contains methods to build the "static" strings. These strings were before constants in different
+ * classes

  * 
  * @author masensio
  * 
  * @author masensio

+ * @author David A. Velasco

  */
 public class MainApp extends Application {
  */
 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;
 
     private static Context mContext;

-
+    

     public void onCreate(){
         super.onCreate();
         MainApp.mContext = getApplicationContext();
     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);
+        }
+        

     }
 
     public static Context getAppContext() {
     }
 
     public static Context getAppContext() {


@@ -78,4 +100,5 @@ public class MainApp extends Application {
     public static String getLogName() {
         return getAppContext().getResources().getString(R.string.log_name);
     }
     public static String getLogName() {
         return getAppContext().getResources().getString(R.string.log_name);
     }

+

 }
 }