npe fixes

yuliskov · Jan 7, 2025 · 838b3fd · 838b3fd
1 parent 06a3845
commit 838b3fd
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/...ovsoft/smartyoutubetv2/common/app/models/playback/controllers/ContentBlockController.java b/...ovsoft/smartyoutubetv2/common/app/models/playback/controllers/ContentBlockController.java
@@ -139,7 +139,11 @@ public void onButtonClicked(int buttonId, int buttonState) {
     @Override
     public void onButtonLongClicked(int buttonId, int buttonState) {
         if (buttonId == R.id.action_content_block) {
-            ContentBlockSettingsPresenter.instance(getContext()).show(() -> onVideoLoaded(getPlayer().getVideo()));
+            ContentBlockSettingsPresenter.instance(getContext()).show(() -> {
+                if (getPlayer() != null) {
+                    onVideoLoaded(getPlayer().getVideo());
+                }
+            });
         }
     }
 

diff --git a/.../src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/widgets/browse/NavigateTitleView.java b/.../src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/widgets/browse/NavigateTitleView.java
@@ -225,13 +225,17 @@ private void setupButtons() {
 
         if (GeneralData.instance(getContext()).isGlobalClockEnabled()) {
             mGlobalClock = (DateTimeView) findViewById(R.id.global_time);
-            mGlobalClock.showDate(false);
-            mGlobalClock.setVisibility(View.VISIBLE);
+            if (mGlobalClock != null) {
+                mGlobalClock.showDate(false);
+                mGlobalClock.setVisibility(View.VISIBLE);
+            }
 
             mGlobalDate = (DateTimeView) findViewById(R.id.global_date);
-            mGlobalDate.showTime(false);
-            mGlobalDate.showDate(true);
-            mGlobalDate.setVisibility(View.VISIBLE);
+            if (mGlobalDate != null) {
+                mGlobalDate.showTime(false);
+                mGlobalDate.showDate(true);
+                mGlobalDate.setVisibility(View.VISIBLE);
+            }
         }
     }