FileDetailsFragment now working on tablets

[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 5dbb56e..137cd29 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
+++ b/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
@@ -53,7 +53,7 @@ public class FileDetailFragment extends SherlockFragment implements
     public static final String FILE = "FILE";\r
 \r
     private Intent mIntent;\r
     public static final String FILE = "FILE";\r
 \r
     private Intent mIntent;\r

-    private View mView;\r
+    //private View mView;\r

     private DownloadFinishReceiver mDownloadFinishReceiver;\r
     private OCFile mFile;\r
 \r
     private DownloadFinishReceiver mDownloadFinishReceiver;\r
     private OCFile mFile;\r
 \r


@@ -73,8 +73,7 @@ public class FileDetailFragment extends SherlockFragment implements
      * to contain {@link FileDetailFragment#FILE} with an OCFile and also\r
      * {@link FileDownloader#EXTRA_ACCOUNT} with the account.\r
      * \r
      * to contain {@link FileDetailFragment#FILE} with an OCFile and also\r
      * {@link FileDownloader#EXTRA_ACCOUNT} with the account.\r
      * \r

-     * @param nonEmptyFragment\r
-     *            True, to enable file detail rendering\r
+     * @param intent Intent with an account and a file in it for rendering\r

      */\r
     public FileDetailFragment(Intent intent) {\r
         mLayout = R.layout.file_details_fragment;\r
      */\r
     public FileDetailFragment(Intent intent) {\r
         mLayout = R.layout.file_details_fragment;\r


@@ -101,9 +100,8 @@ public class FileDetailFragment extends SherlockFragment implements
     /**\r
      * Use this method to signal this Activity that it shall update its view.\r
      * \r
     /**\r
      * Use this method to signal this Activity that it shall update its view.\r
      * \r

-     * @param intent\r
-     *            The {@link Intent} that contains extra information about this\r
-     *            file The intent needs to have these extras:\r
+     * @param intent The {@link Intent} that contains extra information about\r
+     *            this file The intent needs to have these extras:\r

      *            <p>\r
      * \r
      *            {@link FileDetailFragment#FILE}: An {@link OCFile}\r
      *            <p>\r
      * \r
      *            {@link FileDetailFragment#FILE}: An {@link OCFile}\r


@@ -126,23 +124,23 @@ public class FileDetailFragment extends SherlockFragment implements
             setFilesize(mFile.getFileLength());\r
 \r
             // set file preview if available and possible\r
             setFilesize(mFile.getFileLength());\r
 \r
             // set file preview if available and possible\r

-            VideoView videoView = (VideoView) mView\r
+            VideoView videoView = (VideoView) getView()\r

                     .findViewById(R.id.videoView1);\r
             videoView.setVisibility(View.INVISIBLE);\r
                     .findViewById(R.id.videoView1);\r
             videoView.setVisibility(View.INVISIBLE);\r

-            if (mFile.getPath() == null) {\r
+            if (mFile.getStoragePath() == null) {\r

                 ImageView imageView = (ImageView) getView().findViewById(\r
                         R.id.imageView2);\r
                 imageView.setImageResource(R.drawable.download);\r
                 imageView.setOnClickListener(this);\r
             } else {\r
                 if (mFile.getMimetype().startsWith("image/")) {\r
                 ImageView imageView = (ImageView) getView().findViewById(\r
                         R.id.imageView2);\r
                 imageView.setImageResource(R.drawable.download);\r
                 imageView.setOnClickListener(this);\r
             } else {\r
                 if (mFile.getMimetype().startsWith("image/")) {\r

-                    ImageView imageView = (ImageView) mView\r
+                    ImageView imageView = (ImageView) getView()\r

                             .findViewById(R.id.imageView2);\r
                             .findViewById(R.id.imageView2);\r

-                    Bitmap bmp = BitmapFactory.decodeFile(mFile.getPath());\r
+                    Bitmap bmp = BitmapFactory.decodeFile(mFile.getStoragePath());\r

                     imageView.setImageBitmap(bmp);\r
                 } else if (mFile.getMimetype().startsWith("video/")) {\r
                     videoView.setVisibility(View.VISIBLE);\r
                     imageView.setImageBitmap(bmp);\r
                 } else if (mFile.getMimetype().startsWith("video/")) {\r
                     videoView.setVisibility(View.VISIBLE);\r

-                    videoView.setVideoPath(mFile.getPath());\r
+                    videoView.setVideoPath(mFile.getStoragePath());\r

                     videoView.start();\r
                 }\r
             }\r
                     videoView.start();\r
                 }\r
             }\r


@@ -153,23 +151,25 @@ public class FileDetailFragment extends SherlockFragment implements
     public View onCreateView(LayoutInflater inflater, ViewGroup container,\r
             Bundle savedInstanceState) {\r
         View view = null;\r
     public View onCreateView(LayoutInflater inflater, ViewGroup container,\r
             Bundle savedInstanceState) {\r
         View view = null;\r

-\r

         view = inflater.inflate(mLayout, container, false);\r
         view = inflater.inflate(mLayout, container, false);\r

-        mIntent = getActivity().getIntent();\r
-        mView = view;\r
-\r
-        // make sure we are not using the empty layout\r
-        if (mEmptyLayout == false) {\r
-            updateFileDetails();\r
-        }\r
-\r

         return view;\r
     }\r
 \r
     @Override\r
         return view;\r
     }\r
 \r
     @Override\r

-    public View getView() {\r
-        return mView == null ? super.getView() : mView;\r
-    };\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
     private void setFilename(String filename) {\r
         TextView tv = (TextView) getView().findViewById(R.id.textView1);\r
 \r
     private void setFilename(String filename) {\r
         TextView tv = (TextView) getView().findViewById(R.id.textView1);\r