add last latest.apk ;)

[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 1be6399..a07d3df 100644 (file)
--- a/src/com/owncloud/android/ui/preview/PreviewTextFragment.java
+++ b/src/com/owncloud/android/ui/preview/PreviewTextFragment.java
@@ -7,14 +7,13 @@ import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
 import android.view.LayoutInflater;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
 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.ScrollView;

 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;


@@ -29,6 +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.lang.ref.WeakReference;
+import java.util.LinkedList;
+import java.util.List;

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


@@ -38,6 +40,7 @@ public class PreviewTextFragment extends FileFragment {
 
     private Account mAccount;
     private TextView mTextPreview;
 
     private Account mAccount;
     private TextView mTextPreview;

+    private TextLoadAsyncTask mTextLoadTask;

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


@@ -81,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) {


@@ -109,26 +113,35 @@ 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(), mTextPreview);
+        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.
      */
     private class TextLoadAsyncTask extends AsyncTask<Object, Void, StringWriter> {
         private final String DIALOG_WAIT_TAG = "DIALOG_WAIT";
     /**
      * Reads the file to preview and shows its contents. Too critical to be anonymous.
      */
     private class TextLoadAsyncTask extends AsyncTask<Object, Void, StringWriter> {
         private final String DIALOG_WAIT_TAG = "DIALOG_WAIT";

-        private TextView mTextView;
+        private final WeakReference<TextView> mTextViewReference;
+
+        private TextLoadAsyncTask(WeakReference<TextView> textView) {
+            mTextViewReference = textView;
+        }
+

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


@@ -137,10 +150,10 @@ public class PreviewTextFragment extends FileFragment {
 
         @Override
         protected StringWriter doInBackground(java.lang.Object... params) {
 
         @Override
         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");
+            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];
             final String location = (String) params[0];

-            mTextView = (TextView) params[1];

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


@@ -157,12 +170,14 @@ public class PreviewTextFragment extends FileFragment {
                 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();
                     }
                 }


@@ -175,8 +190,13 @@ public class PreviewTextFragment extends FileFragment {
 
         @Override
         protected void onPostExecute(final StringWriter stringWriter) {
 
         @Override
         protected void onPostExecute(final StringWriter stringWriter) {

-            mTextView.setText(new String(stringWriter.getBuffer()));
-            mTextView.setVisibility(View.VISIBLE);
+            final TextView textView = mTextViewReference.get();
+
+            if (textView != null) {
+                textView.setText(new String(stringWriter.getBuffer()));
+                textView.setVisibility(View.VISIBLE);
+            }
+

             dismissLoadingDialog();
         }
 
             dismissLoadingDialog();
         }
 


@@ -184,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();


@@ -224,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);
         }


@@ -250,18 +279,6 @@ public class PreviewTextFragment extends FileFragment {
             item.setEnabled(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 = menu.findItem(R.id.action_sync_file);
         if (item != null) {
             item.setVisible(false);


@@ -285,6 +302,10 @@ public class PreviewTextFragment extends FileFragment {
                 mContainerActivity.getFileOperationsHelper().shareFileWithLink(getFile());
                 return true;
             }
                 mContainerActivity.getFileOperationsHelper().shareFileWithLink(getFile());
                 return true;
             }

+            case R.id.action_share_with_users: {
+                mContainerActivity.getFileOperationsHelper().showShareFile(getFile());
+                return true;
+            }

             case R.id.action_unshare_file: {
                 mContainerActivity.getFileOperationsHelper().unshareFileWithLink(getFile());
                 return true;
             case R.id.action_unshare_file: {
                 mContainerActivity.getFileOperationsHelper().unshareFileWithLink(getFile());
                 return true;


@@ -343,8 +364,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


@@ -357,6 +376,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);

     }
 
     /**
     }
 
     /**


@@ -374,7 +395,18 @@ 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())
+        );

     }
 
     /**
     }
 
     /**


@@ -384,7 +416,7 @@ public class PreviewTextFragment extends FileFragment {
         getActivity().runOnUiThread(new Runnable() {
             @Override
             public void run() {
         getActivity().runOnUiThread(new Runnable() {
             @Override
             public void run() {

-                getSherlockActivity().onBackPressed();
+                getActivity().onBackPressed();

             }
         });
     }
             }
         });
     }