delete file after download failed, correctly send message about download fail

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

diff --git a/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java b/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
index 8dcdb9c..cd26b2a 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
+++ b/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
@@ -186,7 +186,7 @@ public class FileDetailFragment extends SherlockFragment implements
     @Override\r
     public void onClick(View v) {\r
         if (v.getId() == R.id.fdDownloadBtn) {\r
     @Override\r
     public void onClick(View v) {\r
         if (v.getId() == R.id.fdDownloadBtn) {\r

-            Toast.makeText(getActivity(), "Downloading", Toast.LENGTH_LONG).show();\r
+            //Toast.makeText(getActivity(), "Downloading", Toast.LENGTH_LONG).show();\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
             Intent i = new Intent(getActivity(), FileDownloader.class);\r
             i.putExtra(FileDownloader.EXTRA_ACCOUNT, mAccount);\r
             i.putExtra(FileDownloader.EXTRA_REMOTE_PATH, mFile.getRemotePath());\r


@@ -466,12 +466,11 @@ public class FileDetailFragment extends SherlockFragment implements
             if (getView()!=null && getView().findViewById(R.id.fdDownloadBtn) != null) \r
                 getView().findViewById(R.id.fdDownloadBtn).setEnabled(true);\r
             \r
             if (getView()!=null && getView().findViewById(R.id.fdDownloadBtn) != null) \r
                 getView().findViewById(R.id.fdDownloadBtn).setEnabled(true);\r
             \r

-            if (intent.getAction().equals(FileDownloader.BAD_DOWNLOAD_MESSAGE)) {\r
-                Toast.makeText(context, R.string.downloader_download_failed , Toast.LENGTH_SHORT).show();\r
-                \r
-            } else if (intent.getAction().equals(FileDownloader.DOWNLOAD_FINISH_MESSAGE)) {\r
+            if (intent.getBooleanExtra(FileDownloader.EXTRA_DOWNLOAD_RESULT, false)) {\r

                 mFile.setStoragePath(intent.getStringExtra(FileDownloader.EXTRA_FILE_PATH));\r
                 updateFileDetails();\r
                 mFile.setStoragePath(intent.getStringExtra(FileDownloader.EXTRA_FILE_PATH));\r
                 updateFileDetails();\r

+            } else if (intent.getAction().equals(FileDownloader.DOWNLOAD_FINISH_MESSAGE)) {\r
+                Toast.makeText(context, R.string.downloader_download_failed , Toast.LENGTH_SHORT).show();\r

             }\r
         }\r
         \r
             }\r
         }\r
         \r