X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/4599553545d13dee425c7ce9610f083fa38a208e..ec19a11a385ff21d3e85a94e618d48d8be9ef20d:/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 a07cfde6..676388d2 100644 --- a/src/com/owncloud/android/ui/activity/LogHistoryActivity.java +++ b/src/com/owncloud/android/ui/activity/LogHistoryActivity.java @@ -21,39 +21,43 @@ 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.app.ProgressDialog; 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.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; -public class LogHistoryActivity extends SherlockActivity { +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 String mLogPath = FileStorageUtils.getLogPath(); private File logDIR = null; - private ProgressDialog mPd = null; - private TextView mLogTV; - @Override protected void onCreate(Bundle savedInstanceState) { @@ -85,23 +89,23 @@ public class LogHistoryActivity extends SherlockActivity { } }); - mLogTV = (TextView) findViewById(R.id.logTV); - if (mLogPath != null) { logDIR = new File(mLogPath); } 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); + // Show a dialog while log data is being loaded + showLoadingDialog(); + + TextView logTV = (TextView) findViewById(R.id.logTV); // Start a new thread that will load all the log data - new LoadingLogTask().execute(); + LoadingLogTask task = new LoadingLogTask(logTV); + task.execute(); + } } - @Override public boolean onMenuItemSelected(int featureId, MenuItem item) { super.onMenuItemSelected(featureId, item); @@ -121,7 +125,16 @@ public class LogHistoryActivity extends SherlockActivity { */ private void sendMail() { - String emailAddresses[] = { getText(R.string.mail_logger).toString() }; + 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(); @@ -138,7 +151,7 @@ public class LogHistoryActivity extends SherlockActivity { // 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_EMAIL, new String[]{ emailAddress }); intent.putExtra(Intent.EXTRA_SUBJECT, getText(R.string.log_mail_subject)); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.setType(MAIL_ATTACHMENT_TYPE); @@ -149,60 +162,100 @@ public class LogHistoryActivity extends SherlockActivity { } } - /** - * Read and show log file info + * + * Class for loading the log data async + * */ - private String readLogFile() { + private class LoadingLogTask extends AsyncTask { + private final WeakReference textViewReference; - String[] logFileName = Log_OC.getLogFileNames(); + public LoadingLogTask(TextView logTV){ + // Use of a WeakReference to ensure the TextView can be garbage collected + textViewReference = new WeakReference(logTV); + } - //Read text from files - StringBuilder text = new StringBuilder(); + protected String doInBackground(String... args) { + return readLogFile(); + } - try { + protected void onPostExecute(String result) { + if (textViewReference != null && result != null) { + final TextView logTV = textViewReference.get(); + if (logTV != null) { + logTV.setText(result); + dismissLoadingDialog(); + } + } + } - 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'); + /** + * 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 + } + } + } + + return text.toString(); } - catch (IOException e) { - Log_OC.d(TAG, e.getMessage().toString()); - } + } - return text.toString(); + /** + * 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); } - /** - * - * Class for loading the log data async - * + * Dismiss loading dialog */ - private class LoadingLogTask extends AsyncTask { - protected String doInBackground(String... args) { - return readLogFile(); + public void dismissLoadingDialog(){ + Fragment frag = getSupportFragmentManager().findFragmentByTag(DIALOG_WAIT_TAG); + if (frag != null) { + LoadingDialog loading = (LoadingDialog) frag; + loading.dismiss(); } - - protected void onPostExecute(String result) { - mLogTV.setText(result); - - if (mPd != null) { - mPd.dismiss(); - } - } - } + } } \ No newline at end of file