X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/275eb1f8f891b13f1128129564403921c0d5e43e..0cced280a4c6711229da3a3ab692b0971654a191:/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 ce1ede91..d7fb886f 100644
--- a/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
+++ b/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
@@ -273,7 +273,12 @@ public class FileDetailFragment extends SherlockFragment implements
                 break;
             }   
             case R.id.fdRemoveBtn: {
-                ConfirmationDialogFragment confDialog = ConfirmationDialogFragment.newInstance(R.string.confirmation_remove_alert, new String[]{mFile.getFileName()});
+                ConfirmationDialogFragment confDialog = ConfirmationDialogFragment.newInstance(
+                        R.string.confirmation_remove_alert,
+                        new String[]{mFile.getFileName()},
+                        mFile.isDown() ? R.string.confirmation_remove_remote_and_local : R.string.confirmation_remove_remote,
+                        mFile.isDown() ? R.string.confirmation_remove_local : -1,
+                        R.string.common_cancel);
                 confDialog.setOnConfirmationListener(this);
                 confDialog.show(getFragmentManager(), FTAG_CONFIRMATION);
                 break;
@@ -331,14 +336,31 @@ public class FileDetailFragment extends SherlockFragment implements
     
     
     @Override
-    public void onConfirmation(boolean confirmation, String callerTag) {
-        if (confirmation && callerTag.equals(FTAG_CONFIRMATION)) {
+    public void onConfirmation(String callerTag) {
+        if (callerTag.equals(FTAG_CONFIRMATION)) {
             Log.e("ASD","onConfirmation");
             FileDataStorageManager fdsm = new FileDataStorageManager(mAccount, getActivity().getContentResolver());
             if (fdsm.getFileById(mFile.getFileId()) != null) {
                 new Thread(new RemoveRunnable(mFile, mAccount, new Handler())).start();
             }
-        } else if (!confirmation) Log.d(TAG, "REMOVAL CANCELED");
+        }
+    }
+    
+    @Override
+    public void onNeutral(String callerTag) {
+        FileDataStorageManager fdsm = new FileDataStorageManager(mAccount, getActivity().getContentResolver());
+        File f = null;
+        if (mFile.isDown() && (f = new File(mFile.getStoragePath())).exists()) {
+            f.delete();
+            mFile.setStoragePath(null);
+            fdsm.saveFile(mFile);
+            updateFileDetails(mFile, mAccount);
+        }
+    }
+    
+    @Override
+    public void onCancel(String callerTag) {
+        Log.d(TAG, "REMOVAL CANCELED");
     }
     
     
@@ -406,51 +428,6 @@ public class FileDetailFragment extends SherlockFragment implements
                 
                 setButtonsForDown();
                 
-                // Change download button to open button
-                /*downloadButton.setText(R.string.filedetails_open);
-                downloadButton.setOnClickListener(new OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        String storagePath = mFile.getStoragePath();
-                        String encodedStoragePath = WebdavUtils.encodePath(storagePath);
-                        try {
-                            Intent i = new Intent(Intent.ACTION_VIEW);
-                            i.setDataAndType(Uri.parse("file://"+ encodedStoragePath), mFile.getMimetype());
-                            i.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
-                            startActivity(i);
-                            
-                        } catch (Throwable t) {
-                            Log.e(TAG, "Fail when trying to open with the mimeType provided from the ownCloud server: " + mFile.getMimetype());
-                            boolean toastIt = true; 
-                            String mimeType = "";
-                            try {
-                                Intent i = new Intent(Intent.ACTION_VIEW);
-                                mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(storagePath.substring(storagePath.lastIndexOf('.') + 1));
-                                if (mimeType != null && !mimeType.equals(mFile.getMimetype())) {
-                                    i.setDataAndType(Uri.parse("file://"+ encodedStoragePath), mimeType);
-                                    i.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
-                                    startActivity(i);
-                                    toastIt = false;
-                                }
-                                
-                            } catch (IndexOutOfBoundsException e) {
-                                Log.e(TAG, "Trying to find out MIME type of a file without extension: " + storagePath);
-                                
-                            } catch (ActivityNotFoundException e) {
-                                Log.e(TAG, "No activity found to handle: " + storagePath + " with MIME type " + mimeType + " obtained from extension");
-                                
-                            } catch (Throwable th) {
-                                Log.e(TAG, "Unexpected problem when opening: " + storagePath, th);
-                                
-                            } finally {
-                                if (toastIt) {
-                                    Toast.makeText(getActivity(), "There is no application to handle file " + mFile.getFileName(), Toast.LENGTH_SHORT).show();
-                                }
-                            }
-                            
-                        }
-                    }
-                });*/
             } else {
                 setButtonsForRemote();
             }