X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/3e196f1f7dc64eb483df96ab3e950be32a5e718b..167848e38c6af06a09fc6998bb8201f3953057a3:/src/com/owncloud/android/ui/activity/LogHistoryActivity.java

diff --git a/src/com/owncloud/android/ui/activity/LogHistoryActivity.java b/src/com/owncloud/android/ui/activity/LogHistoryActivity.java
index 24f3a8e6..a07cfde6 100644
--- a/src/com/owncloud/android/ui/activity/LogHistoryActivity.java
+++ b/src/com/owncloud/android/ui/activity/LogHistoryActivity.java
@@ -21,11 +21,13 @@ import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
+import java.util.ArrayList;
 
+import android.app.ProgressDialog;
 import android.content.Intent;
 import android.net.Uri;
+import android.os.AsyncTask;
 import android.os.Bundle;
-
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
@@ -35,18 +37,22 @@ import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.SherlockActivity;
 import com.actionbarsherlock.view.MenuItem;
 import com.owncloud.android.R;
+import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.FileStorageUtils;
-import com.owncloud.android.utils.Log_OC;
 
 
 public class LogHistoryActivity extends SherlockActivity {
-    String mLogPath = FileStorageUtils.getLogPath();
 
-    private static final String MAIL_ATTACHMENT_TYPE = "plain/text";
-    private static final String LOGGER_FILE_NAME = "log.txt";
+    private static final String MAIL_ATTACHMENT_TYPE = "text/plain";
+
+    private static final String TAG = LogHistoryActivity.class.getSimpleName();
 
-    File logDIR = null;
+    private String mLogPath = FileStorageUtils.getLogPath();
+    private File logDIR = null;
+
+    private ProgressDialog mPd = null;
+    private TextView mLogTV;
 
 
     @Override
@@ -65,61 +71,40 @@ public class LogHistoryActivity extends SherlockActivity {
             
             @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();
-//                }
-//                finish();
-
-                Log_OC.stopLogging();
+
+                Log_OC.deleteHistoryLogging();
                 finish();
             }
         });
 
-
         sendHistoryButton.setOnClickListener(new OnClickListener() {
 
             @Override
             public void onClick(View v) {
                 sendMail();
             }
-
         });
-        
-       
-        if(mLogPath != null){
-        logDIR = new File(mLogPath);
+
+        mLogTV = (TextView) findViewById(R.id.logTV);
+
+        if (mLogPath != null) {
+            logDIR = new File(mLogPath);
         }
 
-        if(logDIR != null && logDIR.isDirectory()) {
-//            File[] files = logDIR.listFiles();
-//
-//            if (files != null && files.length != 0) {
-//                ArrayList<String> logfiles_name = new ArrayList<String>();
-//                for (File file : files) {
-//                    logfiles_name.add(file.getName());
-//                }
-//                    String[] logFiles2Array = logfiles_name.toArray(new String[logfiles_name.size()]);
-//                    LogListAdapter listadapter = new LogListAdapter(this,logFiles2Array);
-//                    listView.setAdapter(listadapter);
-//            }
-
-            readLogFile();
+        if (logDIR != null && logDIR.isDirectory()) {
+            // Show the ProgressDialog while log data is being loaded
+            mPd = ProgressDialog.show(this, getText(R.string.actionbar_logger), 
+                    getText(R.string.log_progress_dialog_text), true, false);
 
+            // Start a new thread that will load all the log data
+            new LoadingLogTask().execute();
         }
     }
 
-    
+
     @Override
     public boolean onMenuItemSelected(int featureId, MenuItem item) {
         super.onMenuItemSelected(featureId, item);
-
         switch (item.getItemId()) {
         case android.R.id.home:
             finish();
@@ -138,18 +123,27 @@ public class LogHistoryActivity extends SherlockActivity {
 
         String emailAddresses[] = { getText(R.string.mail_logger).toString() };
 
-        Uri uri = Uri.parse("file://" + mLogPath + File.separator + LOGGER_FILE_NAME);
-        Intent intent = new Intent(Intent.ACTION_SEND);
+        ArrayList<Uri> uris = new ArrayList<Uri>();
+
+        // Convert from paths to Android friendly Parcelable Uri's
+        for (String file : Log_OC.getLogFileNames())
+        {
+            if (new File(mLogPath + File.separator, file).exists()) {
+                Uri u = Uri.parse("file://" + mLogPath + File.separator + file);
+                uris.add(u);
+            }
+        }
+
+        Intent intent = new Intent(Intent.ACTION_SEND_MULTIPLE);
 
         // Explicitly only use Gmail to send
         intent.setClassName("com.google.android.gm","com.google.android.gm.ComposeActivityGmail");
-
         intent.putExtra(Intent.EXTRA_EMAIL, emailAddresses);
         intent.putExtra(Intent.EXTRA_SUBJECT, getText(R.string.log_mail_subject));
         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         intent.setType(MAIL_ATTACHMENT_TYPE);
+        intent.putParcelableArrayListExtra(Intent.EXTRA_STREAM, uris);
 
-        intent.putExtra(Intent.EXTRA_STREAM, uri);
         if (intent.resolveActivity(getPackageManager()) != null) {
             startActivity(intent);
         }
@@ -159,29 +153,56 @@ public class LogHistoryActivity extends SherlockActivity {
     /**
      * Read and show log file info
      */
-    private void readLogFile() {
-
-      //Get the text file
-      File file = new File(mLogPath,LOGGER_FILE_NAME);
-
-      //Read text from file
-      StringBuilder text = new StringBuilder();
+    private String readLogFile() {
+
+        String[] logFileName = Log_OC.getLogFileNames();
+
+        //Read text from files
+        StringBuilder text = new StringBuilder();
+
+        try {
+
+            String line;
+
+            for (int i = logFileName.length-1; i >= 0; i--) {
+                File file = new File(mLogPath,logFileName[i]);
+                if (file.exists()) {
+                    // Check if FileReader is ready
+                    if (new FileReader(file).ready()) {
+                        BufferedReader br = new BufferedReader(new FileReader(file));
+                        while ((line = br.readLine()) != null) {
+                            // Append the log info
+                            text.append(line);
+                            text.append('\n');
+                        }
+                    }
+                }
+            }
+        }
+        catch (IOException e) {
+            Log_OC.d(TAG, e.getMessage().toString());
+        }
 
-      try {
-          BufferedReader br = new BufferedReader(new FileReader(file));
-          String line;
+        return text.toString();
+    }
 
-          while ((line = br.readLine()) != null) {
-              text.append(line);
-              text.append('\n');
-          }
-      }
-      catch (IOException e) {
 
-      }
+    /**
+     *
+     * Class for loading the log data async
+     *
+     */
+    private class LoadingLogTask extends AsyncTask<String, Void, String> {
+        protected String doInBackground(String... args) {
+            return readLogFile();
+        }
 
+        protected void onPostExecute(String result) {
+            mLogTV.setText(result);
 
-      TextView logTV = (TextView) findViewById(R.id.logTV);
-      logTV.setText(text);
-    }
+            if (mPd != null) {
+                mPd.dismiss();
+            }
+        }
+   }
 }
\ No newline at end of file