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 a8f0d81..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
-            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
@@ -292,8 +292,13 @@ public class FileDetailFragment extends SherlockFragment implements
                             }\r
                                 Display display = getActivity().getWindowManager().getDefaultDisplay();\r
                                 Point size = new Point();\r
-                                display.getSize(size);\r
-                                int screenwidth = size.x;\r
+                                int screenwidth;\r
+                                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB_MR2) {\r
+                                    display.getSize(size);\r
+                                    screenwidth = size.x;\r
+                                } else {\r
+                                    screenwidth = display.getWidth();\r
+                                }\r
 \r
                                 Log.e("ASD", "W " + width + " SW " + screenwidth);\r
 \r
@@ -458,13 +463,14 @@ public class FileDetailFragment extends SherlockFragment implements
     private class DownloadFinishReceiver extends BroadcastReceiver {\r
         @Override\r
         public void onReceive(Context context, Intent intent) {\r
-            getView().findViewById(R.id.fdDownloadBtn).setEnabled(true);\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 (getView()!=null && getView().findViewById(R.id.fdDownloadBtn) != null) \r
+                getView().findViewById(R.id.fdDownloadBtn).setEnabled(true);\r
+            \r
+            if (intent.getBooleanExtra(FileDownloader.EXTRA_DOWNLOAD_RESULT, false)) {\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