Done some changes for storing the log messages on log file and grant that logs are...

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

diff --git a/src/com/owncloud/android/utils/Log_OC.java b/src/com/owncloud/android/utils/Log_OC.java
index 098625a..fbd37fe 100644 (file)
--- a/src/com/owncloud/android/utils/Log_OC.java
+++ b/src/com/owncloud/android/utils/Log_OC.java
@@ -5,15 +5,12 @@ import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.text.SimpleDateFormat;

-import java.util.Date;
-import java.util.Locale;
-
-import com.owncloud.android.MainApp;
+import java.util.Calendar;

 
 

+import android.os.Environment;

 import android.util.Log;
 
 
 import android.util.Log;
 
 

-

 public class Log_OC {
     
 
 public class Log_OC {
     
 


@@ -66,37 +63,37 @@ public class Log_OC {
         folder = new File(logPath);
         logFile = new File(folder + File.separator + "log.txt");
         
         folder = new File(logPath);
         logFile = new File(folder + File.separator + "log.txt");
         

+        boolean isFileCreated = false;
+        

         if (!folder.exists()) {
             folder.mkdirs();
         if (!folder.exists()) {
             folder.mkdirs();

+            isFileCreated = true;
+            Log.d("LOG_OC", "Log file created");

         }
         }

-        if (logFile.exists()) {
-            logFile.delete();
-        }
+

         try { 
             logFile.createNewFile();
             buf = new BufferedWriter(new FileWriter(logFile, true));
             isEnabled = true;
         try { 
             logFile.createNewFile();
             buf = new BufferedWriter(new FileWriter(logFile, true));
             isEnabled = true;

-            appendPhoneInfo();
+            if (isFileCreated) {
+                appendPhoneInfo();
+            }

         }catch (IOException e){ 
             e.printStackTrace(); 
         } 
     }
     
     public static void stopLogging() {
         }catch (IOException e){ 
             e.printStackTrace(); 
         } 
     }
     
     public static void stopLogging() {

-        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.getDefault());
-        String currentDateandTime = sdf.format(new Date());

         if (logFile != null) {
         if (logFile != null) {

-            logFile.renameTo(new File(folder + File.separator + MainApp.getLogName() + currentDateandTime+".log"));
-          

             isEnabled = false;
             try {
             isEnabled = false;
             try {

+                buf = new BufferedWriter(new FileWriter(logFile, false));
+                buf.append("");

                 buf.close();
             } catch (IOException e) {
                 e.printStackTrace();
             } 
                 buf.close();
             } catch (IOException e) {
                 e.printStackTrace();
             } 

-        

         }
         }

-        

     }
     
     private static void appendPhoneInfo() {
     }
     
     private static void appendPhoneInfo() {


@@ -110,9 +107,15 @@ public class Log_OC {
     
     private static void appendLog(String text) { 
         if (isEnabled) {
     
     private static void appendLog(String text) { 
         if (isEnabled) {

-           try { 
-               buf.append(text); 
-               buf.newLine(); 
+            String logPath = Environment.getExternalStorageDirectory()+File.separator+"owncloud"+File.separator+"log";
+            startLogging(logPath);
+            String timeStamp = new SimpleDateFormat("HH:mm:ss").format(Calendar.getInstance().getTime());
+
+            try {
+               buf = new BufferedWriter(new FileWriter(logFile, true));
+               buf.write(timeStamp + " -> " +text); 
+               buf.newLine();
+               buf.close();

            } catch (IOException e) { 
                e.printStackTrace(); 
         } 
            } catch (IOException e) { 
                e.printStackTrace(); 
         }