Merge branch 'develop' into setup_buttons

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

diff --git a/src/com/owncloud/android/Log_OC.java b/src/com/owncloud/android/Log_OC.java
index f65ed17..5a1be29 100644 (file)
--- a/src/com/owncloud/android/Log_OC.java
+++ b/src/com/owncloud/android/Log_OC.java
@@ -11,8 +11,10 @@ import java.util.Locale;
 import android.util.Log;
 
 
+
 public class Log_OC {
     
+
     private static boolean isEnabled = false;
     private static File logFile;
     private static File folder;
@@ -27,41 +29,40 @@ public class Log_OC {
 
     public static void d(String TAG, String message){
         Log.d(TAG, message);
-        appendLog(TAG+" : "+message);
+        appendLog(TAG + " : " + message);
     }
     public static void d(String TAG, String message, Exception e) {
         Log.d(TAG, message, e);
-        appendLog(TAG+" : "+ message+" Exception : "+e.getStackTrace());
+        appendLog(TAG + " : " + message + " Exception : "+ e.getStackTrace());
     }
     public static void e(String TAG, String message){
         Log.e(TAG, message);
-        appendLog(TAG+" : "+message);
+        appendLog(TAG + " : " + message);
     }
     
     public static void e(String TAG, String message, Throwable e) {
         Log.e(TAG, message, e);
-        appendLog(TAG+" : "+ message+" Exception : "+e.getStackTrace());
+        appendLog(TAG+" : " + message +" Exception : " + e.getStackTrace());
     }
     
     public static void v(String TAG, String message){
         Log.v(TAG, message);
-        appendLog(TAG+" : "+message);
+        appendLog(TAG+" : "+ message);
     }
     
     public static void w(String TAG, String message) {
         Log.w(TAG,message); 
-        appendLog(TAG+" : "+message);
+        appendLog(TAG+" : "+ message);
     }
     
     public static void wtf(String TAG, String message) {
         Log.wtf(TAG,message); 
-        appendLog(TAG+" : "+message);
+        appendLog(TAG+" : "+ message);
     }
     
     public static void startLogging(String logPath) {
-        
-        folder = new File(logPath+File.separator+"log");
-        logFile = new File(folder+File.separator+"log.txt");
+        folder = new File(logPath);
+        logFile = new File(folder + File.separator + "log.txt");
         
         if (!folder.exists()) {
             folder.mkdirs();
@@ -80,10 +81,11 @@ public class Log_OC {
     }
     
     public static void stopLogging() {
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd_HHmmss",Locale.getDefault());
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.getDefault());
         String currentDateandTime = sdf.format(new Date());
         if (logFile != null) {
-            logFile.renameTo(new File(folder+File.separator+"log_"+currentDateandTime));
+            logFile.renameTo(new File(folder + File.separator + MainApp.getLogName() + currentDateandTime+".log"));
+          
             isEnabled = false;
             try {
                 buf.close();
@@ -111,8 +113,8 @@ public class Log_OC {
                buf.newLine(); 
            } catch (IOException e) { 
                e.printStackTrace(); 
-           } 
-      }
+        } 
+    }
 }