[Android] Set a 1s delay before showing the scan progressbar

[Geoffrey Métais]

vlc-android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Thu May 18 15:55:22 2017 +0200| [a7d9e39a391a030bf93d43bf74bffc2f3dd30b90] | committer: Geoffrey Métais

Set a 1s delay before showing the scan progressbar

> https://code.videolan.org/videolan/vlc-android/commit/a7d9e39a391a030bf93d43bf74bffc2f3dd30b90
---

 .../vlc/gui/AudioPlayerContainerActivity.java      | 51 ++++++++++++++--------
 1 file changed, 33 insertions(+), 18 deletions(-)

diff --git a/vlc-android/src/org/videolan/vlc/gui/AudioPlayerContainerActivity.java b/vlc-android/src/org/videolan/vlc/gui/AudioPlayerContainerActivity.java
index cab02d5..c6b2fe9 100644
--- a/vlc-android/src/org/videolan/vlc/gui/AudioPlayerContainerActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/AudioPlayerContainerActivity.java
@@ -292,22 +292,29 @@ public class AudioPlayerContainerActivity extends BaseActivity implements Playba
     }
 
     private void updateProgressVisibility(int visibility) {
-        if (mScanProgressLayout != null) {
-            if (mScanProgressLayout.getVisibility() != visibility)
-                mScanProgressLayout.setVisibility(visibility);
-        } else {
-            View vsc = findViewById(R.id.scan_viewstub);
-            if (vsc != null) {
-                vsc.setVisibility(View.VISIBLE);
-                mScanProgressLayout = findViewById(R.id.scan_progress_layout);
-                mScanProgressText = (TextView) findViewById(R.id.scan_progress_text);
-                mScanProgressBar = (ProgressBar) findViewById(R.id.scan_progress_bar);
-                if (mBottomSheetBehavior != null && mBottomSheetBehavior.getState() == BottomSheetBehavior.STATE_COLLAPSED) {
-                    mFragmentContainer.setPadding(0, 0, 0, mBottomSheetBehavior.getPeekHeight());
-                    applyMarginToProgressBar(mBottomSheetBehavior.getPeekHeight());
-                }
+        boolean show = visibility == View.VISIBLE;
+        if ((mScanProgressLayout == null && !show) ||
+                (mScanProgressLayout != null && mScanProgressLayout.getVisibility() == visibility))
+            return;
+        if (show)
+            mActivityHandler.sendEmptyMessageDelayed(ACTION_DISPLAY_PROGRESSBAR, 1000);
+        else if (mScanProgressLayout != null)
+            mScanProgressLayout.setVisibility(visibility);
+    }
+
+    private void showProgressBar() {
+        View vsc = findViewById(R.id.scan_viewstub);
+        if (vsc != null) {
+            vsc.setVisibility(View.VISIBLE);
+            mScanProgressLayout = findViewById(R.id.scan_progress_layout);
+            mScanProgressText = (TextView) findViewById(R.id.scan_progress_text);
+            mScanProgressBar = (ProgressBar) findViewById(R.id.scan_progress_bar);
+            if (mBottomSheetBehavior != null && mBottomSheetBehavior.getState() == BottomSheetBehavior.STATE_COLLAPSED) {
+                mFragmentContainer.setPadding(0, 0, 0, mBottomSheetBehavior.getPeekHeight());
+                applyMarginToProgressBar(mBottomSheetBehavior.getPeekHeight());
             }
-        }
+        } else if (mScanProgressLayout != null)
+            mScanProgressLayout.setVisibility(View.VISIBLE);
     }
 
     private void applyMarginToProgressBar(int marginValue) {
@@ -326,9 +333,10 @@ public class AudioPlayerContainerActivity extends BaseActivity implements Playba
                 showAudioPlayer();
             else if (MediaParsingService.ACTION_SERVICE_STARTED.equals(action))
                 updateProgressVisibility(View.VISIBLE);
-            else if (MediaParsingService.ACTION_SERVICE_ENDED.equals(action))
+            else if (MediaParsingService.ACTION_SERVICE_ENDED.equals(action)) {
+                mActivityHandler.removeMessages(ACTION_DISPLAY_PROGRESSBAR);
                 updateProgressVisibility(View.GONE);
-            else if (MediaParsingService.ACTION_PROGRESS.equals(action)) {
+            } else if (MediaParsingService.ACTION_PROGRESS.equals(action)) {
                 updateProgressVisibility(View.VISIBLE);
                 if (mScanProgressText != null)
                     mScanProgressText.setText(intent.getStringExtra(MediaParsingService.ACTION_PROGRESS_TEXT));
@@ -354,6 +362,7 @@ public class AudioPlayerContainerActivity extends BaseActivity implements Playba
 
     private static final int ACTION_MEDIA_MOUNTED = 1337;
     private static final int ACTION_MEDIA_UNMOUNTED = 1338;
+    private static final int ACTION_DISPLAY_PROGRESSBAR = 1339;
 
     public boolean isAudioPlayerReady() {
         return mAudioPlayer != null;
@@ -400,9 +409,10 @@ public class AudioPlayerContainerActivity extends BaseActivity implements Playba
             AudioPlayerContainerActivity owner = getOwner();
             if (owner == null)
                 return;
-            String uuid = ((Uri) msg.obj).getLastPathSegment();
+            String uuid;
             switch (msg.what){
                 case ACTION_MEDIA_MOUNTED:
+                    uuid = ((Uri) msg.obj).getLastPathSegment();
                     String path = ((Uri) msg.obj).getPath();
                     removeMessages(ACTION_MEDIA_UNMOUNTED);
                     if (!PreferenceManager.getDefaultSharedPreferences(owner).getBoolean("ignore_"+ uuid, false)) {
@@ -417,9 +427,14 @@ public class AudioPlayerContainerActivity extends BaseActivity implements Playba
                     }
                     break;
                 case ACTION_MEDIA_UNMOUNTED:
+                    uuid = ((Uri) msg.obj).getLastPathSegment();
                     VLCApplication.getMLInstance().removeDevice(uuid);
                     LocalBroadcastManager.getInstance(owner).sendBroadcast(new Intent(MediaParsingService.ACTION_SERVICE_ENDED));
                     break;
+                case ACTION_DISPLAY_PROGRESSBAR:
+                    removeMessages(ACTION_DISPLAY_PROGRESSBAR);
+                    owner.showProgressBar();
+                    break;
             }
         }
     }