X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/8d3b028e7215def932d499b9f54c57c8927acf4e..9b9b02c384b4453b3debd703c52e24b6136540f8:/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 0bf9564b..505ff6c7 100644
--- a/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
+++ b/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
@@ -218,7 +218,6 @@ public class FileDetailFragment extends SherlockFragment implements
             if (mFile.getStoragePath() != null) {
                 // Update preview
                 ImageView preview = (ImageView) getView().findViewById(R.id.fdPreview);
-                boolean previewIsSet = false;
                 try {
                     if (mFile.getMimetype().startsWith("image/")) {
                         BitmapFactory.Options options = new Options();
@@ -246,9 +245,7 @@ public class FileDetailFragment extends SherlockFragment implements
                             }
                         }
                         if (bmp != null) {
-                            //preview.setImageBitmap(bmp);
-                            preview.setImageDrawable(new BitmapDrawable(preview.getResources(), bmp));
-                            previewIsSet = true;
+                            preview.setImageBitmap(bmp);
                         }
                     }
                 } catch (OutOfMemoryError e) {
@@ -262,12 +259,8 @@ public class FileDetailFragment extends SherlockFragment implements
                 } catch (Throwable t) {
                     preview.setVisibility(View.INVISIBLE);
                     Log.e(TAG, "Unexpected error while creating image preview " + mFile.getFileLength(), t);
-                    
-                } finally {
-                    if (!previewIsSet) {
-                        resetPreview();
-                    }
                 }
+                
                 // Change download button to open button
                 downloadButton.setText(R.string.filedetails_open);
                 downloadButton.setOnClickListener(new OnClickListener() {
@@ -287,7 +280,7 @@ public class FileDetailFragment extends SherlockFragment implements
                             try {
                                 Intent i = new Intent(Intent.ACTION_VIEW);
                                 mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(storagePath.substring(storagePath.lastIndexOf('.') + 1));
-                                if (mimeType != mFile.getMimetype()) {
+                                if (mimeType != null && !mimeType.equals(mFile.getMimetype())) {
                                     i.setDataAndType(Uri.parse("file://"+mFile.getStoragePath()), mimeType);
                                     i.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
                                     startActivity(i);
@@ -315,8 +308,6 @@ public class FileDetailFragment extends SherlockFragment implements
             } else {
                 // Make download button effective
                 downloadButton.setOnClickListener(this);
-                // Be sure that preview image is reset; the fragment is reused when possible, a preview of other file could be there
-                resetPreview();
             }
         }
     }
@@ -415,16 +406,4 @@ public class FileDetailFragment extends SherlockFragment implements
         
     }
     
-    
-    /**
-     * Make the preview image shows the ownCloud logo.
-     * 
-     * To be called when setting a preview image is not possible.
-     */
-    private void resetPreview() {
-        ImageView preview = (ImageView) getView().findViewById(R.id.fdPreview);
-        preview.setImageDrawable(getResources().getDrawable(R.drawable.owncloud_logo));
-    }
-
-
 }