From: David A. Velasco <dvelasco@solidgear.es>
Date: Mon, 8 Oct 2012 07:10:37 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: oc-android-1.4.3~165
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/7edbe05bb524b0194d7ad9fb45bfd9d8f1250d51?hp=826c7405f67a1330dd45999e048ae4f2c0a5fbad

Merge remote-tracking branch 'origin/master'

Conflicts:
	res/values-ca/strings.xml
	res/values-el/strings.xml
---

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 83dffe2f..573bdea7 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -69,8 +69,7 @@
   <string name="filedetails_modified">Modificat:</string>
   <string name="filedetails_download">Baixa</string>
   <string name="filedetails_redownload">Baixa de nou</string>
-  <string name="filedetails_download_in_progress">S\'està baixant</string>
-  <string name="filedetails_open">Obre</string>
+  <string name="filedetails_open">Obert</string>
   <string name="common_yes">Sí</string>
   <string name="common_no">No</string>
   <string name="common_ok">D\'acord</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 105ba1e7..d2a1b281 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -69,7 +69,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 e0f1edb6..979c60ea 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -69,7 +69,6 @@
   <string name="filedetails_modified">Τροποποιήθηκε:</string>
   <string name="filedetails_download">Λήψη</string>
   <string name="filedetails_redownload">Κατέβασμα ξανά</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 5f911167..cea37d1a 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -69,7 +69,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 fdd903e3..99d0acfb 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -69,7 +69,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 24bfb516..7e72bf88 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -69,7 +69,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 cc2fc37d..702fc2af 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -69,7 +69,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 4304df4a..8e418364 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -69,7 +69,6 @@
   <string name="filedetails_modified">Spremenjena:</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 01f1350a..162bc1d7 100644
--- 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 9dfb4508..5b76c018 100644
--- 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) {
         switch (v.getId()) {
             case R.id.fdDownloadBtn: {
-                Intent i = new Intent(getActivity(), FileDownloader.class);
-                i.putExtra(FileDownloader.EXTRA_ACCOUNT, mAccount);
-                i.putExtra(FileDownloader.EXTRA_REMOTE_PATH, mFile.getRemotePath());
-                i.putExtra(FileDownloader.EXTRA_FILE_PATH, mFile.getRemotePath());
-                i.putExtra(FileDownloader.EXTRA_FILE_SIZE, mFile.getFileLength());
+                if (FileDownloader.isDownloading(mAccount, mFile.getRemotePath())) {
+                    
+                    // TODO cancelar descarga
+                    
+                    if (mFile.isDown()) {
+                        setButtonsForDown();
+                    } else {
+                        setButtonsForRemote();
+                    }
+                    
+                } else {
+                    Intent i = new Intent(getActivity(), FileDownloader.class);
+                    i.putExtra(FileDownloader.EXTRA_ACCOUNT, mAccount);
+                    i.putExtra(FileDownloader.EXTRA_REMOTE_PATH, mFile.getRemotePath());
+                    i.putExtra(FileDownloader.EXTRA_FILE_PATH, mFile.getRemotePath());
+                    i.putExtra(FileDownloader.EXTRA_FILE_SIZE, mFile.getFileLength());
                 
-                // update ui 
-                setButtonsForTransferring();
+                    // update ui 
+                    setButtonsForTransferring();
                 
-                getActivity().startService(i);
-                mContainerActivity.onFileStateChanged();    // this is not working; it is performed before the fileDownloadService registers it as 'in progress'
+                    getActivity().startService(i);
+                    mContainerActivity.onFileStateChanged();    // this is not working; it is performed before the fileDownloadService registers it as 'in progress'
+                }
                 break;
             }
             case R.id.fdKeepInSync: {
@@ -508,8 +520,8 @@ public class FileDetailFragment extends SherlockFragment implements
     private void setButtonsForTransferring() {
         if (!isEmpty()) {
             Button downloadButton = (Button) getView().findViewById(R.id.fdDownloadBtn);
-            //downloadButton.setText(R.string.filedetails_download_in_progress);    // ugly
-            downloadButton.setEnabled(false);   // TODO replace it with a 'cancel download' button
+            downloadButton.setText(R.string.common_cancel);
+            //downloadButton.setEnabled(false);
         
             // let's protect the user from himself ;)
             ((Button) getView().findViewById(R.id.fdOpenBtn)).setEnabled(false);
@@ -524,8 +536,8 @@ public class FileDetailFragment extends SherlockFragment implements
     private void setButtonsForDown() {
         if (!isEmpty()) {
             Button downloadButton = (Button) getView().findViewById(R.id.fdDownloadBtn);
-            //downloadButton.setText(R.string.filedetails_redownload);      // ugly
-            downloadButton.setEnabled(true);
+            downloadButton.setText(R.string.filedetails_redownload);
+            //downloadButton.setEnabled(true);
         
             ((Button) getView().findViewById(R.id.fdOpenBtn)).setEnabled(true);
             ((Button) getView().findViewById(R.id.fdRenameBtn)).setEnabled(true);
@@ -539,8 +551,7 @@ public class FileDetailFragment extends SherlockFragment implements
     private void setButtonsForRemote() {
         if (!isEmpty()) {
             Button downloadButton = (Button) getView().findViewById(R.id.fdDownloadBtn);
-            //downloadButton.setText(R.string.filedetails_download);    // unnecessary
-            downloadButton.setEnabled(true);
+            downloadButton.setText(R.string.filedetails_download);
             
             ((Button) getView().findViewById(R.id.fdOpenBtn)).setEnabled(false);
             ((Button) getView().findViewById(R.id.fdRenameBtn)).setEnabled(true);