Fixed message text sometimes obscured

FAQ.md

@@ -34,7 +34,6 @@ Anything on this list is in random order and *might* be added in the near future
 ## Known problems
 
 * Large replied/forwarded texts resulting in [ANR](https://developer.android.com/topic/performance/vitals/anr)s
-* Message text sometimes hidden under *Show original*
 * File not selected (canceled) when using a file manager instead of the [Storage Access Framework](https://developer.android.com/guide/topics/providers/document-provider)
 
 

app/src/main/java/eu/faircode/email/AdapterMessage.java

@@ -236,6 +236,9 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
             grpExpanded = itemView.findViewById(R.id.grpExpanded);
 
             tvBody.setMovementMethod(new UrlHandler());
+
+            if (viewType == ViewType.THREAD)
+                itemView.setHasTransientState(true);
         }
 
         private void wire() {
@@ -448,11 +451,9 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
                 }
 
                 if (!EntityFolder.OUTBOX.equals(message.folderType)) {
-                    bnvActions.setHasTransientState(true);
                     db.folder().liveSystemFolders(message.account).observe(owner, new Observer<List<EntityFolder>>() {
                         @Override
                         public void onChanged(@Nullable List<EntityFolder> folders) {
-                            if (bnvActions.hasTransientState()) {
                             boolean hasJunk = false;
                             boolean hasTrash = false;
                             boolean hasArchive = false;
@@ -486,9 +487,6 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
 
                             bnvActions.setVisibility(View.VISIBLE);
                             vSeparatorBody.setVisibility(View.GONE);
-
-                                bnvActions.setHasTransientState(false);
-                            }
                         }
                     });
                 }
@@ -670,14 +668,6 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
         private SimpleTask<Spanned> bodyTask = new SimpleTask<Spanned>() {
             private String body = null;
 
-            @Override
-            protected void onInit(Bundle args) {
-                btnHtml.setHasTransientState(true);
-                btnImages.setHasTransientState(true);
-                tvBody.setHasTransientState(true);
-                pbBody.setHasTransientState(true);
-            }
-
             @Override
             protected Spanned onLoad(final Context context, final Bundle args) throws Throwable {
                 TupleMessageEx message = (TupleMessageEx) args.getSerializable("message");
@@ -699,20 +689,10 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
                 btnImages.setVisibility(has_images && show_expanded && !show_images ? View.VISIBLE : View.GONE);
                 tvBody.setText(body);
                 pbBody.setVisibility(View.GONE);
-
-                btnHtml.setHasTransientState(false);
-                btnImages.setHasTransientState(false);
-                tvBody.setHasTransientState(false);
-                pbBody.setHasTransientState(false);
             }
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                btnHtml.setHasTransientState(false);
-                btnImages.setHasTransientState(false);
-                tvBody.setHasTransientState(false);
-                pbBody.setHasTransientState(false);
-
                 Helper.unexpectedError(context, ex);
             }
         };