From 4cabd8d38f9c460a82e898a697a712703eda59bd Mon Sep 17 00:00:00 2001 From: Thomas P Date: Tue, 24 Nov 2015 11:45:14 +0100 Subject: [PATCH] Add more supported mimes read ODF formats Add an array for support mimes read formats Use this array in getSupportedMimetypes method to avoid "is not supported by Documents app" Exception Skip read formats in searchDocuments method --- lib/storage.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/storage.php b/lib/storage.php index b3c2ce02..02279b72 100644 --- a/lib/storage.php +++ b/lib/storage.php @@ -26,6 +26,11 @@ class Storage { const MIMETYPE_LIBREOFFICE_WORDPROCESSOR = 'application/vnd.oasis.opendocument.text'; + private static $SUPPORTED_MIMES_READ = array( + 'application/vnd.oasis.opendocument.spreadsheet', + 'application/vnd.oasis.opendocument.presentation', + 'application/vnd.oasis.opendocument.graphics', + ); public static function getDocuments() { $list = array_filter( @@ -92,7 +97,9 @@ public static function onDelete($params) { protected static function searchDocuments(){ $documents = array(); foreach (self::getSupportedMimetypes() as $mime){ - $documents = array_merge($documents, \OCP\Files::searchByMime($mime)); + if (!in_array($mime, self::$SUPPORTED_MIMES_READ)) { + $documents = array_merge($documents, \OCP\Files::searchByMime($mime)); + } } return $documents; } @@ -100,6 +107,7 @@ protected static function searchDocuments(){ public static function getSupportedMimetypes(){ return array_merge( array(self::MIMETYPE_LIBREOFFICE_WORDPROCESSOR), + self::$SUPPORTED_MIMES_READ, Filter::getAll() ); }