Merge remote-tracking branch 'upstream/develop' into us4_view_text_files

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / preview / PreviewTextFragment.java

diff --git a/src/com/owncloud/android/ui/preview/PreviewTextFragment.java b/src/com/owncloud/android/ui/preview/PreviewTextFragment.java
index e66cc41..1be6399 100644 (file)
--- a/src/com/owncloud/android/ui/preview/PreviewTextFragment.java
+++ b/src/com/owncloud/android/ui/preview/PreviewTextFragment.java
@@ -1,15 +1,15 @@
 package com.owncloud.android.ui.preview;
 
 import android.accounts.Account;
 package com.owncloud.android.ui.preview;
 
 import android.accounts.Account;

-import android.content.Context;

 import android.os.AsyncTask;
 import android.os.Bundle;
 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.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

-import android.widget.BaseAdapter;
-import android.widget.ListView;
-import android.widget.ProgressBar;
+import android.widget.ScrollView;

 import android.widget.TextView;
 
 import com.actionbarsherlock.view.Menu;
 import android.widget.TextView;
 
 import com.actionbarsherlock.view.Menu;


@@ -21,6 +21,7 @@ import com.owncloud.android.files.FileMenuFilter;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.ui.activity.FileDisplayActivity;
 import com.owncloud.android.ui.dialog.ConfirmationDialogFragment;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.ui.activity.FileDisplayActivity;
 import com.owncloud.android.ui.dialog.ConfirmationDialogFragment;

+import com.owncloud.android.ui.dialog.LoadingDialog;

 import com.owncloud.android.ui.dialog.RemoveFileDialogFragment;
 import com.owncloud.android.ui.fragment.FileFragment;
 
 import com.owncloud.android.ui.dialog.RemoveFileDialogFragment;
 import com.owncloud.android.ui.fragment.FileFragment;
 


@@ -28,8 +29,6 @@ import java.io.BufferedWriter;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.StringWriter;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.StringWriter;

-import java.util.ArrayList;
-import java.util.List;

 import java.util.Scanner;
 
 public class PreviewTextFragment extends FileFragment {
 import java.util.Scanner;
 
 public class PreviewTextFragment extends FileFragment {


@@ -38,8 +37,7 @@ public class PreviewTextFragment extends FileFragment {
     private static final String TAG = PreviewTextFragment.class.getSimpleName();
 
     private Account mAccount;
     private static final String TAG = PreviewTextFragment.class.getSimpleName();
 
     private Account mAccount;

-    private ListView mTextPreviewList;
-    private ProgressBar mProgressBar;
+    private TextView mTextPreview;

 
     /**
      * Creates an empty fragment for previews.
 
     /**
      * Creates an empty fragment for previews.


@@ -67,9 +65,7 @@ public class PreviewTextFragment extends FileFragment {
 
         View ret = inflater.inflate(R.layout.text_file_preview, container, false);
 
 
         View ret = inflater.inflate(R.layout.text_file_preview, container, false);
 

-        mTextPreviewList = (ListView) ret.findViewById(R.id.text_preview_list);
-        mTextPreviewList.setAdapter(new TextLineAdapter());
-        mProgressBar = (ProgressBar) ret.findViewById(R.id.progress_bar);
+        mTextPreview = (TextView) ret.findViewById(R.id.text_preview);

 
         return ret;
     }
 
         return ret;
     }


@@ -124,38 +120,40 @@ public class PreviewTextFragment extends FileFragment {
     }
 
     private void loadAndShowTextPreview() {
     }
 
     private void loadAndShowTextPreview() {

-        new TextLoadAsyncTask().execute(getFile().getStoragePath());
+        new TextLoadAsyncTask().execute(getFile().getStoragePath(), mTextPreview);

     }
 
     /**
      * Reads the file to preview and shows its contents. Too critical to be anonymous.
      */
     }
 
     /**
      * Reads the file to preview and shows its contents. Too critical to be anonymous.
      */

-    private class TextLoadAsyncTask extends AsyncTask<Object, StringWriter, Void> {
+    private class TextLoadAsyncTask extends AsyncTask<Object, Void, StringWriter> {
+        private final String DIALOG_WAIT_TAG = "DIALOG_WAIT";
+        private TextView mTextView;

 
         @Override
         protected void onPreExecute() {
 
         @Override
         protected void onPreExecute() {

-            ((TextLineAdapter) mTextPreviewList.getAdapter()).clear();
+            showLoadingDialog();

         }
 
         @Override
         }
 
         @Override

-        protected Void doInBackground(java.lang.Object... params) {
-            if (params.length != 1)
-                throw new IllegalArgumentException("The parameter to " + TextLoadAsyncTask.class.getName() + " must be the file location only");
+        protected StringWriter doInBackground(java.lang.Object... params) {
+            if (params.length != 2)
+                throw new IllegalArgumentException("The parameters to " + TextLoadAsyncTask.class.getName() + " must be (1) the file location and (2) the text view to update");

             final String location = (String) params[0];
             final String location = (String) params[0];

+            mTextView = (TextView) params[1];

 
             FileInputStream inputStream = null;
             Scanner sc = null;
 
             FileInputStream inputStream = null;
             Scanner sc = null;

+            StringWriter source = new StringWriter();
+            BufferedWriter bufferedWriter = new BufferedWriter(source);

             try {
                 inputStream = new FileInputStream(location);
                 sc = new Scanner(inputStream);
                 while (sc.hasNextLine()) {
             try {
                 inputStream = new FileInputStream(location);
                 sc = new Scanner(inputStream);
                 while (sc.hasNextLine()) {

-                    StringWriter target = new StringWriter();
-                    BufferedWriter bufferedWriter = new BufferedWriter(target);
-                    if (sc.hasNextLine())
-                        bufferedWriter.write(sc.nextLine());
-                    bufferedWriter.close();
-                    publishProgress(target);
+                    bufferedWriter.append(sc.nextLine());
+                    if (sc.hasNextLine()) bufferedWriter.append("\n");

                 }
                 }

+                bufferedWriter.close();

                 IOException exc = sc.ioException();
                 if (exc != null) throw exc;
             } catch (IOException e) {
                 IOException exc = sc.ioException();
                 if (exc != null) throw exc;
             } catch (IOException e) {


@@ -172,90 +170,36 @@ public class PreviewTextFragment extends FileFragment {
                     sc.close();
                 }
             }
                     sc.close();
                 }
             }

-            return null;
+            return source;

         }
 
         @Override
         }
 
         @Override

-        protected void onProgressUpdate(StringWriter... values) {
-            super.onProgressUpdate(values);
-            //Using a ListView allows to show large text without the UI freeze that happens
-            //when calling TextView#setText() with a large CharSequence
-            ((TextLineAdapter) mTextPreviewList.getAdapter()).add(values[0].toString());
+        protected void onPostExecute(final StringWriter stringWriter) {
+            mTextView.setText(new String(stringWriter.getBuffer()));
+            mTextView.setVisibility(View.VISIBLE);
+            dismissLoadingDialog();

         }
 
         }
 

-        @Override
-        protected void onPostExecute(Void aVoid) {
-            super.onPostExecute(aVoid);
-            mProgressBar.setVisibility(View.GONE);
-            mTextPreviewList.setVisibility(View.VISIBLE);
-        }
-    }
-
-    private class TextLineAdapter extends BaseAdapter {
-        private static final int LIST_ITEM_LAYOUT = R.layout.text_file_preview_list_item;
-        private final List<String> items = new ArrayList<String>();
-
-        private void add(String line) {
-            items.add(line);
-            notifyDataSetChanged();
-        }
-
-        private void clear() {
-            items.clear();
-            notifyDataSetChanged();
-        }
-
-        @Override
-        public int getCount() {
-            return items.size();
-        }
-
-        @Override
-        public String getItem(int position) {
-            if (position >= items.size())
-                throw new IllegalArgumentException();
-            return items.get(position);
-        }
-
-        @Override
-        public long getItemId(int position) {
-            return position;
+        /**
+         * Show loading dialog
+         */
+        public void showLoadingDialog() {
+            // Construct dialog
+            LoadingDialog loading = new LoadingDialog(getResources().getString(R.string.wait_a_moment));
+            FragmentManager fm = getActivity().getSupportFragmentManager();
+            FragmentTransaction ft = fm.beginTransaction();
+            loading.show(ft, DIALOG_WAIT_TAG);

         }
 
         }
 

-        @Override
-        public View getView(int position, View convertView, ViewGroup parent) {
-            ViewHolder viewHolder;
-            if (convertView == null) {
-                convertView =
-                        ((LayoutInflater) getActivity().getApplicationContext()
-                                .getSystemService(Context.LAYOUT_INFLATER_SERVICE))
-                                .inflate(
-                                        LIST_ITEM_LAYOUT, null);
-                viewHolder = new ViewHolder();
-                viewHolder.setLineView((TextView) convertView.findViewById(R.id.text_preview));
-                convertView.setTag(viewHolder);
-            } else {
-                viewHolder = (ViewHolder) convertView.getTag();
+        /**
+         * Dismiss loading dialog
+         */
+        public void dismissLoadingDialog() {
+            Fragment frag = getActivity().getSupportFragmentManager().findFragmentByTag(DIALOG_WAIT_TAG);
+            if (frag != null) {
+                LoadingDialog loading = (LoadingDialog) frag;
+                loading.dismiss();

             }
             }

-
-            viewHolder.getLineView().setText(items.get(position));
-
-            return convertView;
-        }
-    }
-
-    private static class ViewHolder {
-        private TextView lineView;
-
-        private ViewHolder() {
-        }
-
-        public TextView getLineView() {
-            return lineView;
-        }
-
-        public void setLineView(TextView lineView) {
-            this.lineView = lineView;

         }
     }
 
         }
     }
 


@@ -305,6 +249,30 @@ public class PreviewTextFragment extends FileFragment {
             item.setVisible(false);
             item.setEnabled(false);
         }
             item.setVisible(false);
             item.setEnabled(false);
         }

+
+        item = menu.findItem(R.id.action_settings);
+        if (item != null) {
+            item.setVisible(false);
+            item.setEnabled(false);
+        }
+
+        item = menu.findItem(R.id.action_logger);
+        if (item != null) {
+            item.setVisible(false);
+            item.setEnabled(false);
+        }
+
+        item = menu.findItem(R.id.action_sync_file);
+        if (item != null) {
+            item.setVisible(false);
+            item.setEnabled(false);
+        }
+
+        item = menu.findItem(R.id.action_sync_account);
+        if (item != null) {
+            item.setVisible(false);
+            item.setEnabled(false);
+        }

     }
 
     /**
     }
 
     /**


@@ -413,6 +381,11 @@ public class PreviewTextFragment extends FileFragment {
      * Finishes the preview
      */
     private void finish() {
      * Finishes the preview
      */
     private void finish() {

-        getSherlockActivity().onBackPressed();
+        getActivity().runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                getSherlockActivity().onBackPressed();
+            }
+        });

     }
 }
     }
 }