From 0cb3a6bc645939f8a3d627abfc40cc09594aa307 Mon Sep 17 00:00:00 2001 From: stom79 Date: Fri, 24 Nov 2017 07:25:04 +0100 Subject: [PATCH] Display icon only if custom emoji --- .../fr/gouv/etalab/mastodon/activities/TootActivity.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java index 92c4184ff..683af30b3 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java @@ -1088,7 +1088,10 @@ public class TootActivity extends AppCompatActivity implements OnRetrieveSearcAc Version currentVersion = new Version(instanceVersion); Version minVersion = new Version("2.0"); MenuItem itemEmoji = menu.findItem(R.id.action_emoji); - if (currentVersion.compareTo(minVersion) == 1 || currentVersion.equals(minVersion)) { + SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open(); + final List emojis = new CustomEmojiDAO(getApplicationContext(), db).getAllEmojis(); + //Displays button only if custom emojis + if (emojis != null && emojis.size() > 0 && (currentVersion.compareTo(minVersion) == 1 || currentVersion.equals(minVersion))) { itemEmoji.setVisible(true); }else{ itemEmoji.setVisible(false);