VideoPlayerActivity: Prevent ClassCastException

On Android 4.0.x (cherry picked from commit e943418c)

VideoPlayerActivity: Prevent ClassCastException
On Android 4.0.x (cherry picked from commit e943418c)
1f518958 · Geoffrey Métais · a20eb7a7 · 1f518958
Commit 1f518958 authored Mar 22, 2018 by Geoffrey Métais
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java ...d/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java +4 -2

No files found.
--- a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
@@ -385,8 +385,10 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVLCVout.C

        mTitle = mActionBarView.findViewById(R.id.player_overlay_title);
        if (!AndroidUtil.isJellyBeanOrLater) {
-            mSysTime = (TextView) findViewById(R.id.player_overlay_systime);
-            mBattery = (TextView) findViewById(R.id.player_overlay_battery);
+            View v = findViewById(R.id.player_overlay_systime);
+            if (v instanceof TextView) mSysTime = (TextView) v;
+            v = findViewById(R.id.player_overlay_battery);
+            if (v instanceof TextView) mBattery = (TextView) v;
        }

        mPlaylistToggle = (ImageView) findViewById(R.id.playlist_toggle);