From: jabarros Date: Thu, 11 Sep 2014 07:33:40 +0000 (+0200) Subject: Visualize both older and current log files info in the log history view and send... X-Git-Tag: oc-android-1.7.0_signed~176^2~11 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c7263a2cb4a012886b8ca7f88aaa766ff2f117be?ds=inline;hp=--cc Visualize both older and current log files info in the log history view and send both attached in the mail --- c7263a2cb4a012886b8ca7f88aaa766ff2f117be diff --git a/src/com/owncloud/android/ui/activity/LogHistoryActivity.java b/src/com/owncloud/android/ui/activity/LogHistoryActivity.java index 775bec9a..a2fd9f86 100644 --- a/src/com/owncloud/android/ui/activity/LogHistoryActivity.java +++ b/src/com/owncloud/android/ui/activity/LogHistoryActivity.java @@ -21,11 +21,11 @@ import java.io.BufferedReader; import java.io.File; import java.io.FileReader; import java.io.IOException; +import java.util.ArrayList; import android.content.Intent; import android.net.Uri; import android.os.Bundle; - import android.view.View; import android.view.View.OnClickListener; import android.widget.Button; @@ -42,8 +42,7 @@ import com.owncloud.android.utils.Log_OC; public class LogHistoryActivity extends SherlockActivity { - private static final String MAIL_ATTACHMENT_TYPE = "plain/text"; - private static final String LOGGER_FILE_NAME = "currentLog.txt"; + private static final String MAIL_ATTACHMENT_TYPE = "text/plain"; private static final String TAG = LogHistoryActivity.class.getSimpleName(); @@ -112,18 +111,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 uris = new ArrayList(); + + // 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); } @@ -135,26 +143,36 @@ public class LogHistoryActivity extends SherlockActivity { */ private void readLogFile() { - //Get the text file - File file = new File(mLogPath,LOGGER_FILE_NAME); + String[] logFileName = Log_OC.getLogFileNames(); + + //Read text from files + StringBuilder text = new StringBuilder(); - //Read text from file - StringBuilder text = new StringBuilder(); + try { - try { - BufferedReader br = new BufferedReader(new FileReader(file)); - String line; + String line; - while ((line = br.readLine()) != null) { - text.append(line); - text.append('\n'); - } - } - catch (IOException e) { - Log_OC.d(TAG, e.getMessage().toString()); - } + 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()); + } - TextView logTV = (TextView) findViewById(R.id.logTV); - logTV.setText(text); + // Show in the screen the content of the log + TextView logTV = (TextView) findViewById(R.id.logTV); + logTV.setText(text); } } \ No newline at end of file diff --git a/src/com/owncloud/android/utils/Log_OC.java b/src/com/owncloud/android/utils/Log_OC.java index defae214..f492e265 100644 --- a/src/com/owncloud/android/utils/Log_OC.java +++ b/src/com/owncloud/android/utils/Log_OC.java @@ -19,7 +19,9 @@ public class Log_OC { private static File mFolder; private static BufferedWriter mBuf; - private static String[] mLogFileNames = {"currentLog.txt", "backupLog.txt"}; + private static String[] mLogFileNames = {"currentLog.txt", "olderLog.txt"}; + private static String mLogPath = FileStorageUtils.getLogPath(); + private static boolean isMaxFileSizeReached = false; public static void i(String TAG, String message){ @@ -60,7 +62,7 @@ public class Log_OC { Log.wtf(TAG,message); appendLog(TAG+" : "+ message); } - + /** * Start doing logging * @param logPath : path of log file @@ -82,9 +84,9 @@ public class Log_OC { if (isMaxFileSizeReached) { // Move current log file info to another file - File secondLogFile = new File(mFolder + File.separator + mLogFileNames[1]); + File olderFile = new File(mFolder + File.separator + mLogFileNames[1]); if (mLogFile.exists()) { - mLogFile.renameTo(secondLogFile); + mLogFile.renameTo(olderFile); } // Construct a new file for current log info @@ -140,8 +142,7 @@ public class Log_OC { * @param text : text for adding to the log file */ private static void appendLog(String text) { - String logPath = Environment.getExternalStorageDirectory()+File.separator+"owncloud"+File.separator+"log"; - startLogging(logPath); + startLogging(mLogPath); String timeStamp = new SimpleDateFormat(SIMPLE_DATE_FORMAT).format(Calendar.getInstance().getTime()); try { @@ -153,4 +154,12 @@ public class Log_OC { e.printStackTrace(); } } + + public static String[] getLogFileNames() { + return mLogFileNames; + } + + public static void setmLogFileNames(String[] logFileNames) { + Log_OC.mLogFileNames = logFileNames; + } }