allow deletion of all files

Daniel Gultsch created 3 years ago

Change summary

src/main/java/eu/siacs/conversations/persistance/FileBackend.java | 6 
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java | 7 
2 files changed, 7 insertions(+), 6 deletions(-)

Detailed changes

src/main/java/eu/siacs/conversations/persistance/FileBackend.java

@@ -362,8 +362,12 @@ public class FileBackend {
     }
 
     private static boolean weOwnFileLollipop(final Uri uri) {
+        final String path = uri.getPath();
+        if (path == null) {
+            return false;
+        }
         try {
-            File file = new File(uri.getPath());
+            File file = new File(path);
             FileDescriptor fd =
                     ParcelFileDescriptor.open(file, ParcelFileDescriptor.MODE_READ_ONLY)
                             .getFileDescriptor();

src/main/java/eu/siacs/conversations/ui/ConversationFragment.java

@@ -1184,11 +1184,8 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
                 cancelTransmission.setVisible(true);
             }
             if (m.isFileOrImage() && !deleted && !cancelable) {
-                final String path = m.getRelativeFilePath();
-                if (path == null || !path.startsWith("/")) {
-                    deleteFile.setVisible(true);
-                    deleteFile.setTitle(activity.getString(R.string.delete_x_file, UIHelper.getFileDescriptionString(activity, m)));
-                }
+                deleteFile.setVisible(true);
+                deleteFile.setTitle(activity.getString(R.string.delete_x_file, UIHelper.getFileDescriptionString(activity, m)));
             }
             if (showError) {
                 showErrorMessage.setVisible(true);