fix download file with noascii chars in name

[pub/Android/ownCloud.git] / src / eu / alefzero / owncloud / ui / fragment / FileDetailFragment.java

diff --git a/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java b/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
index e4b33f1..f76c2b2 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
+++ b/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
@@ -17,14 +17,15 @@
  */\r
 package eu.alefzero.owncloud.ui.fragment;\r
 \r
  */\r
 package eu.alefzero.owncloud.ui.fragment;\r
 \r

-import android.app.FragmentTransaction;\r

 import android.content.BroadcastReceiver;\r
 import android.content.Context;\r
 import android.content.Intent;\r
 import android.content.IntentFilter;\r
 import android.graphics.Bitmap;\r
 import android.graphics.BitmapFactory;\r
 import android.content.BroadcastReceiver;\r
 import android.content.Context;\r
 import android.content.Intent;\r
 import android.content.IntentFilter;\r
 import android.graphics.Bitmap;\r
 import android.graphics.BitmapFactory;\r

+import android.net.Uri;\r

 import android.os.Bundle;\r
 import android.os.Bundle;\r

+import android.util.Log;\r

 import android.view.LayoutInflater;\r
 import android.view.View;\r
 import android.view.View.OnClickListener;\r
 import android.view.LayoutInflater;\r
 import android.view.View;\r
 import android.view.View.OnClickListener;\r


@@ -52,33 +53,44 @@ public class FileDetailFragment extends SherlockFragment implements
 \r
     public static final String FILE = "FILE";\r
 \r
 \r
     public static final String FILE = "FILE";\r
 \r

-    private Intent mIntent;\r
-    //private View mView;\r

     private DownloadFinishReceiver mDownloadFinishReceiver;\r
     private DownloadFinishReceiver mDownloadFinishReceiver;\r

-    private OCFile mFile;\r
-\r
+    private Intent mIntent;\r

     private int mLayout;\r
     private int mLayout;\r

-    private boolean mEmptyLayout;\r
+    private View mView;\r
+    private OCFile mFile;\r
+    private static final String TAG = "FileDetailFragment";\r

 \r
     /**\r
 \r
     /**\r

-     * Default constructor. When inflated by android -> display empty layout\r
+     * Default constructor - contains real layout\r

      */\r
      */\r

-    public FileDetailFragment() {\r
-        mLayout = R.layout.file_details_empty;\r
-        mEmptyLayout = true;\r
+    public FileDetailFragment(){\r
+        mLayout = R.layout.file_details_fragment;\r

     }\r
     }\r

-\r
+    \r

     /**\r
     /**\r

-     * Custom construtor. Use with a {@link FragmentTransaction}. The intent has\r
-     * to contain {@link FileDetailFragment#FILE} with an OCFile and also\r
-     * {@link FileDownloader#EXTRA_ACCOUNT} with the account.\r
+     * Creates a dummy layout. For use if the user never has\r
+     * tapped on a file before\r

      * \r
      * \r

-     * @param intent Intent with an account and a file in it for rendering\r
+     * @param useEmptyView If true, use empty layout\r

      */\r
      */\r

-    public FileDetailFragment(Intent intent) {\r
+    public FileDetailFragment(boolean useEmptyView){\r
+        if(useEmptyView){\r
+            mLayout = R.layout.file_details_empty;\r
+        } else {\r
+            mLayout = R.layout.file_details_fragment;\r
+        }\r
+    }\r
+    \r
+    /**\r
+     * Use this when creating the fragment and display\r
+     * a file at the same time\r
+     * \r
+     * @param showDetailsIntent The Intent with the required parameters\r
+     * @see FileDetailFragment#updateFileDetails(Intent)\r
+     */\r
+    public FileDetailFragment(Intent showDetailsIntent) {\r
+        mIntent = showDetailsIntent;\r

         mLayout = R.layout.file_details_fragment;\r
         mLayout = R.layout.file_details_fragment;\r

-        mIntent = intent;\r
-        mEmptyLayout = false;\r

     }\r
 \r
     @Override\r
     }\r
 \r
     @Override\r


@@ -115,6 +127,7 @@ public class FileDetailFragment extends SherlockFragment implements
 \r
     private void updateFileDetails() {\r
         mFile = mIntent.getParcelableExtra(FILE);\r
 \r
     private void updateFileDetails() {\r
         mFile = mIntent.getParcelableExtra(FILE);\r

+        Button downloadButton = (Button) getView().findViewById(R.id.fdDownloadBtn);\r

 \r
         if (mFile != null) {\r
             // set file details\r
 \r
         if (mFile != null) {\r
             // set file details\r


@@ -122,47 +135,37 @@ public class FileDetailFragment extends SherlockFragment implements
             setFiletype(DisplayUtils.convertMIMEtoPrettyPrint(mFile\r
                     .getMimetype()));\r
             setFilesize(mFile.getFileLength());\r
             setFiletype(DisplayUtils.convertMIMEtoPrettyPrint(mFile\r
                     .getMimetype()));\r
             setFilesize(mFile.getFileLength());\r

+            setTimeCreated(mFile.getCreationTimestamp());\r
+            setTimeModified(mFile.getModificationTimestamp());\r

             \r
             // Update preview\r
             if (mFile.getStoragePath() != null) {\r
             \r
             // Update preview\r
             if (mFile.getStoragePath() != null) {\r

-                if (mFile.getMimetype().startsWith("image/")) {\r
-                    ImageView preview = (ImageView) getView().findViewById(\r
-                            R.id.fdPreview);\r
-                    Bitmap bmp = BitmapFactory.decodeFile(mFile.getStoragePath());\r
-                    preview.setImageBitmap(bmp);\r
+                try {\r
+                    if (mFile.getMimetype().startsWith("image/")) {\r
+                        ImageView preview = (ImageView) getView().findViewById(\r
+                                R.id.fdPreview);\r
+                        Bitmap bmp = BitmapFactory.decodeFile(mFile.getStoragePath());\r
+                        preview.setImageBitmap(bmp);\r
+                    }\r
+                } catch (OutOfMemoryError e) {\r
+                    Log.e(TAG, "Out of memory occured for file with size " + mFile.getFileLength());\r

                 }\r
                 }\r

+                downloadButton.setText("Open file");\r
+                downloadButton.setOnClickListener(new OnClickListener() {\r
+                    @Override\r
+                    public void onClick(View v) {\r
+                        Intent i = new Intent(Intent.ACTION_VIEW);\r
+                        i.setDataAndType(Uri.parse("file://"+mFile.getStoragePath()), mFile.getMimetype());\r
+                        startActivity(i);\r
+                    }\r
+                });\r
+            } else {\r
+                // Make download button effective\r
+                downloadButton.setOnClickListener(this);\r

             }\r
             }\r

-            \r
-            // Make download button effective\r
-            Button downloadButton = (Button) getView().findViewById(R.id.fdDownloadBtn);\r
-            downloadButton.setOnClickListener(this);\r

         }\r
     }\r
         }\r
     }\r

-\r
-    @Override\r
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,\r
-            Bundle savedInstanceState) {\r
-        View view = null;\r
-        view = inflater.inflate(mLayout, container, false);\r
-        return view;\r
-    }\r
-\r
-    @Override\r
-    public void onStart() {\r
-        super.onStart();\r
-        \r
-        // Fill in required information about file displaying\r
-        if(mIntent == null){\r
-            mIntent = getActivity().getIntent();\r
-        }\r
-        \r
-        // Fill in the details if the layout is not empty\r
-        if(!mEmptyLayout){\r
-            updateFileDetails();\r
-        }\r
-        \r
-    }\r
-\r
+    \r

     private void setFilename(String filename) {\r
         TextView tv = (TextView) getView().findViewById(R.id.fdFilename);\r
         if (tv != null)\r
     private void setFilename(String filename) {\r
         TextView tv = (TextView) getView().findViewById(R.id.fdFilename);\r
         if (tv != null)\r


@@ -178,23 +181,45 @@ public class FileDetailFragment extends SherlockFragment implements
     private void setFilesize(long filesize) {\r
         TextView tv = (TextView) getView().findViewById(R.id.fdSize);\r
         if (tv != null)\r
     private void setFilesize(long filesize) {\r
         TextView tv = (TextView) getView().findViewById(R.id.fdSize);\r
         if (tv != null)\r

-            tv.setText(DisplayUtils.bitsToHumanReadable(filesize));\r
+            tv.setText(DisplayUtils.bytesToHumanReadable(filesize));\r
+    }\r
+    \r
+    private void setTimeCreated(long milliseconds){\r
+        TextView tv = (TextView) getView().findViewById(R.id.fdCreated);\r
+        if(tv != null){\r
+            tv.setText(DisplayUtils.unixTimeToHumanReadable(milliseconds));\r
+        }\r
+    }\r
+    \r
+    private void setTimeModified(long milliseconds){\r
+        TextView tv = (TextView) getView().findViewById(R.id.fdModified);\r
+        if(tv != null){\r
+            tv.setText(DisplayUtils.unixTimeToHumanReadable(milliseconds));\r
+        }\r

     }\r
 \r
     }\r
 \r

-    /**\r
-     * Use this to check if the correct layout is loaded. When android\r
-     * instanciates this class using the default constructor, the layout will be\r
-     * empty.\r
-     * \r
-     * Once a user touches a file for the first time, you must instanciate a new\r
-     * Fragment with the new FileDetailFragment(true) to inflate the actual\r
-     * details\r
-     * \r
-     * @return If the layout is empty, this method will return true, otherwise\r
-     *         false\r
-     */\r
-    public boolean isEmptyLayout() {\r
-        return mEmptyLayout;\r
+    @Override\r
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,\r
+            Bundle savedInstanceState) {\r
+        View view = null;\r
+        view = inflater.inflate(mLayout, container, false);\r
+        mView = view;\r
+        if(mLayout == R.layout.file_details_fragment){\r
+            // Phones will launch an activity with this intent\r
+            if(mIntent == null){\r
+                mIntent = getActivity().getIntent();\r
+            }\r
+            updateFileDetails();\r
+        }\r
+        \r
+        return view;\r
+    }\r
+    \r
+    \r
+\r
+    @Override\r
+    public View getView() {\r
+        return super.getView() == null ? mView : super.getView();\r

     }\r
 \r
     @Override\r
     }\r
 \r
     @Override\r