Cancellation of current download in details view - UI changes

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 1cd9945..90ddff3 100644 (file)
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -58,7 +58,6 @@
   <string name="filedetails_modified">Midificat:</string>
   <string name="filedetails_download">Baixada</string>
   <string name="filedetails_redownload">Baixa de nou</string>
-  <string name="filedetails_download_in_progress">S\'està baixant</string>
   <string name="filedetails_open">Obert</string>
   <string name="common_yes">Sí</string>
   <string name="common_no">No</string>

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 635020e..6d7a540 100644 (file)
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -60,7 +60,6 @@
   <string name="filedetails_modified">Geändert:</string>
   <string name="filedetails_download">Herunterladen</string>
   <string name="filedetails_redownload">Erneut herunterladen</string>
-  <string name="filedetails_download_in_progress">Lade herunter</string>
   <string name="filedetails_open">Öffnen</string>
   <string name="common_yes">Ja</string>
   <string name="common_no">Nein</string>

diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 58c2738..318d75a 100644 (file)
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -49,7 +49,6 @@
   <string name="filedetails_created">Δημιουργήθηκε:</string>
   <string name="filedetails_modified">Τροποποιήθηκε:</string>
   <string name="filedetails_download">Λήψη</string>
-  <string name="filedetails_download_in_progress">Λήψη</string>
   <string name="filedetails_open">Άνοιγμα</string>
   <string name="common_yes">Ναι</string>
   <string name="common_no">Όχι</string>

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 92e703c..adcb9cc 100644 (file)
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -60,7 +60,6 @@
   <string name="filedetails_modified">Modificado:</string>
   <string name="filedetails_download">Descargar</string>
   <string name="filedetails_redownload">Volver a descargar</string>
-  <string name="filedetails_download_in_progress">Descargando</string>
   <string name="filedetails_open">Abrir</string>
   <string name="common_yes">Sí</string>
   <string name="common_no">No</string>

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 254dba3..1b80a06 100644 (file)
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -58,7 +58,6 @@
   <string name="filedetails_modified">Modifié le :</string>
   <string name="filedetails_download">Télécharger</string>
   <string name="filedetails_redownload">Télécharger à nouveau</string>
-  <string name="filedetails_download_in_progress">Téléchargement</string>
   <string name="filedetails_open">Ouvrir</string>
   <string name="common_yes">Oui</string>
   <string name="common_no">Non</string>

diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 2a7dd0c..10e9a3e 100644 (file)
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -58,7 +58,6 @@
   <string name="filedetails_modified">Modificato:</string>
   <string name="filedetails_download">Scarica</string>
   <string name="filedetails_redownload">Scarica nuovamente</string>
-  <string name="filedetails_download_in_progress">Scaricamento in corso</string>
   <string name="filedetails_open">Apri</string>
   <string name="common_yes">Sì</string>
   <string name="common_no">No</string>

diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index dd9a26f..125128e 100644 (file)
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -53,7 +53,6 @@
   <string name="filedetails_modified">Zmodyfikowano:</string>
   <string name="filedetails_download">Pobierz</string>
   <string name="filedetails_redownload">Pobierz ponownie</string>
-  <string name="filedetails_download_in_progress">Pobieram</string>
   <string name="filedetails_open">Otwórz</string>
   <string name="common_yes">Tak</string>
   <string name="common_no">Nie</string>

diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 57b3434..c2f68ab 100644 (file)
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -55,7 +55,6 @@
   <string name="filedetails_modified">Spremenjen:</string>
   <string name="filedetails_download">Prenos</string>
   <string name="filedetails_redownload">Ponovno prenesi</string>
-  <string name="filedetails_download_in_progress">Prenašam</string>
   <string name="filedetails_open">Odpri</string>
   <string name="common_yes">Da</string>
   <string name="common_no">Ne</string>

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 01f1350..162bc1d 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -71,8 +71,7 @@
     <string name="filedetails_created">Created:</string>
     <string name="filedetails_modified">Modified:</string>
     <string name="filedetails_download">Download</string>
-       <string name="filedetails_redownload">Redownload</string>
-       <string name="filedetails_download_in_progress">Downloading</string>
+       <string name="filedetails_redownload">Refresh</string>
     <string name="filedetails_open">Open</string>
     <string name="common_yes">Yes</string>
     <string name="common_no">No</string>

diff --git a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
index 9dfb450..5b76c01 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
+++ b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
@@ -242,17 +242,29 @@ public class FileDetailFragment extends SherlockFragment implements
     public void onClick(View v) {\r
         switch (v.getId()) {\r
             case R.id.fdDownloadBtn: {\r
-                Intent i = new Intent(getActivity(), FileDownloader.class);\r
-                i.putExtra(FileDownloader.EXTRA_ACCOUNT, mAccount);\r
-                i.putExtra(FileDownloader.EXTRA_REMOTE_PATH, mFile.getRemotePath());\r
-                i.putExtra(FileDownloader.EXTRA_FILE_PATH, mFile.getRemotePath());\r
-                i.putExtra(FileDownloader.EXTRA_FILE_SIZE, mFile.getFileLength());\r
+                if (FileDownloader.isDownloading(mAccount, mFile.getRemotePath())) {\r
+                    \r
+                    // TODO cancelar descarga\r
+                    \r
+                    if (mFile.isDown()) {\r
+                        setButtonsForDown();\r
+                    } else {\r
+                        setButtonsForRemote();\r
+                    }\r
+                    \r
+                } else {\r
+                    Intent i = new Intent(getActivity(), FileDownloader.class);\r
+                    i.putExtra(FileDownloader.EXTRA_ACCOUNT, mAccount);\r
+                    i.putExtra(FileDownloader.EXTRA_REMOTE_PATH, mFile.getRemotePath());\r
+                    i.putExtra(FileDownloader.EXTRA_FILE_PATH, mFile.getRemotePath());\r
+                    i.putExtra(FileDownloader.EXTRA_FILE_SIZE, mFile.getFileLength());\r
                 \r
-                // update ui \r
-                setButtonsForTransferring();\r
+                    // update ui \r
+                    setButtonsForTransferring();\r
                 \r
-                getActivity().startService(i);\r
-                mContainerActivity.onFileStateChanged();    // this is not working; it is performed before the fileDownloadService registers it as 'in progress'\r
+                    getActivity().startService(i);\r
+                    mContainerActivity.onFileStateChanged();    // this is not working; it is performed before the fileDownloadService registers it as 'in progress'\r
+                }\r
                 break;\r
             }\r
             case R.id.fdKeepInSync: {\r
@@ -508,8 +520,8 @@ public class FileDetailFragment extends SherlockFragment implements
     private void setButtonsForTransferring() {\r
         if (!isEmpty()) {\r
             Button downloadButton = (Button) getView().findViewById(R.id.fdDownloadBtn);\r
-            //downloadButton.setText(R.string.filedetails_download_in_progress);    // ugly\r
-            downloadButton.setEnabled(false);   // TODO replace it with a 'cancel download' button\r
+            downloadButton.setText(R.string.common_cancel);\r
+            //downloadButton.setEnabled(false);\r
         \r
             // let's protect the user from himself ;)\r
             ((Button) getView().findViewById(R.id.fdOpenBtn)).setEnabled(false);\r
@@ -524,8 +536,8 @@ public class FileDetailFragment extends SherlockFragment implements
     private void setButtonsForDown() {\r
         if (!isEmpty()) {\r
             Button downloadButton = (Button) getView().findViewById(R.id.fdDownloadBtn);\r
-            //downloadButton.setText(R.string.filedetails_redownload);      // ugly\r
-            downloadButton.setEnabled(true);\r
+            downloadButton.setText(R.string.filedetails_redownload);\r
+            //downloadButton.setEnabled(true);\r
         \r
             ((Button) getView().findViewById(R.id.fdOpenBtn)).setEnabled(true);\r
             ((Button) getView().findViewById(R.id.fdRenameBtn)).setEnabled(true);\r
@@ -539,8 +551,7 @@ public class FileDetailFragment extends SherlockFragment implements
     private void setButtonsForRemote() {\r
         if (!isEmpty()) {\r
             Button downloadButton = (Button) getView().findViewById(R.id.fdDownloadBtn);\r
-            //downloadButton.setText(R.string.filedetails_download);    // unnecessary\r
-            downloadButton.setEnabled(true);\r
+            downloadButton.setText(R.string.filedetails_download);\r
             \r
             ((Button) getView().findViewById(R.id.fdOpenBtn)).setEnabled(false);\r
             ((Button) getView().findViewById(R.id.fdRenameBtn)).setEnabled(true);\r