changes due to rebase

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java

@@ -325,53 +325,6 @@ public class FileOperationsHelper {
             openFileWithIntent = createIntentFromFile(storagePath);
         }
 
-        if (openFileWithIntent == null) {
-            openFileWithIntent = new Intent(Intent.ACTION_VIEW);
-            openFileWithIntent.setDataAndType(
-                    fileUri,
-                    file.getMimetype()
-            );
-        }
-
-        openFileWithIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
-        return openFileWithIntent;
-
-
-        String storagePath = file.getStoragePath();
-
-        String[] officeExtensions = MainApp.getAppContext().getResources().getStringArray(R.array
-                .ms_office_extensions);
-
-        Uri fileUri;
-
-        if (file.getFileName().contains(".") &&
-                Arrays.asList(officeExtensions).contains(file.getFileName().substring(file.getFileName().
-                        lastIndexOf(".") + 1, file.getFileName().length())) &&
-                !file.getStoragePath().startsWith(MainApp.getAppContext().getFilesDir().getAbsolutePath())) {
-            fileUri = file.getLegacyExposedFileUri(mFileActivity);
-        } else {
-            fileUri = file.getExposedFileUri(mFileActivity);
-        }
-
-        Intent openFileWithIntent = null;
-        int lastIndexOfDot = storagePath.lastIndexOf('.');
-        if (lastIndexOfDot >= 0) {
-            String fileExt = storagePath.substring(lastIndexOfDot + 1);
-            String guessedMimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(fileExt);
-            if (guessedMimeType != null) {
-                openFileWithIntent = new Intent(Intent.ACTION_VIEW);
-                openFileWithIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
-                openFileWithIntent.setDataAndType(
-                        fileUri,
-                        guessedMimeType
-                );
-            }
-        }
-
-        if (openFileWithIntent == null) {
-            openFileWithIntent = createIntentFromFile(storagePath);
-        }
-
         if (openFileWithIntent == null) {
             openFileWithIntent = new Intent(Intent.ACTION_VIEW);
             openFileWithIntent.setDataAndType(
@@ -381,6 +334,7 @@ public class FileOperationsHelper {
         }
 
         openFileWithIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
+        return openFileWithIntent;
     }
 
     private Uri getFileUri(OCFile file, String[] officeExtensions) {

src/main/java/com/owncloud/android/utils/FileSortOrderByDate.java

@@ -58,12 +58,9 @@ public class FileSortOrderByDate extends FileSortOrder {
     public List<TrashbinFile> sortTrashbinFiles(List<TrashbinFile> files) {
         final int multiplier = mAscending ? 1 : -1;
 
-        Collections.sort(files, new Comparator<TrashbinFile>() {
-            @SuppressFBWarnings(value = "Bx", justification = "Would require stepping up API level")
-            public int compare(TrashbinFile o1, TrashbinFile o2) {
-                Long obj1 = o1.getDeletionTimestamp();
-                return multiplier * obj1.compareTo(o2.getDeletionTimestamp());
-            }
+        Collections.sort(files, (o1, o2) -> {
+            Long obj1 = o1.getDeletionTimestamp();
+            return multiplier * obj1.compareTo(o2.getDeletionTimestamp());
         });
 
         return super.sortTrashbinFiles(files);

src/main/java/com/owncloud/android/utils/FileSortOrderByName.java

@@ -72,17 +72,15 @@ public class FileSortOrderByName extends FileSortOrder {
     public List<TrashbinFile> sortTrashbinFiles(List<TrashbinFile> files) {
         final int multiplier = mAscending ? 1 : -1;
 
-        Collections.sort(files, new Comparator<TrashbinFile>() {
-            public int compare(TrashbinFile o1, TrashbinFile o2) {
-                if (o1.isFolder() && o2.isFolder()) {
-                    return multiplier * new AlphanumComparator().compare(o1, o2);
-                } else if (o1.isFolder()) {
-                    return -1;
-                } else if (o2.isFolder()) {
-                    return 1;
-                }
+        Collections.sort(files, (o1, o2) -> {
+            if (o1.isFolder() && o2.isFolder()) {
                 return multiplier * new AlphanumComparator().compare(o1, o2);
+            } else if (o1.isFolder()) {
+                return -1;
+            } else if (o2.isFolder()) {
+                return 1;
             }
+            return multiplier * new AlphanumComparator().compare(o1, o2);
         });
 
         return super.sortTrashbinFiles(files);

src/main/java/com/owncloud/android/utils/FileSortOrderBySize.java

@@ -71,21 +71,18 @@ public class FileSortOrderBySize extends FileSortOrder {
     public List<TrashbinFile> sortTrashbinFiles(List<TrashbinFile> files) {
         final int multiplier = mAscending ? 1 : -1;
 
-        Collections.sort(files, new Comparator<TrashbinFile>() {
-            @SuppressFBWarnings(value = "Bx")
-            public int compare(TrashbinFile o1, TrashbinFile o2) {
-                if (o1.isFolder() && o2.isFolder()) {
-                    Long obj1 = o1.getFileLength();
-                    return multiplier * obj1.compareTo(o2.getFileLength());
-                } else if (o1.isFolder()) {
-                    return -1;
-
-                } else if (o2.isFolder()) {
-                    return 1;
-                } else {
-                    Long obj1 = o1.getFileLength();
-                    return multiplier * obj1.compareTo(o2.getFileLength());
-                }
+        Collections.sort(files, (o1, o2) -> {
+            if (o1.isFolder() && o2.isFolder()) {
+                Long obj1 = o1.getFileLength();
+                return multiplier * obj1.compareTo(o2.getFileLength());
+            } else if (o1.isFolder()) {
+                return -1;
+
+            } else if (o2.isFolder()) {
+                return 1;
+            } else {
+                Long obj1 = o1.getFileLength();
+                return multiplier * obj1.compareTo(o2.getFileLength());
             }
         });
 

src/main/res/layout/trashbin_item.xml

@@ -123,7 +123,7 @@
                 android:layout_height="match_parent"
                 android:layout_centerVertical="true"
                 android:clickable="false"
-                android:contentDescription="@string/restore"
+                android:contentDescription="@string/restore_button_description"
                 android:focusable="false"
                 android:paddingEnd="@dimen/list_item_share_right_margin"
                 android:paddingLeft="@dimen/standard_half_padding"

src/main/res/values/strings.xml

@@ -800,7 +800,7 @@
     <string name="updating_share_failed">Updating share failed</string>
     <string name="whats_new_device_credentials_title">Use Android device protection</string>
     <string name="whats_new_device_credentials_content">Use anything like a pattern, password, pin or your fingerprint to keep your data safe.</string>
-    <string name="restore">Restore file</string>
+    <string name="restore_button_description">Restore deleted file</string>
     <string name="new_version_was_created">New version was created</string>
     <string name="new_comment">New comment…</string>
     <string name="error_comment_file">Error commenting file</string>
@@ -811,7 +811,6 @@
     <string name="feedback_no_mail_app">No app available to send mails!</string>
     <string name="drawer_item_trashbin">Deleted files</string>
     <string name="trashbin_activity_title">Deleted files</string>
-    <string name="restore_deleted_file">Restore deleted file</string>
     <string name="action_empty_trashbin">Empty trashbin</string>
     <string name="trashbin_loading_failed">Loading trashbin failed!</string>
     <string name="trashbin_file_not_deleted">File %1$s could not be deleted!</string>