Update owncloud library reference

[pub/Android/ownCloud.git] / 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 a2fd9f8..7b6b4a9 100644 (file)
--- a/src/com/owncloud/android/ui/activity/LogHistoryActivity.java
+++ b/src/com/owncloud/android/ui/activity/LogHistoryActivity.java
@@ -23,32 +23,44 @@ 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.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 {
+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 String mLogPath = FileStorageUtils.getLogPath();
     private File logDIR = null;
 
+    private TextView mLogTV;
+
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -67,7 +79,7 @@ public class LogHistoryActivity extends SherlockActivity {
             @Override
             public void onClick(View v) {
 
-                Log_OC.stopLogging();
+                Log_OC.deleteHistoryLogging();
                 finish();
             }
         });
@@ -80,13 +92,34 @@ public class LogHistoryActivity extends SherlockActivity {
             }
         });
 
-        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();
     }
 
 
@@ -141,7 +174,7 @@ public class LogHistoryActivity extends SherlockActivity {
     /**
      * Read and show log file info
      */
-    private void readLogFile() {
+    private String readLogFile() {
 
         String[] logFileName = Log_OC.getLogFileNames();
 
@@ -171,8 +204,54 @@ public class LogHistoryActivity extends SherlockActivity {
             Log_OC.d(TAG, e.getMessage().toString());
         }
 
-        // Show in the screen the content of the log
-        TextView logTV = (TextView) findViewById(R.id.logTV);
-        logTV.setText(text);
+        return text.toString();
+    }
+
+
+    /**
+     *
+     * 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);
+
+            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);
+    }
+
+    /**
+     * 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