Merge remote-tracking branch 'upstream/develop' into

[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 0858a66..e04239d 100644 (file)
--- a/src/com/owncloud/android/MainApp.java
+++ b/src/com/owncloud/android/MainApp.java
@@ -16,46 +16,59 @@
  */
 package com.owncloud.android;
 
  */
 package com.owncloud.android;
 

-import com.owncloud.android.lib.common.OwnCloudClientManager;
-import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
-import com.owncloud.android.lib.common.OwnCloudClientManagerFactory.Policy;
-

 import android.app.Application;
 import android.content.Context;
 import android.app.Application;
 import android.content.Context;

+
+import com.owncloud.android.datamodel.ThumbnailsCacheManager;
+import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
+import com.owncloud.android.lib.common.OwnCloudClientManagerFactory.Policy;
+import com.owncloud.android.lib.common.utils.Log_OC;

 /**
  * Main Application of the project
  * 
 /**
  * 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 David A. Velasco
  */
 public class MainApp extends Application {
  * 
  * @author masensio
  * @author David A. Velasco
  */
 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 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 OwnCloudClientManager mOwnCloudClientManager;
-

     public void onCreate(){
         super.onCreate();
         MainApp.mContext = getApplicationContext();
         
     public void onCreate(){
         super.onCreate();
         MainApp.mContext = getApplicationContext();
         

-        String clientPolicy = getString(R.string.client_creation_policy);
-        if (clientPolicy != null &&
-                POLICY_SINGLE_SESSION_PER_ACCOUNT.equals(clientPolicy.toLowerCase())) {
-            
-            mOwnCloudClientManager = OwnCloudClientManagerFactory.newOwnCloudClientManager(
-                    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 {
             
         } else {

-            mOwnCloudClientManager = OwnCloudClientManagerFactory.newOwnCloudClientManager(
-                    Policy.ALWAYS_NEW_CLIENT);
+            OwnCloudClientManagerFactory.setDefaultPolicy(Policy.ALWAYS_NEW_CLIENT);

         }
         
         }
         

+        // initialise thumbnails cache on background thread
+        new ThumbnailsCacheManager.InitDiskCacheTask().execute();
+        
+        if (BuildConfig.DEBUG) {
+
+            String dataFolder = getDataFolder();
+
+            // Set folder for store logs
+            Log_OC.setLogDataFolder(dataFolder);
+
+            Log_OC.startLogging();
+            Log_OC.d("Debug", "start logging");
+        }

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


@@ -68,7 +81,7 @@ public class MainApp extends Application {
     public static String getAccountType() {
         return getAppContext().getResources().getString(R.string.account_type);
     }
     public static String getAccountType() {
         return getAppContext().getResources().getString(R.string.account_type);
     }

-    
+

     //  From AccountAuthenticator 
     //  public static final String AUTHORITY = "org.owncloud";
     public static String getAuthority() {
     //  From AccountAuthenticator 
     //  public static final String AUTHORITY = "org.owncloud";
     public static String getAuthority() {


@@ -103,7 +116,4 @@ public class MainApp extends Application {
         return getAppContext().getResources().getString(R.string.log_name);
     }
 
         return getAppContext().getResources().getString(R.string.log_name);
     }
 

-    public OwnCloudClientManager getOwnCloudClientManager() {
-        return mOwnCloudClientManager;
-    }

 }
 }