X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/f029363e477deda53815f92035317e2153e893f2..700d4449779ee9702437103695a79a1cf7169e9c:/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 7b6b4a9f..0186e1ee 100644 --- a/src/com/owncloud/android/ui/activity/LogHistoryActivity.java +++ b/src/com/owncloud/android/ui/activity/LogHistoryActivity.java @@ -21,9 +21,10 @@ 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; @@ -50,16 +51,15 @@ public class LogHistoryActivity extends SherlockFragmentActivity { 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 DIALOG_WAIT_TAG = "DIALOG_WAIT"; - private static final String KEY_LOG_TEXT = "LOG_TEXT"; - private String mLogPath = FileStorageUtils.getLogPath(); private File logDIR = null; - - private TextView mLogTV; + private String mLogText; @Override @@ -73,6 +73,7 @@ public class LogHistoryActivity extends SherlockFragmentActivity { 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() { @@ -92,37 +93,25 @@ public class LogHistoryActivity extends SherlockFragmentActivity { } }); - 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 (mLogPath != null) { - logDIR = new File(mLogPath); - } + 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(); + 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(); + // 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 - protected void onPause() { - // TODO Auto-generated method stub - super.onPause(); - - dismissLoadingDialog(); - } - - @Override public boolean onMenuItemSelected(int featureId, MenuItem item) { super.onMenuItemSelected(featureId, item); @@ -142,7 +131,16 @@ public class LogHistoryActivity extends SherlockFragmentActivity { */ 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(); @@ -159,7 +157,7 @@ public class LogHistoryActivity extends SherlockFragmentActivity { // 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); @@ -170,75 +168,88 @@ public class LogHistoryActivity extends SherlockFragmentActivity { } } - - /** - * Read and show log file info - */ - 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()); - } - - return text.toString(); - } - - /** * * Class for loading the log data async * */ 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); + } + protected String doInBackground(String... args) { return readLogFile(); } protected void onPostExecute(String result) { - mLogTV.setText(result); + if (textViewReference != null && result != null) { + final TextView logTV = textViewReference.get(); + if (logTV != null) { + mLogText = result; + logTV.setText(mLogText); + dismissLoadingDialog(); + } + } + } - 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 + } + } + } + + return text.toString(); } } - @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)); + 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); @@ -254,4 +265,12 @@ public class LogHistoryActivity extends SherlockFragmentActivity { loading.dismiss(); } } + + @Override + protected void onSaveInstanceState(Bundle outState) { + super.onSaveInstanceState(outState); + + /// global state + outState.putString(KEY_LOG_TEXT, mLogText); + } } \ No newline at end of file