Fixed some log levels

[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 0b21b06..072469d 100644 (file)
--- a/src/com/owncloud/android/MainApp.java
+++ b/src/com/owncloud/android/MainApp.java
@@ -16,15 +16,13 @@
  */
 package com.owncloud.android;
 
  */
 package com.owncloud.android;
 

-import java.io.File;
-

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

-import android.os.Environment;

 
 

+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.OwnCloudClientManagerFactory;
 import com.owncloud.android.lib.common.OwnCloudClientManagerFactory.Policy;

-import com.owncloud.android.utils.Log_OC;
+import com.owncloud.android.lib.common.utils.Log_OC;

 /**
  * Main Application of the project
  * 
 /**
  * Main Application of the project
  * 


@@ -38,31 +36,27 @@ public class MainApp extends Application {
     
     private static final String AUTH_ON = "on";
     
     
     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();
     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);
+
+        // keep a single session per account handling session cookie in requests (& all the other cookies)
+        OwnCloudClientManagerFactory.setDefaultPolicy(Policy.SINGLE_SESSION_PER_ACCOUNT);

             
             

-        } else {
-            OwnCloudClientManagerFactory.setDefaultPolicy(Policy.ALWAYS_NEW_CLIENT);
-        }
+        // initialise thumbnails cache on background thread
+        new ThumbnailsCacheManager.InitDiskCacheTask().execute();

         
         if (BuildConfig.DEBUG) {
         
         if (BuildConfig.DEBUG) {

-            String logpath = Environment.getExternalStorageDirectory()+File.separator+"owncloud"+File.separator+"log";
+
+            String dataFolder = getDataFolder();
+
+            // Set folder for store logs
+            Log_OC.setLogDataFolder(dataFolder);
+
+            Log_OC.startLogging();

             Log_OC.d("Debug", "start logging");
             Log_OC.d("Debug", "start logging");

-            Log_OC.v("PATH", logpath);
-            Log_OC.startLogging(logpath);

         }
     }
 
         }
     }