From 481835bb5c4ff21176d0436a88cf8380d58ec78b Mon Sep 17 00:00:00 2001
From: stom79 <tschneider.ac@gmail.com>
Date: Tue, 22 Jan 2019 10:24:19 +0100
Subject: [PATCH] Some fixes

---
 .../mastodon/activities/MediaActivity.java      | 17 +++++++++++++++--
 .../mastodon/drawers/AccountsListAdapter.java   |  1 +
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/MediaActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/MediaActivity.java
index 0bff575d5..ac6249735 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/MediaActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/MediaActivity.java
@@ -107,6 +107,7 @@ public class MediaActivity extends BaseActivity implements OnDownloadInterface {
 
     private ImageButton media_save, media_close;
     private boolean scheduleHidden, scheduleHiddenDescription;
+    private SimpleExoPlayer player;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -438,7 +439,7 @@ public class MediaActivity extends BaseActivity implements OnDownloadInterface {
                     ExtractorMediaSource videoSource = new ExtractorMediaSource.Factory(dataSourceFactory)
                             .createMediaSource(uri);
 
-                    SimpleExoPlayer player = ExoPlayerFactory.newSimpleInstance(MediaActivity.this);
+                    player = ExoPlayerFactory.newSimpleInstance(MediaActivity.this);
                     videoView.setPlayer(player);
                     loader.setVisibility(View.GONE);
                     player.prepare(videoSource);
@@ -457,7 +458,7 @@ public class MediaActivity extends BaseActivity implements OnDownloadInterface {
                     ExtractorMediaSource videoSource = new ExtractorMediaSource.Factory(dataSourceFactory)
                             .createMediaSource(uri);
 
-                    SimpleExoPlayer player = ExoPlayerFactory.newSimpleInstance(MediaActivity.this);
+                    player = ExoPlayerFactory.newSimpleInstance(MediaActivity.this);
                     videoView.setPlayer(player);
                     loader.setVisibility(View.GONE);
                     player.prepare(videoSource);
@@ -496,10 +497,22 @@ public class MediaActivity extends BaseActivity implements OnDownloadInterface {
             loader.setVisibility(View.GONE);
     }
 
+    @Override
+    public void onPause(){
+        super.onPause();
+        if( player != null) {
+            player.setPlayWhenReady(false);
+        }
+    }
+
     @Override
     public void onResume(){
         super.onResume();
         FullScreencall();
+        if( player != null) {
+            player.setPlayWhenReady(true);
+        }
+
     }
     public void FullScreencall() {
         if(Build.VERSION.SDK_INT < 19) {
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsListAdapter.java
index 827876d08..3efdc19e2 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsListAdapter.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsListAdapter.java
@@ -97,6 +97,7 @@ public class AccountsListAdapter extends RecyclerView.Adapter implements OnPostA
 
 
         if(MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON) {
+            holder.account_mute_notification.hide();
             if (action == RetrieveAccountsAsyncTask.Type.BLOCKED)
                 account.setFollowType(Account.followAction.BLOCK);
             else if (action == RetrieveAccountsAsyncTask.Type.MUTED)