From 5215bfce985b500a338b1f6760e3b63131a3511f Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 20 Jun 2019 10:33:29 +0200
Subject: [PATCH] Hack to prevent disappearing icons

---
 app/src/main/java/eu/faircode/email/AdapterMessage.java   | 4 ++++
 app/src/main/java/eu/faircode/email/FragmentAnswer.java   | 5 +++++
 app/src/main/java/eu/faircode/email/FragmentCompose.java  | 6 +++++-
 app/src/main/java/eu/faircode/email/FragmentMessages.java | 5 +++++
 app/src/main/java/eu/faircode/email/FragmentRule.java     | 4 ++++
 5 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index da8a02c6ec..7ad4597ed0 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -387,6 +387,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             tvNoInternetAttachments = attachments.findViewById(R.id.tvNoInternetAttachments);
 
             bnvActions = vsBody.findViewById(R.id.bnvActions);
+
+            for (int i = 0; i < bnvActions.getMenu().size(); i++)
+                bnvActions.getMenu().getItem(i).getIcon().mutate();
+
             if (compact) {
                 bnvActions.setLabelVisibilityMode(LabelVisibilityMode.LABEL_VISIBILITY_UNLABELED);
                 ViewGroup.LayoutParams lparam = bnvActions.getLayoutParams();
diff --git a/app/src/main/java/eu/faircode/email/FragmentAnswer.java b/app/src/main/java/eu/faircode/email/FragmentAnswer.java
index 3852c817ff..7ffff6e3e6 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAnswer.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAnswer.java
@@ -71,7 +71,12 @@ public class FragmentAnswer extends FragmentBase {
         cbHide = view.findViewById(R.id.cbHide);
         etText = view.findViewById(R.id.etText);
         ibInfo = view.findViewById(R.id.ibInfo);
+
         bottom_navigation = view.findViewById(R.id.bottom_navigation);
+
+        for (int i = 0; i < bottom_navigation.getMenu().size(); i++)
+            bottom_navigation.getMenu().getItem(i).getIcon().mutate();
+
         pbWait = view.findViewById(R.id.pbWait);
         grpReady = view.findViewById(R.id.grpReady);
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 990a5d1dcd..bffe06a235 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -244,7 +244,12 @@ public class FragmentCompose extends FragmentBase {
         ibReferenceEdit = view.findViewById(R.id.ibReferenceEdit);
         ibReferenceImages = view.findViewById(R.id.ibReferenceImages);
         edit_bar = view.findViewById(R.id.edit_bar);
+
         bottom_navigation = view.findViewById(R.id.bottom_navigation);
+
+        for (int i = 0; i < bottom_navigation.getMenu().size(); i++)
+            bottom_navigation.getMenu().getItem(i).getIcon().mutate();
+
         pbWait = view.findViewById(R.id.pbWait);
         grpHeader = view.findViewById(R.id.grpHeader);
         grpExtra = view.findViewById(R.id.grpExtra);
@@ -343,7 +348,6 @@ public class FragmentCompose extends FragmentBase {
         edit_bar.getMenu().findItem(R.id.menu_take_photo).setVisible(take_photo.resolveActivity(pm) != null);
         edit_bar.getMenu().findItem(R.id.menu_record_audio).setVisible(record_audio.resolveActivity(pm) != null);
 
-
         edit_bar.setOnNavigationItemSelectedListener(new BottomNavigationView.OnNavigationItemSelectedListener() {
             @Override
             public boolean onNavigationItemSelected(@NonNull MenuItem item) {
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index c3bb6cd2a4..8dfcb707d2 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -314,7 +314,12 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         seekBar = view.findViewById(R.id.seekBar);
         ibDown = view.findViewById(R.id.ibDown);
         ibUp = view.findViewById(R.id.ibUp);
+
         bottom_navigation = view.findViewById(R.id.bottom_navigation);
+
+        for (int i = 0; i < bottom_navigation.getMenu().size(); i++)
+            bottom_navigation.getMenu().getItem(i).getIcon().mutate();
+
         pbWait = view.findViewById(R.id.pbWait);
         grpSupport = view.findViewById(R.id.grpSupport);
         grpHintSupport = view.findViewById(R.id.grpHintSupport);
diff --git a/app/src/main/java/eu/faircode/email/FragmentRule.java b/app/src/main/java/eu/faircode/email/FragmentRule.java
index fb0c1152de..0551f5e766 100644
--- a/app/src/main/java/eu/faircode/email/FragmentRule.java
+++ b/app/src/main/java/eu/faircode/email/FragmentRule.java
@@ -201,6 +201,10 @@ public class FragmentRule extends FragmentBase {
         tvAutomation = view.findViewById(R.id.tvAutomation);
 
         bottom_navigation = view.findViewById(R.id.bottom_navigation);
+
+        for (int i = 0; i < bottom_navigation.getMenu().size(); i++)
+            bottom_navigation.getMenu().getItem(i).getIcon().mutate();
+
         pbWait = view.findViewById(R.id.pbWait);
 
         grpReady = view.findViewById(R.id.grpReady);