From 054c9722a74d0efc1e370bd10ab6c4607e6e6980 Mon Sep 17 00:00:00 2001 From: Taavi Date: Wed, 13 Feb 2019 04:26:04 +0200 Subject: [PATCH] Added a try-catch to not crash on de-emojifying --- .../gadgetbridge/util/EmojiConverter.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/EmojiConverter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/EmojiConverter.java index 79dce69dd..5df84950b 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/EmojiConverter.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/EmojiConverter.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2018 Andreas Shimokawa, Matthieu Baerts +/* Copyright (C) 2019 Andreas Shimokawa, Matthieu Baerts, Taavi Eomäe This file is part of Gadgetbridge. @@ -19,10 +19,14 @@ package nodomain.freeyourgadget.gadgetbridge.util; import android.content.Context; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import io.wax911.emojify.EmojiManager; import io.wax911.emojify.EmojiUtils; public class EmojiConverter { + private static final Logger LOG = LoggerFactory.getLogger(EmojiConverter.class); private static final String[][] simpleEmojiMapping = { {"\uD83D\uDE00", ":-D"}, // grinning @@ -80,8 +84,12 @@ public class EmojiConverter { private static String convertAdvancedEmojiToAscii(String text, Context context) { initEmojiData(context); - - return EmojiUtils.shortCodify(text); + try { + return EmojiUtils.shortCodify(text); + } catch (Exception e){ + LOG.warn("An exception occured when converting advanced emoji to ASCII", text); + return text; + } } public static String convertUnicodeEmojiToAscii(String text, Context context) {