From e4affdc9d776415d0763c90af160cfca6ef11b01 Mon Sep 17 00:00:00 2001 From: Thomas Date: Thu, 26 Jan 2023 18:16:26 +0100 Subject: [PATCH] Fix a crash --- .../peertube/layout/activity_main_peertube.xml | 1 + .../android/activities/BasePeertubeActivity.java | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/src/main/res/layouts/peertube/layout/activity_main_peertube.xml b/app/src/main/res/layouts/peertube/layout/activity_main_peertube.xml index 971a87fc..9e8bd2e1 100644 --- a/app/src/main/res/layouts/peertube/layout/activity_main_peertube.xml +++ b/app/src/main/res/layouts/peertube/layout/activity_main_peertube.xml @@ -154,6 +154,7 @@ android:id="@+id/nav_view" android:layout_width="match_parent" android:layout_height="wrap_content" + app:labelVisibilityMode="unlabeled" android:layout_marginStart="0dp" android:layout_marginEnd="0dp" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/playstore/java/app/fedilab/android/activities/BasePeertubeActivity.java b/app/src/playstore/java/app/fedilab/android/activities/BasePeertubeActivity.java index 7b3b01fa..f45ab4f3 100644 --- a/app/src/playstore/java/app/fedilab/android/activities/BasePeertubeActivity.java +++ b/app/src/playstore/java/app/fedilab/android/activities/BasePeertubeActivity.java @@ -158,15 +158,19 @@ public class BasePeertubeActivity extends BaseBarActivity { @Override protected void onResume() { - mCastContext.getSessionManager().addSessionManagerListener( - mSessionManagerListener, CastSession.class); + if (mCastContext != null) { + mCastContext.getSessionManager().addSessionManagerListener( + mSessionManagerListener, CastSession.class); + } super.onResume(); } @Override protected void onPause() { - mCastContext.getSessionManager().removeSessionManagerListener( - mSessionManagerListener, CastSession.class); + if (mCastContext != null) { + mCastContext.getSessionManager().removeSessionManagerListener( + mSessionManagerListener, CastSession.class); + } super.onPause(); }