fix file uploading

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

diff --git a/src/eu/alefzero/owncloud/ui/fragment/FileDetail.java b/src/eu/alefzero/owncloud/ui/fragment/FileDetail.java
index 23c90dc..5e729ff 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/fragment/FileDetail.java
+++ b/src/eu/alefzero/owncloud/ui/fragment/FileDetail.java
@@ -24,15 +24,17 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;\r
 import android.net.Uri;\r
 import android.os.Bundle;\r
 import android.graphics.BitmapFactory;\r
 import android.net.Uri;\r
 import android.os.Bundle;\r

-import android.support.v4.app.Fragment;\r

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

-import android.view.ViewGroup;\r

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

+import android.view.ViewGroup;\r

 import android.widget.ImageView;\r
 import android.widget.TextView;\r
 import android.widget.Toast;\r
 import android.widget.VideoView;\r
 import android.widget.ImageView;\r
 import android.widget.TextView;\r
 import android.widget.Toast;\r
 import android.widget.VideoView;\r

+\r
+import com.actionbarsherlock.app.SherlockFragment;\r
+\r

 import eu.alefzero.owncloud.DisplayUtils;\r
 import eu.alefzero.owncloud.FileDownloader;\r
 import eu.alefzero.owncloud.R;\r
 import eu.alefzero.owncloud.DisplayUtils;\r
 import eu.alefzero.owncloud.FileDownloader;\r
 import eu.alefzero.owncloud.R;\r


@@ -43,7 +45,7 @@ import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;
  * @author Bartek Przybylski\r
  *\r
  */\r
  * @author Bartek Przybylski\r
  *\r
  */\r

-public class FileDetail extends Fragment implements OnClickListener {\r
+public class FileDetail extends SherlockFragment implements OnClickListener {\r

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


@@ -66,7 +68,7 @@ public class FileDetail extends Fragment implements OnClickListener {
         null);\r
     c.moveToFirst();\r
 \r
         null);\r
     c.moveToFirst();\r
 \r

-    // retrive details from DB\r
+    // Retrieve details from DB\r

     String filename = c.getString(c.getColumnIndex(ProviderTableMeta.FILE_NAME));\r
     String mimetype = c.getString(c.getColumnIndex(ProviderTableMeta.FILE_CONTENT_TYPE));\r
     String path = c.getString(c.getColumnIndex(ProviderTableMeta.FILE_STORAGE_PATH));\r
     String filename = c.getString(c.getColumnIndex(ProviderTableMeta.FILE_NAME));\r
     String mimetype = c.getString(c.getColumnIndex(ProviderTableMeta.FILE_CONTENT_TYPE));\r
     String path = c.getString(c.getColumnIndex(ProviderTableMeta.FILE_STORAGE_PATH));\r


@@ -101,11 +103,14 @@ public class FileDetail extends Fragment implements OnClickListener {
   @Override\r
   public View onCreateView(LayoutInflater inflater, ViewGroup container,\r
       Bundle savedInstanceState) {\r
   @Override\r
   public View onCreateView(LayoutInflater inflater, ViewGroup container,\r
       Bundle savedInstanceState) {\r

-    View v = inflater.inflate(R.layout.file_details, container, false);\r
+    View v = null;\r

     \r
     \r

-    if (getActivity().getIntent() != null) {\r
-      mIntent = getActivity().getIntent();\r
-      setStuff(v);\r
+    if (getActivity().getIntent() != null && getActivity().getIntent().getStringExtra("FILE_ID") != null) {\r
+       v = inflater.inflate(R.layout.file_details, container, false);\r
+       mIntent = getActivity().getIntent();\r
+       setStuff(v);\r
+    } else {\r
+       v = inflater.inflate(R.layout.file_details_empty, container, false);\r

     }\r
     return v;\r
   }\r
     }\r
     return v;\r
   }\r