From 73143f32364e3b7f9541f676816440ba9470ff3f Mon Sep 17 00:00:00 2001
From: Len Chan <lenchan139@tto.moe>
Date: Sun, 31 Mar 2019 20:22:38 +0800
Subject: [PATCH] cleanup

---
 .../mastodon/activities/MediaActivity.java    | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 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 fab19b7fc..3e5f35d91 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
@@ -96,7 +96,7 @@ public class MediaActivity extends BaseActivity implements OnDownloadInterface {
     private String finalUrlDownload;
     private String preview_url;
     private ImageView prev, next;
-    private boolean isControlElementShown;
+    private boolean isControlElementShown = true;
     private Bitmap downloadedImage;
     private File fileVideo;
     private TextView progress;
@@ -323,18 +323,19 @@ public class MediaActivity extends BaseActivity implements OnDownloadInterface {
                     if(deltaY < 0) { finish(); return true; }
                 } else {
                     currentAction = MediaActivity.actionSwipe.POP;
-                    if(event.getY() > action_bar_container.getHeight()) {
-                        isControlElementShown = !isControlElementShown;
-                        FullScreencall(thisControllShown);
-                        if (thisControllShown) {
+                    isControlElementShown = !isControlElementShown;
+                    if (thisControllShown) {
+                        if(event.getY() > action_bar_container.getHeight()) {
+                            FullScreencall(thisControllShown);
                             action_bar_container.setVisibility(View.GONE);
-                        } else {
-                            action_bar_container.setVisibility(View.VISIBLE);
+                            if (media_description.getVisibility() == View.VISIBLE) {
+                                media_description.setVisibility(View.GONE);
+                            }
                         }
-
-                        if (media_description.getVisibility() == View.VISIBLE && thisControllShown) {
-                            media_description.setVisibility(View.GONE);
-                        } else if (!thisControllShown && attachment != null && attachment.getDescription() != null && !attachment.getDescription().equals("null")) {
+                    } else {
+                        action_bar_container.setVisibility(View.VISIBLE);
+                        FullScreencall(thisControllShown);
+                        if (attachment != null && attachment.getDescription() != null && !attachment.getDescription().equals("null")) {
                             media_description.setText(attachment.getDescription());
                             media_description.setVisibility(View.VISIBLE);
                             imageView.setContentDescription(attachment.getDescription());
@@ -343,12 +344,15 @@ public class MediaActivity extends BaseActivity implements OnDownloadInterface {
                             media_description.setVisibility(View.GONE);
                         }
                     }
-                }
 
+
+                }
             }
+
         }
 
 
+
         return super.dispatchTouchEvent(event);
     }
 
@@ -544,7 +548,6 @@ public class MediaActivity extends BaseActivity implements OnDownloadInterface {
     @Override
     public void onResume(){
         super.onResume();
-        FullScreencall(isControlElementShown);
         if( player != null) {
             player.setPlayWhenReady(true);
         }