Manage size of log file automatically, handling two log files with a maximun size

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

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

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


@@ -31,7 +35,10 @@ import android.content.Context;
  * @author David A. Velasco
  */
 public class MainApp extends Application {
  * @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 final String POLICY_SINGLE_SESSION_PER_ACCOUNT = "single session per account";
     @SuppressWarnings("unused")
     private static final String POLICY_ALWAYS_NEW_CLIENT = "always new client";


@@ -42,16 +49,21 @@ public class MainApp extends Application {
         super.onCreate();
         MainApp.mContext = getApplicationContext();
         
         super.onCreate();
         MainApp.mContext = getApplicationContext();
         

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

+        if (BuildConfig.DEBUG) {
+            String logpath = Environment.getExternalStorageDirectory()+File.separator+"owncloud"+File.separator+"log";
+            Log_OC.d("Debug", "start logging");
+            Log_OC.v("PATH", logpath);
+            Log_OC.startLogging(logpath);
+        }

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


@@ -64,7 +76,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() {