From 90090ba8707ba69f8e372b95326c5bfd0984d6b1 Mon Sep 17 00:00:00 2001
From: Nite <shunite@gmail.com>
Date: Thu, 14 Jan 2021 09:30:23 +0100
Subject: [PATCH] Changed how the NowPlaying view is displayed and hidden

---
 .../activity/SubsonicTabActivity.java         | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/activity/SubsonicTabActivity.java b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/SubsonicTabActivity.java
index 637e2bc4..e16c886e 100644
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/activity/SubsonicTabActivity.java
+++ b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/SubsonicTabActivity.java
@@ -170,6 +170,9 @@ public class SubsonicTabActivity extends ResultActivity implements OnClickListen
 			restart();
 		}
 
+		// This must be filled here because onCreate is called before the derived objects would call setContentView
+		getNowPlayingView();
+
 		if (!nowPlayingHidden)
 		{
 			showNowPlaying();
@@ -242,6 +245,19 @@ public class SubsonicTabActivity extends ResultActivity implements OnClickListen
 		return destroyed;
 	}
 
+	private void getNowPlayingView()
+	{
+		if (nowPlayingView == null)
+		{
+			try {
+				nowPlayingView = findViewById(R.id.now_playing);
+			}
+			catch (Exception exception) {
+				Timber.w(exception, "An exception has occurred while trying to get the nowPlayingView by findViewById");
+			}
+		}
+	}
+
 	public void showNowPlaying()
 	{
 		this.runOnUiThread(new Runnable()
@@ -260,8 +276,6 @@ public class SubsonicTabActivity extends ResultActivity implements OnClickListen
 							return null;
 						}
 
-						nowPlayingView = findViewById(R.id.now_playing);
-
 						if (nowPlayingView != null)
 						{
 							PlayerState playerState = mediaPlayerControllerLazy.getValue().getPlayerState();
@@ -307,11 +321,6 @@ public class SubsonicTabActivity extends ResultActivity implements OnClickListen
 			return;
 		}
 
-		if (nowPlayingView == null)
-		{
-			nowPlayingView = findViewById(R.id.now_playing);
-		}
-
 		if (nowPlayingView != null)
 		{
 			try
@@ -407,11 +416,6 @@ public class SubsonicTabActivity extends ResultActivity implements OnClickListen
 	{
 		try
 		{
-			if (nowPlayingView == null)
-			{
-				nowPlayingView = findViewById(R.id.now_playing);
-			}
-
 			if (nowPlayingView != null)
 			{
 				setVisibilityOnUiThread(nowPlayingView, View.GONE);