Download service refactoring: multiple downloads and cancellation support

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / fragment / FileDetailFragment.java

diff --git a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
index 5b76c01..d0c2c74 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
+++ b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
@@ -79,9 +79,12 @@ import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;\r
 import com.owncloud.android.files.services.FileDownloader;\r
 import com.owncloud.android.files.services.FileUploader;\r
 import com.owncloud.android.datamodel.OCFile;\r
 import com.owncloud.android.files.services.FileDownloader;\r
 import com.owncloud.android.files.services.FileUploader;\r

+import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;\r

 import com.owncloud.android.network.OwnCloudClientUtils;\r
 import com.owncloud.android.ui.activity.FileDetailActivity;\r
 import com.owncloud.android.ui.activity.FileDisplayActivity;\r
 import com.owncloud.android.network.OwnCloudClientUtils;\r
 import com.owncloud.android.ui.activity.FileDetailActivity;\r
 import com.owncloud.android.ui.activity.FileDisplayActivity;\r

+import com.owncloud.android.ui.activity.TransferServiceGetter;\r
+import com.owncloud.android.ui.fragment.OCFileListFragment.ContainerActivity;\r

 import com.owncloud.android.utils.OwnCloudVersion;\r
 \r
 import com.owncloud.android.R;\r
 import com.owncloud.android.utils.OwnCloudVersion;\r
 \r
 import com.owncloud.android.R;\r


@@ -136,7 +139,7 @@ public class FileDetailFragment extends SherlockFragment implements
      * @param fileToDetail      An {@link OCFile} to show in the fragment\r
      * @param ocAccount         An ownCloud account; needed to start downloads\r
      */\r
      * @param fileToDetail      An {@link OCFile} to show in the fragment\r
      * @param ocAccount         An ownCloud account; needed to start downloads\r
      */\r

-    public FileDetailFragment(OCFile fileToDetail, Account ocAccount){\r
+    public FileDetailFragment(OCFile fileToDetail, Account ocAccount) {\r

         mFile = fileToDetail;\r
         mAccount = ocAccount;\r
         mLayout = R.layout.file_details_empty;\r
         mFile = fileToDetail;\r
         mAccount = ocAccount;\r
         mLayout = R.layout.file_details_empty;\r


@@ -147,20 +150,6 @@ public class FileDetailFragment extends SherlockFragment implements
     }\r
     \r
 \r
     }\r
     \r
 \r

-    /**\r
-     * {@inheritDoc}\r
-     */\r
-    @Override\r
-    public void onAttach(Activity activity) {\r
-        super.onAttach(activity);\r
-        try {\r
-            mContainerActivity = (ContainerActivity) activity;\r
-        } catch (ClassCastException e) {\r
-            throw new ClassCastException(activity.toString() + " must implement FileListFragment.ContainerActivity");\r
-        }\r
-    }\r
-    \r
-    \r

     @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


@@ -185,11 +174,24 @@ public class FileDetailFragment extends SherlockFragment implements
             mPreview = (ImageView)mView.findViewById(R.id.fdPreview);\r
         }\r
         \r
             mPreview = (ImageView)mView.findViewById(R.id.fdPreview);\r
         }\r
         \r

-        updateFileDetails();\r

         return view;\r
     }\r
     \r
 \r
         return view;\r
     }\r
     \r
 \r

+    /**\r
+     * {@inheritDoc}\r
+     */\r
+    @Override\r
+    public void onAttach(Activity activity) {\r
+        super.onAttach(activity);\r
+        try {\r
+            mContainerActivity = (ContainerActivity) activity;\r
+        } catch (ClassCastException e) {\r
+            throw new ClassCastException(activity.toString() + " must implement " + FileDetailFragment.ContainerActivity.class.getCanonicalName());\r
+        }\r
+    }\r
+        \r
+\r

     @Override\r
     public void onSaveInstanceState(Bundle outState) {\r
         Log.i(getClass().toString(), "onSaveInstanceState() start");\r
     @Override\r
     public void onSaveInstanceState(Bundle outState) {\r
         Log.i(getClass().toString(), "onSaveInstanceState() start");\r


@@ -242,10 +244,10 @@ public class FileDetailFragment extends SherlockFragment implements
     public void onClick(View v) {\r
         switch (v.getId()) {\r
             case R.id.fdDownloadBtn: {\r
     public void onClick(View v) {\r
         switch (v.getId()) {\r
             case R.id.fdDownloadBtn: {\r

-                if (FileDownloader.isDownloading(mAccount, mFile.getRemotePath())) {\r
-                    \r
-                    // TODO cancelar descarga\r
-                    \r
+                //if (FileDownloader.isDownloading(mAccount, mFile.getRemotePath())) {\r
+                FileDownloaderBinder downloaderBinder = mContainerActivity.getFileDownloaderBinder();\r
+                if (downloaderBinder != null && downloaderBinder.isDownloading(mAccount, mFile.getRemotePath())) {\r
+                    downloaderBinder.cancel(mAccount, mFile.getRemotePath());\r

                     if (mFile.isDown()) {\r
                         setButtonsForDown();\r
                     } else {\r
                     if (mFile.isDown()) {\r
                         setButtonsForDown();\r
                     } else {\r


@@ -440,7 +442,9 @@ public class FileDetailFragment extends SherlockFragment implements
             cb.setChecked(mFile.keepInSync());\r
 \r
             // configure UI for depending upon local state of the file\r
             cb.setChecked(mFile.keepInSync());\r
 \r
             // configure UI for depending upon local state of the file\r

-            if (FileDownloader.isDownloading(mAccount, mFile.getRemotePath()) || FileUploader.isUploading(mAccount, mFile.getRemotePath())) {\r
+            //if (FileDownloader.isDownloading(mAccount, mFile.getRemotePath()) || FileUploader.isUploading(mAccount, mFile.getRemotePath())) {\r
+            FileDownloaderBinder downloaderBinder = mContainerActivity.getFileDownloaderBinder();\r
+            if ((downloaderBinder != null && downloaderBinder.isDownloading(mAccount, mFile.getRemotePath())) || FileUploader.isUploading(mAccount, mFile.getRemotePath())) {\r

                 setButtonsForTransferring();\r
                 \r
             } else if (mFile.isDown()) {\r
                 setButtonsForTransferring();\r
                 \r
             } else if (mFile.isDown()) {\r


@@ -585,7 +589,7 @@ public class FileDetailFragment extends SherlockFragment implements
      * \r
      * @author David A. Velasco\r
      */\r
      * \r
      * @author David A. Velasco\r
      */\r

-    public interface ContainerActivity {\r
+    public interface ContainerActivity extends TransferServiceGetter {\r

 \r
         /**\r
          * Callback method invoked when the detail fragment wants to notice its container \r
 \r
         /**\r
          * Callback method invoked when the detail fragment wants to notice its container \r