First changes for saving logs

diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index a83f5a0..6a9bc49 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -210,6 +210,8 @@ FileFragment.ContainerActivity, OnNavigationListener, OnSslUntrustedCertListener
 
     @Override
     protected void onDestroy() {
 
     @Override
     protected void onDestroy() {

+        Log_OC.d(TAG, "onDestroy() FileDisplyActivty");
+//        Log_OC.stopLogging();

         super.onDestroy();
     }
 
         super.onDestroy();
     }
 

diff --git a/src/com/owncloud/android/ui/activity/LogHistoryActivity.java b/src/com/owncloud/android/ui/activity/LogHistoryActivity.java
index 6ccd48c..24f3a8e 100644 (file)
--- a/src/com/owncloud/android/ui/activity/LogHistoryActivity.java
+++ b/src/com/owncloud/android/ui/activity/LogHistoryActivity.java
@@ -37,6 +37,7 @@ import com.actionbarsherlock.view.MenuItem;
 import com.owncloud.android.R;
 import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.FileStorageUtils;
 import com.owncloud.android.R;
 import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.FileStorageUtils;

+import com.owncloud.android.utils.Log_OC;

 
 
 public class LogHistoryActivity extends SherlockActivity {
 
 
 public class LogHistoryActivity extends SherlockActivity {


@@ -64,19 +65,21 @@ public class LogHistoryActivity extends SherlockActivity {
             
             @Override
             public void onClick(View v) {
             
             @Override
             public void onClick(View v) {

-                File dir = new File(mLogPath);
-                if (dir != null) {
-                    File[] files = dir.listFiles();
-                    if(files!=null) { 
-                        for(File f: files) {
-                                f.delete();
-                        }
-                    }
-                    dir.delete();
-                }
+//                File dir = new File(mLogPath);
+//                if (dir != null) {
+//                    File[] files = dir.listFiles();
+//                    if(files!=null) { 
+//                        for(File f: files) {
+//                                f.delete();
+//                        }
+//                    }
+//                    dir.delete();
+//                }
+//                finish();
+
+                Log_OC.stopLogging();

                 finish();
             }
                 finish();
             }

-            

         });
 
 
         });
 
 

diff --git a/src/com/owncloud/android/utils/Log_OC.java b/src/com/owncloud/android/utils/Log_OC.java
index 18c81ee..d958ffd 100644 (file)
--- a/src/com/owncloud/android/utils/Log_OC.java
+++ b/src/com/owncloud/android/utils/Log_OC.java
@@ -5,13 +5,14 @@ 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.Calendar;

 import java.util.Date;
 import java.util.Locale;
 
 import java.util.Date;
 import java.util.Locale;
 

-import com.owncloud.android.MainApp;
-

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

+import com.owncloud.android.MainApp;
+

 
 
 public class Log_OC {
 
 
 public class Log_OC {


@@ -66,8 +67,12 @@ 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();
         }
 //        if (logFile.exists()) {
 //            logFile.delete();


@@ -76,7 +81,9 @@ public class Log_OC {
             logFile.createNewFile();
             buf = new BufferedWriter(new FileWriter(logFile, true));
             isEnabled = true;
             logFile.createNewFile();
             buf = new BufferedWriter(new FileWriter(logFile, true));
             isEnabled = true;

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

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


@@ -84,12 +91,15 @@ public class Log_OC {
     
     public static void stopLogging() {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.getDefault());
     
     public static void stopLogging() {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.getDefault());

-        String currentDateandTime = sdf.format(new Date());
+//        String currentDateandTime = sdf.format(new Date());

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

-            logFile.renameTo(new File(folder + File.separator + MainApp.getLogName() + currentDateandTime+".log"));
+//            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();


@@ -110,9 +120,12 @@ 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 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(); 
         }