diff options
author | Michael Weghorn <m.weghorn@posteo.de> | 2021-06-11 13:55:43 +0200 |
---|---|---|
committer | Michael Weghorn <m.weghorn@posteo.de> | 2021-06-14 13:29:52 +0200 |
commit | 2fc22184a36572dd5d571fab29340ab517656436 (patch) | |
tree | 64870519dba5ec6030aa9c798009a4b674233356 | |
parent | 49b3b9d3391abb50aefe291d2ee0f8bca7eb6bd0 (diff) |
tdf#142618 android: Don't crash when passed MIME type is null
distro/lhm/libreoffice-7-2+backports
Change-Id: I5fb532b36fe650596f25a1ba8b7dc56e21292dc1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117053
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
(cherry picked from commit 6bfa94398a0ea501fce7634ab0ae9ce35c442043)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117116
-rw-r--r-- | android/source/src/java/org/libreoffice/ui/FileUtilities.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/android/source/src/java/org/libreoffice/ui/FileUtilities.java b/android/source/src/java/org/libreoffice/ui/FileUtilities.java index 4c9c0d6d10eb..5bfb93b4c1f5 100644 --- a/android/source/src/java/org/libreoffice/ui/FileUtilities.java +++ b/android/source/src/java/org/libreoffice/ui/FileUtilities.java @@ -121,7 +121,7 @@ public class FileUtilities { */ public static boolean isTemplateMimeType(final String mimeType) { // this works for ODF and OOXML template MIME types - return mimeType.endsWith("template"); + return mimeType != null && mimeType.endsWith("template"); } /** |