Update library reference

[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 dcdb1d4..6595bf7 100644 (file)
--- a/src/com/owncloud/android/ui/preview/PreviewTextFragment.java
+++ b/src/com/owncloud/android/ui/preview/PreviewTextFragment.java
@@ -1,27 +1,19 @@
 package com.owncloud.android.ui.preview;
 
 import android.accounts.Account;
 package com.owncloud.android.ui.preview;
 
 import android.accounts.Account;

-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.graphics.Paint;
-import android.graphics.Rect;

 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.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.util.DisplayMetrics;
-import android.util.Log;

 import android.view.LayoutInflater;
 import android.view.LayoutInflater;

+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;

 import android.view.View;
 import android.view.ViewGroup;
 import android.view.View;
 import android.view.ViewGroup;

-import android.widget.BaseAdapter;
-import android.widget.ListView;

 import android.widget.TextView;
 
 import android.widget.TextView;
 

-import com.actionbarsherlock.view.Menu;
-import com.actionbarsherlock.view.MenuInflater;
-import com.actionbarsherlock.view.MenuItem;

 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.FileMenuFilter;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.FileMenuFilter;


@@ -36,10 +28,9 @@ 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.lang.ref.WeakReference;

 import java.util.LinkedList;
 import java.util.List;
 import java.util.LinkedList;
 import java.util.List;

-import java.util.Queue;

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


@@ -48,7 +39,8 @@ 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 TextView mTextPreview;
+    private TextLoadAsyncTask mTextLoadTask;

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


@@ -76,8 +68,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());
+        mTextPreview = (TextView) ret.findViewById(R.id.text_preview);

 
         return ret;
     }
 
         return ret;
     }


@@ -93,12 +84,13 @@ public class PreviewTextFragment extends FileFragment {
 
         Bundle args = getArguments();
 
 
         Bundle args = getArguments();
 

-        if (file == null)
+        if (file == null) {

             file = args.getParcelable(FileDisplayActivity.EXTRA_FILE);
             file = args.getParcelable(FileDisplayActivity.EXTRA_FILE);

+        }

 
 

-        if (mAccount == null)
+        if (mAccount == null) {

             mAccount = args.getParcelable(FileDisplayActivity.EXTRA_ACCOUNT);
             mAccount = args.getParcelable(FileDisplayActivity.EXTRA_ACCOUNT);

-
+        }

 
         if (savedInstanceState == null) {
             if (file == null) {
 
         if (savedInstanceState == null) {
             if (file == null) {


@@ -121,74 +113,71 @@ public class PreviewTextFragment extends FileFragment {
     @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
     @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);

-        outState.putParcelable(PreviewImageFragment.EXTRA_FILE, getFile());
-        outState.putParcelable(PreviewImageFragment.EXTRA_ACCOUNT, mAccount);
+        outState.putParcelable(PreviewTextFragment.EXTRA_FILE, getFile());
+        outState.putParcelable(PreviewTextFragment.EXTRA_ACCOUNT, mAccount);

     }
 
     @Override
     public void onStart() {
         super.onStart();
         Log_OC.e(TAG, "onStart");
     }
 
     @Override
     public void onStart() {
         super.onStart();
         Log_OC.e(TAG, "onStart");

+
+        loadAndShowTextPreview();

     }
 
     private void loadAndShowTextPreview() {
     }
 
     private void loadAndShowTextPreview() {

-        new TextLoadAsyncTask().execute(getFile().getStoragePath());
+        mTextLoadTask = new TextLoadAsyncTask(new WeakReference<TextView>(mTextPreview));
+        mTextLoadTask.execute(getFile().getStoragePath());

     }
 
     }
 

+

     /**
      * 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 int TEXTVIEW_WIDTH;
-        private float TEXTVIEW_SIZE;
-        private final Queue<Character> accumulatedText = new LinkedList<Character>();
+    private class TextLoadAsyncTask extends AsyncTask<Object, Void, StringWriter> {

         private final String DIALOG_WAIT_TAG = "DIALOG_WAIT";
         private final String DIALOG_WAIT_TAG = "DIALOG_WAIT";

-        private final Rect bounds = new Rect();
-        private final Paint paint = new Paint();
+        private final WeakReference<TextView> mTextViewReference;
+
+        private TextLoadAsyncTask(WeakReference<TextView> textView) {
+            mTextViewReference = textView;
+        }
+

 
 

-        @SuppressLint("InflateParams")

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

-            ((TextLineAdapter) mTextPreviewList.getAdapter()).clear();
-            DisplayMetrics displaymetrics = new DisplayMetrics();
-            getActivity().getWindowManager().getDefaultDisplay().getMetrics(displaymetrics);
-            TEXTVIEW_WIDTH = displaymetrics.widthPixels;
-            TEXTVIEW_SIZE = ((TextView) ((LayoutInflater) getActivity().getApplicationContext()
-                    .getSystemService(Context.LAYOUT_INFLATER_SERVICE))
-                    .inflate(
-                            R.layout.text_file_preview_list_item, null)).getTextSize();

             showLoadingDialog();
             showLoadingDialog();

-            paint.setTextSize(TEXTVIEW_SIZE);

         }
 
         @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 != 1) {
+                throw new IllegalArgumentException("The parameter to " + TextLoadAsyncTask.class.getName() + " must be (1) the file location");
+            }

             final String location = (String) params[0];
 
             FileInputStream inputStream = null;
             Scanner sc = null;
             final String location = (String) params[0];
 
             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) {

+                Log_OC.e(TAG, e.getMessage(), e);

                 finish();
             } finally {
                 if (inputStream != null) {
                     try {
                         inputStream.close();
                     } catch (IOException e) {
                 finish();
             } finally {
                 if (inputStream != null) {
                     try {
                         inputStream.close();
                     } catch (IOException e) {

+                        Log_OC.e(TAG, e.getMessage(), e);

                         finish();
                     }
                 }
                         finish();
                     }
                 }


@@ -196,44 +185,18 @@ public class PreviewTextFragment extends FileFragment {
                     sc.close();
                 }
             }
                     sc.close();
                 }
             }

-            //Add the remaining text, if any
-            while (!accumulatedText.isEmpty()) {
-                addLine();
-            }
-            return null;
+            return source;

         }
 
         @Override
         }
 
         @Override

-        protected void onProgressUpdate(StringWriter... values) {
-            super.onProgressUpdate(values);
-            final char[] newTextAsCharArray = values[0].toString().toCharArray();
-            for (char c : newTextAsCharArray) {
-                accumulatedText.add(c);
-            }
-            addLine();
-        }
+        protected void onPostExecute(final StringWriter stringWriter) {
+            final TextView textView = mTextViewReference.get();

 
 

-        private synchronized void addLine() {
-            StringBuilder textForThisLine = new StringBuilder();
-            do {
-                Character polled = accumulatedText.poll();
-                textForThisLine.append(polled);
+            if (textView != null) {
+                textView.setText(new String(stringWriter.getBuffer()));
+                textView.setVisibility(View.VISIBLE);

             }
             }

-            while (!isTooLarge(textForThisLine.toString()) && !accumulatedText.isEmpty());
-            String line = textForThisLine.toString();
-            ((TextLineAdapter) mTextPreviewList.getAdapter()).add(line.contentEquals("null") ? "" : line);
-        }
-
-        private boolean isTooLarge(String text) {
-            paint.getTextBounds(text, 0, text.length(), bounds);
-            int lineWidth = (int) Math.ceil(bounds.width());
-            return lineWidth / TEXTVIEW_WIDTH > 1;
-        }

 
 

-        @Override
-        protected void onPostExecute(Void aVoid) {
-            super.onPostExecute(aVoid);
-            mTextPreviewList.setVisibility(View.VISIBLE);

             dismissLoadingDialog();
         }
 
             dismissLoadingDialog();
         }
 


@@ -241,18 +204,27 @@ public class PreviewTextFragment extends FileFragment {
          * Show loading dialog
          */
         public void showLoadingDialog() {
          * 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);
+            // only once
+            Fragment frag = getActivity().getSupportFragmentManager().findFragmentByTag(DIALOG_WAIT_TAG);
+            LoadingDialog loading = null;
+            if (frag == null) {
+                // Construct dialog
+                loading = new LoadingDialog(getResources().getString(R.string.wait_a_moment));
+                FragmentManager fm = getActivity().getSupportFragmentManager();
+                FragmentTransaction ft = fm.beginTransaction();
+                loading.show(ft, DIALOG_WAIT_TAG);
+            } else {
+                loading = (LoadingDialog) frag;
+                loading.setShowsDialog(true);
+            }
+

         }
 
         /**
          * Dismiss loading dialog
          */
         public void dismissLoadingDialog() {
         }
 
         /**
          * Dismiss loading dialog
          */
         public void dismissLoadingDialog() {

-            Fragment frag = getActivity().getSupportFragmentManager().findFragmentByTag(DIALOG_WAIT_TAG);
+            final Fragment frag = getActivity().getSupportFragmentManager().findFragmentByTag(DIALOG_WAIT_TAG);

             if (frag != null) {
                 LoadingDialog loading = (LoadingDialog) frag;
                 loading.dismiss();
             if (frag != null) {
                 LoadingDialog loading = (LoadingDialog) frag;
                 loading.dismiss();


@@ -260,84 +232,6 @@ public class PreviewTextFragment extends FileFragment {
         }
     }
 
         }
     }
 

-    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);
-            getActivity().runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    notifyDataSetChanged();
-                }
-            });
-        }
-
-        private void clear() {
-            items.clear();
-            getActivity().runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    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;
-        }
-
-        @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();
-            }
-
-            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;
-        }
-    }
-

     /**
      * {@inheritDoc}
      */
     /**
      * {@inheritDoc}
      */


@@ -359,7 +253,7 @@ public class PreviewTextFragment extends FileFragment {
                     getFile(),
                     mContainerActivity.getStorageManager().getAccount(),
                     mContainerActivity,
                     getFile(),
                     mContainerActivity.getStorageManager().getAccount(),
                     mContainerActivity,

-                    getSherlockActivity()
+                    getActivity()

             );
             mf.filter(menu);
         }
             );
             mf.filter(menu);
         }


@@ -384,6 +278,18 @@ public class PreviewTextFragment extends FileFragment {
             item.setVisible(false);
             item.setEnabled(false);
         }
             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);
+        }

     }
 
     /**
     }
 
     /**


@@ -454,8 +360,6 @@ public class PreviewTextFragment extends FileFragment {
     public void onResume() {
         super.onResume();
         Log_OC.e(TAG, "onResume");
     public void onResume() {
         super.onResume();
         Log_OC.e(TAG, "onResume");

-
-        loadAndShowTextPreview();

     }
 
     @Override
     }
 
     @Override


@@ -468,6 +372,8 @@ public class PreviewTextFragment extends FileFragment {
     public void onStop() {
         super.onStop();
         Log_OC.e(TAG, "onStop");
     public void onStop() {
         super.onStop();
         Log_OC.e(TAG, "onStop");

+        if (mTextLoadTask != null)
+            mTextLoadTask.cancel(Boolean.TRUE);

     }
 
     /**
     }
 
     /**


@@ -485,13 +391,29 @@ public class PreviewTextFragment extends FileFragment {
      * @return 'True' if the file can be handled by the fragment.
      */
     public static boolean canBePreviewed(OCFile file) {
      * @return 'True' if the file can be handled by the fragment.
      */
     public static boolean canBePreviewed(OCFile file) {

-        return (file != null && file.isDown() && file.isText());
+        final List<String> unsupportedTypes = new LinkedList<String>();
+        unsupportedTypes.add("text/richtext");
+        unsupportedTypes.add("text/rtf");
+        unsupportedTypes.add("text/vnd.abc");
+        unsupportedTypes.add("text/vnd.fmi.flexstor");
+        unsupportedTypes.add("text/vnd.rn-realtext");
+        unsupportedTypes.add("text/vnd.wap.wml");
+        unsupportedTypes.add("text/vnd.wap.wmlscript");
+        return (file != null && file.isDown() && file.isText() &&
+                !unsupportedTypes.contains(file.getMimetype()) &&
+                !unsupportedTypes.contains(file.getMimeTypeFromName())
+        );

     }
 
     /**
      * Finishes the preview
      */
     private void finish() {
     }
 
     /**
      * Finishes the preview
      */
     private void finish() {

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

     }
 }
     }
 }