Fix crash when the app is closed while playing 360 videos (#1771)

MozillaReality · Sep 4, 2019 · 63542e4 · 63542e4
1 parent e8838e2
commit 63542e4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java b/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java
@@ -395,8 +395,6 @@ protected void onDestroy() {
         }
 
         // Remove all widget listeners
-        mTray.removeListeners(mWindows);
-        mTray.onDestroy();
         mWindows.onDestroy();
 
         SessionStore.get().onDestroy();
@@ -1209,7 +1207,9 @@ public void popWorldBrightness(Object aKey) {
 
     @Override
     public void setTrayVisible(boolean visible) {
-        mTray.setTrayVisible(visible);
+        if (mTray != null && !mTray.isReleased()) {
+            mTray.setTrayVisible(visible);
+        }
     }
 
     @Override

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/TrayWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/TrayWidget.java
@@ -218,10 +218,6 @@ public void removeListeners(TrayListener... listeners) {
         mTrayListeners.removeAll(Arrays.asList(listeners));
     }
 
-    public void onDestroy() {
-        mTrayListeners.clear();
-    }
-
     private void notifyBookmarksClicked() {
         mTrayListeners.forEach(TrayListener::onBookmarksClicked);
     }
@@ -266,6 +262,7 @@ public void releaseWidget() {
         }
 
         mWidgetManager.removeUpdateListener(this);
+        mTrayListeners.clear();
 
         super.releaseWidget();
     }

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/UIWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/UIWidget.java
@@ -49,6 +49,7 @@ public interface Delegate {
     protected int mBorderWidth;
     private Runnable mFirstDrawCallback;
     protected boolean mResizing = false;
+    protected boolean mReleased = false;
 
     public UIWidget(Context aContext) {
         super(aContext);
@@ -203,6 +204,11 @@ private void releaseRenderer() {
     public void releaseWidget() {
         releaseRenderer();
         mWidgetManager = null;
+        mReleased = true;
+    }
+
+    public boolean isReleased() {
+        return mReleased;
     }
 
     @Override