From 2a7d99e33c4f3b14302f89e72eb4ba47014f0823 Mon Sep 17 00:00:00 2001
From: Mariotaku Lee <mariotaku.lee@gmail.com>
Date: Tue, 19 Apr 2016 19:06:09 +0800
Subject: [PATCH] fixed crashes

---
 .../mariotaku/twidere/activity/MediaViewerActivity.java    | 7 +++++--
 .../mariotaku/twidere/loader/ParcelableUsersLoader.java    | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/twidere/src/main/java/org/mariotaku/twidere/activity/MediaViewerActivity.java b/twidere/src/main/java/org/mariotaku/twidere/activity/MediaViewerActivity.java
index 6ec547628..effdeef68 100644
--- a/twidere/src/main/java/org/mariotaku/twidere/activity/MediaViewerActivity.java
+++ b/twidere/src/main/java/org/mariotaku/twidere/activity/MediaViewerActivity.java
@@ -933,6 +933,7 @@ public final class MediaViewerActivity extends BaseActivity implements Constants
         @Override
         protected void displayMedia(CacheDownloadLoader.Result result) {
             mVideoView.setVideoURI(result.cacheUri);
+            mVideoControl.setVisibility(View.GONE);
             setMediaViewVisible(true);
             final FragmentActivity activity = getActivity();
             if (activity != null) {
@@ -967,6 +968,7 @@ public final class MediaViewerActivity extends BaseActivity implements Constants
             mMediaPlayer = null;
             mVideoViewProgress.removeCallbacks(mVideoProgressRunnable);
             mVideoViewProgress.setVisibility(View.GONE);
+            mVideoControl.setVisibility(View.GONE);
             mMediaPlayerError = what;
             return true;
         }
@@ -988,12 +990,12 @@ public final class MediaViewerActivity extends BaseActivity implements Constants
         }
 
         private void updateVolume() {
+            final MediaPlayer mp = mMediaPlayer;
+            if (mp == null || mp.isPlaying()) return;
             final ImageButton b = mVolumeButton;
             if (b != null) {
                 b.setImageResource(mPlayAudio ? R.drawable.ic_action_speaker_max : R.drawable.ic_action_speaker_muted);
             }
-            final MediaPlayer mp = mMediaPlayer;
-            if (mp == null) return;
             if (mPlayAudio) {
                 mp.setVolume(1, 1);
             } else {
@@ -1048,6 +1050,7 @@ public final class MediaViewerActivity extends BaseActivity implements Constants
 
             mPlayPauseButton.setOnClickListener(this);
             mVolumeButton.setOnClickListener(this);
+            mVideoControl.setVisibility(View.GONE);
             startLoading(false);
             setMediaViewVisible(false);
             updateVolume();
diff --git a/twidere/src/main/java/org/mariotaku/twidere/loader/ParcelableUsersLoader.java b/twidere/src/main/java/org/mariotaku/twidere/loader/ParcelableUsersLoader.java
index 6b4adb6ed..674cf61ec 100644
--- a/twidere/src/main/java/org/mariotaku/twidere/loader/ParcelableUsersLoader.java
+++ b/twidere/src/main/java/org/mariotaku/twidere/loader/ParcelableUsersLoader.java
@@ -66,8 +66,8 @@ public abstract class ParcelableUsersLoader extends AsyncTaskLoader<List<Parcela
     }
 
     protected boolean hasId(final String id) {
-        for (final ParcelableUser user : mData) {
-            if (TextUtils.equals(user.key.getId(), id)) return true;
+        for (int i = 0; i < mData.size(); i++) {
+            if (TextUtils.equals(mData.get(i).key.getId(), id)) return true;
         }
         return false;
     }