1 files changed, 6 insertions, 3 deletions
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java
index c4570b2c1..54f80748c 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java
@@ -129,9 +129,8 @@ public class ShowConversationActivity extends BaseActivity implements  OnRetriev
                     Bundle b = intent.getExtras();
                     assert b != null;
                     Status status = b.getParcelable("status");
-                    API.StatusAction statusAction = (API.StatusAction) b.getSerializable("action");
-                    if( status != null) {
-                        statusListAdapter.notifyStatusWithActionChanged(statusAction, status);
+                    if( status != null && statusListAdapter != null) {
+                        statusListAdapter.notifyStatusWithActionChanged(status);
                     }
                 }
             };
@@ -185,6 +184,7 @@ public class ShowConversationActivity extends BaseActivity implements  OnRetriev
                     intent.putExtras(b);
                     finish();
                     startActivity(intent);
+                    overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
                 }
             });
             action_unhide.setOnClickListener(new View.OnClickListener() {
@@ -211,6 +211,8 @@ public class ShowConversationActivity extends BaseActivity implements  OnRetriev
                     intent.putExtras(b);
                     finish();
                     startActivity(intent);
+                    overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
+
                 }
             });
 
@@ -292,6 +294,7 @@ public class ShowConversationActivity extends BaseActivity implements  OnRetriev
                 intent.putExtras(b);
                 finish();
                 startActivity(intent);
+                overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
             }
         });