X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/3e196f1f7dc64eb483df96ab3e950be32a5e718b..00482b6dcb1e98da39df54374f7098b51d66bee5:/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..71b9d571 100644 --- a/src/com/owncloud/android/ui/activity/LogHistoryActivity.java +++ b/src/com/owncloud/android/ui/activity/LogHistoryActivity.java @@ -1,5 +1,7 @@ -/* ownCloud Android client application - * Copyright (C) 2012-2013 ownCloud Inc. +/** + * ownCloud Android client application + * + * Copyright (C) 2015 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2, @@ -21,32 +23,47 @@ import java.io.BufferedReader; import java.io.File; import java.io.FileReader; import java.io.IOException; +import java.lang.ref.WeakReference; +import java.lang.reflect.Field; +import java.util.ArrayList; +import android.content.ActivityNotFoundException; import android.content.Intent; import android.net.Uri; +import android.os.AsyncTask; import android.os.Bundle; - +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentManager; +import android.support.v4.app.FragmentTransaction; +import android.support.v7.app.ActionBar; +import android.support.v7.app.ActionBarActivity; +import android.view.MenuItem; import android.view.View; import android.view.View.OnClickListener; import android.widget.Button; import android.widget.TextView; +import android.widget.Toast; -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.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 ActionBarActivity { + + private static final String MAIL_ATTACHMENT_TYPE = "text/plain"; + + private static final String KEY_LOG_TEXT = "LOG_TEXT"; + + private static final String TAG = LogHistoryActivity.class.getSimpleName(); - private static final String MAIL_ATTACHMENT_TYPE = "plain/text"; - private static final String LOGGER_FILE_NAME = "log.txt"; + private static final String DIALOG_WAIT_TAG = "DIALOG_WAIT"; - File logDIR = null; + private String mLogPath = FileStorageUtils.getLogPath(); + private File logDIR = null; + private String mLogText; @Override @@ -55,77 +72,59 @@ public class LogHistoryActivity extends SherlockActivity { setContentView(R.layout.log_send_file); setTitle(getText(R.string.actionbar_logger)); - ActionBar actionBar = getSherlock().getActionBar(); + ActionBar actionBar = getSupportActionBar(); actionBar.setIcon(DisplayUtils.getSeasonalIconId()); actionBar.setDisplayHomeAsUpEnabled(true); Button deleteHistoryButton = (Button) findViewById(R.id.deleteLogHistoryButton); Button sendHistoryButton = (Button) findViewById(R.id.sendLogHistoryButton); + TextView logTV = (TextView) findViewById(R.id.logTV); deleteHistoryButton.setOnClickListener(new OnClickListener() { @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); - } - if(logDIR != null && logDIR.isDirectory()) { -// File[] files = logDIR.listFiles(); -// -// if (files != null && files.length != 0) { -// ArrayList logfiles_name = new ArrayList(); -// 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 (savedInstanceState == null) { + 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 + LoadingLogTask task = new LoadingLogTask(logTV); + task.execute(); + } + } else { + mLogText = savedInstanceState.getString(KEY_LOG_TEXT); + logTV.setText(mLogText); } } - @Override - public boolean onMenuItemSelected(int featureId, MenuItem item) { - super.onMenuItemSelected(featureId, item); - + public boolean onOptionsItemSelected(MenuItem item) { + super.onOptionsItemSelected(item); switch (item.getItemId()) { - case android.R.id.home: - finish(); - break; - default: - return false; + case android.R.id.home: + finish(); + break; + default: + return false; } return true; } @@ -136,52 +135,150 @@ public class LogHistoryActivity extends SherlockActivity { */ private void sendMail() { - 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); + // For the moment we need to consider the possibility that setup.xml + // does not include the "mail_logger" entry. This block prevents that + // compilation fails in this case. + String emailAddress; + try { + Class stringClass = R.string.class; + Field mailLoggerField = stringClass.getField("mail_logger"); + int emailAddressId = (Integer) mailLoggerField.get(null); + emailAddress = getString(emailAddressId); + } catch (Exception e) { + emailAddress = ""; + } + + ArrayList uris = new ArrayList(); + + // Convert from paths to Android friendly Parcelable Uri's + for (String file : Log_OC.getLogFileNames()) + { + File logFile = new File(mLogPath, file); + if (logFile.exists()) { + uris.add(Uri.fromFile(logFile)); + } + } - // Explicitly only use Gmail to send - intent.setClassName("com.google.android.gm","com.google.android.gm.ComposeActivityGmail"); + Intent intent = new Intent(Intent.ACTION_SEND_MULTIPLE); - intent.putExtra(Intent.EXTRA_EMAIL, emailAddresses); - intent.putExtra(Intent.EXTRA_SUBJECT, getText(R.string.log_mail_subject)); + intent.putExtra(Intent.EXTRA_EMAIL, emailAddress); + String subject = String.format(getString(R.string.log_send_mail_subject), getString(R.string.app_name)); + intent.putExtra(Intent.EXTRA_SUBJECT, subject); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.setType(MAIL_ATTACHMENT_TYPE); - - intent.putExtra(Intent.EXTRA_STREAM, uri); - if (intent.resolveActivity(getPackageManager()) != null) { + intent.putParcelableArrayListExtra(Intent.EXTRA_STREAM, uris); + try { startActivity(intent); + } catch (ActivityNotFoundException e) { + Toast.makeText(this, getString(R.string.log_send_no_mail_app), Toast.LENGTH_LONG).show(); + Log_OC.i(TAG, "Could not find app for sending log history."); } - } + } /** - * Read and show log file info + * + * Class for loading the log data async + * */ - private void readLogFile() { + private class LoadingLogTask extends AsyncTask { + private final WeakReference textViewReference; + + public LoadingLogTask(TextView logTV){ + // Use of a WeakReference to ensure the TextView can be garbage collected + textViewReference = new WeakReference(logTV); + } - //Get the text file - File file = new File(mLogPath,LOGGER_FILE_NAME); + protected String doInBackground(String... args) { + return readLogFile(); + } - //Read text from file - StringBuilder text = new StringBuilder(); + protected void onPostExecute(String result) { + if (textViewReference != null && result != null) { + final TextView logTV = textViewReference.get(); + if (logTV != null) { + mLogText = result; + logTV.setText(mLogText); + dismissLoadingDialog(); + } + } + } + + /** + * Read and show log file info + */ + private String readLogFile() { + + String[] logFileName = Log_OC.getLogFileNames(); + + //Read text from files + StringBuilder text = new StringBuilder(); + + BufferedReader br = null; + 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()) { + 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()); + + } finally { + if (br != null) { + try { + br.close(); + } catch (IOException e) { + // ignore + } + } + } - 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) { + /** + * 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); + } - } + /** + * Dismiss loading dialog + */ + public void dismissLoadingDialog(){ + Fragment frag = getSupportFragmentManager().findFragmentByTag(DIALOG_WAIT_TAG); + if (frag != null) { + LoadingDialog loading = (LoadingDialog) frag; + loading.dismiss(); + } + } + @Override + protected void onSaveInstanceState(Bundle outState) { + super.onSaveInstanceState(outState); - TextView logTV = (TextView) findViewById(R.id.logTV); - logTV.setText(text); + /// global state + outState.putString(KEY_LOG_TEXT, mLogText); } } \ No newline at end of file