From 2fc22184a36572dd5d571fab29340ab517656436 Mon Sep 17 00:00:00 2001 From: Michael Weghorn Date: Fri, 11 Jun 2021 13:55:43 +0200 Subject: tdf#142618 android: Don't crash when passed MIME type is null Change-Id: I5fb532b36fe650596f25a1ba8b7dc56e21292dc1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117053 Tested-by: Jenkins Reviewed-by: Michael Weghorn (cherry picked from commit 6bfa94398a0ea501fce7634ab0ae9ce35c442043) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117116 --- android/source/src/java/org/libreoffice/ui/FileUtilities.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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"); } /** -- cgit