From: David A. Velasco Date: Mon, 8 Oct 2012 07:03:12 +0000 (+0200) Subject: Cancellation of current download in details view - UI changes X-Git-Tag: oc-android-1.4.3~166 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/76ba00b2b23f5c2079a6635dc5e661850c3c5dfb?ds=inline;hp=--cc Cancellation of current download in details view - UI changes --- 76ba00b2b23f5c2079a6635dc5e661850c3c5dfb diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index 1cd99455..90ddff30 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -58,7 +58,6 @@ Midificat: Baixada Baixa de nou - S\'està baixant Obert Sí No diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 635020e7..6d7a540d 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -60,7 +60,6 @@ Geändert: Herunterladen Erneut herunterladen - Lade herunter Öffnen Ja Nein diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index 58c2738d..318d75a8 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -49,7 +49,6 @@ Δημιουργήθηκε: Τροποποιήθηκε: Λήψη - Λήψη Άνοιγμα Ναι Όχι diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 92e703ce..adcb9cc2 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -60,7 +60,6 @@ Modificado: Descargar Volver a descargar - Descargando Abrir Sí No diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 254dba3e..1b80a067 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -58,7 +58,6 @@ Modifié le : Télécharger Télécharger à nouveau - Téléchargement Ouvrir Oui Non diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 2a7dd0c5..10e9a3e1 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -58,7 +58,6 @@ Modificato: Scarica Scarica nuovamente - Scaricamento in corso Apri Sì No diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index dd9a26fb..125128ea 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -53,7 +53,6 @@ Zmodyfikowano: Pobierz Pobierz ponownie - Pobieram Otwórz Tak Nie diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index 57b3434e..c2f68ab1 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -55,7 +55,6 @@ Spremenjen: Prenos Ponovno prenesi - Prenašam Odpri Da Ne 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 @@ Created: Modified: Download - Redownload - Downloading + Refresh Open Yes No 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);