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.util.Log;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentTransaction;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.Button;
import android.widget.TextView;
import com.actionbarsherlock.app.ActionBar;
-import com.actionbarsherlock.app.SherlockActivity;
+import com.actionbarsherlock.app.SherlockFragmentActivity;
import com.actionbarsherlock.view.MenuItem;
import com.owncloud.android.R;
+import com.owncloud.android.lib.common.utils.Log_OC;
+import com.owncloud.android.ui.dialog.LoadingDialog;
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();
+public class LogHistoryActivity extends SherlockFragmentActivity {
+
+ private static final String MAIL_ATTACHMENT_TYPE = "text/plain";
+
+ private static final String TAG = LogHistoryActivity.class.getSimpleName();
+
+ private static final String DIALOG_WAIT_TAG = "DIALOG_WAIT";
+
+ private static final String KEY_LOG_TEXT = "LOG_TEXT";
- private static final String MAIL_ATTACHMENT_TYPE = "plain/text";
- private static final String LOGGER_FILE_NAME = "log.txt";
+ private String mLogPath = FileStorageUtils.getLogPath();
+ private File logDIR = null;
- File logDIR = null;
+ private TextView mLogTV;
@Override
@Override
public void onClick(View v) {
- Log_OC.stopLogging();
+ Log_OC.deleteHistoryLogging();
finish();
}
});
}
});
- if(mLogPath != null){
- logDIR = new File(mLogPath);
+ mLogTV = (TextView) findViewById(R.id.logTV);
+
+ /// Load of saved instance state
+ if(savedInstanceState != null) {
+ String logTextSaved = savedInstanceState.getString(LogHistoryActivity.KEY_LOG_TEXT);
+ mLogTV.setText(logTextSaved);
}
- if(logDIR != null && logDIR.isDirectory()) {
- readLogFile();
+ if (mLogPath != null) {
+ logDIR = new File(mLogPath);
+ }
+
+ if (logDIR != null && logDIR.isDirectory()) {
+ // Show a dialog while log data is being loaded
+ showLoadingDialog();
+
+ // Start a new thread that will load all the log data
+ new LoadingLogTask().execute();
}
}
-
+
+ @Override
+ protected void onPause() {
+ // TODO Auto-generated method stub
+ super.onPause();
+
+ dismissLoadingDialog();
+ }
+
+
@Override
public boolean onMenuItemSelected(int featureId, MenuItem item) {
super.onMenuItemSelected(featureId, item);
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);
}
/**
* Read and show log file info
*/
- private void readLogFile() {
+ 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());
+ }
- //Get the text file
- File file = new File(mLogPath,LOGGER_FILE_NAME);
+ return text.toString();
+ }
- //Read text from file
- StringBuilder text = new StringBuilder();
- try {
- BufferedReader br = new BufferedReader(new FileReader(file));
- String line;
+ /**
+ *
+ * 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);
- while ((line = br.readLine()) != null) {
- text.append(line);
- text.append('\n');
- }
- }
- catch (IOException e) {
+ dismissLoadingDialog();
+ }
+ }
- }
+ @Override
+ protected void onSaveInstanceState(Bundle outState) {
+ Log_OC.e(TAG, "onSaveInstanceState() start");
+ super.onSaveInstanceState(outState);
+ outState.putString(LogHistoryActivity.KEY_LOG_TEXT, mLogTV.getText().toString());
+ Log_OC.d(TAG, "onSaveInstanceState() end");
+ }
+ /**
+ * Show loading dialog
+ */
+ public void showLoadingDialog() {
+ // Construct dialog
+ LoadingDialog loading = new LoadingDialog(getResources().getString(R.string.log_progress_dialog_text));
+ FragmentManager fm = getSupportFragmentManager();
+ FragmentTransaction ft = fm.beginTransaction();
+ loading.show(ft, DIALOG_WAIT_TAG);
+ }
- TextView logTV = (TextView) findViewById(R.id.logTV);
- logTV.setText(text);
+ /**
+ * Dismiss loading dialog
+ */
+ public void dismissLoadingDialog(){
+ Fragment frag = getSupportFragmentManager().findFragmentByTag(DIALOG_WAIT_TAG);
+ if (frag != null) {
+ LoadingDialog loading = (LoadingDialog) frag;
+ loading.dismiss();
+ }
}
}
\ No newline at end of file
projects / pub / Android / ownCloud.git / blobdiff