Avoid double fullscreen call (#3060)

MozillaReality · Mar 27, 2020 · 9f5c1d7 · 9f5c1d7
1 parent 3db73db
commit 9f5c1d7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 16 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java
@@ -415,7 +415,6 @@ public void releaseWidget() {
                 getSession().exitFullScreen();
             }
             mAttachedWindow.restoreBeforeFullscreenPlacement();
-            mAttachedWindow.setIsFullScreen(false);
             mWidgetManager.popBackHandler(mFullScreenBackHandler);
         }
 
@@ -557,7 +556,7 @@ protected void onDraw(Canvas canvas) {
 
     private void enterFullScreenMode() {
         mWidgetManager.pushBackHandler(mFullScreenBackHandler);
-        mAttachedWindow.setIsFullScreen(true);
+
         AnimationHelper.fadeIn(mBinding.navigationBarFullscreen.fullScreenModeContainer, AnimationHelper.FADE_ANIMATION_DURATION, null);
 
         AnimationHelper.fadeOut(mBinding.navigationBarNavigation.navigationBarContainer, 0, null);
@@ -610,7 +609,6 @@ private void exitFullScreenMode() {
 
         mWidgetManager.updateWidget(mAttachedWindow);
 
-        mAttachedWindow.setIsFullScreen(false);
         mWidgetManager.popBackHandler(mFullScreenBackHandler);
 
         AnimationHelper.fadeIn(mBinding.navigationBarNavigation.navigationBarContainer, AnimationHelper.FADE_ANIMATION_DURATION, null);
@@ -799,16 +797,10 @@ private void closeFloatingMenus() {
 
     // Content delegate
 
-    @Override
-    public void onFullScreen(@NonNull GeckoSession session, boolean aFullScreen) {
-        mViewModel.setIsFullscreen(aFullScreen);
-    }
-
     private Observer<ObservableBoolean> mIsFullscreenObserver = isFullScreen -> {
         if (isFullScreen.get()) {
-            if (!mAttachedWindow.isFullScreen()) {
-                enterFullScreenMode();
-            }
+            enterFullScreenMode();
+
             if (mAttachedWindow.isResizing()) {
                 exitResizeMode(ResizeAction.KEEP_SIZE);
             }

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java
@@ -130,7 +130,6 @@ public class WindowWidget extends UIWidget implements SessionChangeListener,
     private WidgetPlacement mPlacementBeforeFullscreen;
     private WidgetPlacement mPlacementBeforeResize;
     private boolean mIsResizing;
-    private boolean mIsFullScreen;
     private boolean mAfterFirstPaint;
     private boolean mCaptureOnPageStop;
     private PromptDelegate mPromptDelegate;
@@ -192,7 +191,6 @@ private void initialize(Context aContext) {
         mPlacementBeforeFullscreen = new WidgetPlacement(aContext);
         mPlacementBeforeResize = new WidgetPlacement(aContext);
         mIsResizing = false;
-        mIsFullScreen = false;
         initializeWidgetPlacement(mWidgetPlacement);
         if (mSession.isPrivateMode()) {
             mWidgetPlacement.clearColor = ViewUtils.ARGBtoRGBA(getContext().getColor(R.color.window_private_clear_color));
@@ -889,8 +887,7 @@ public boolean isResizing() {
     }
 
     public void setIsFullScreen(boolean isFullScreen) {
-        if (isFullScreen != mIsFullScreen) {
-            mIsFullScreen = isFullScreen;
+        if (mViewModel.getIsFullscreen().getValue().get() != isFullScreen) {
             mViewModel.setIsFullscreen(isFullScreen);
             for (WindowListener listener: mListeners) {
                 listener.onFullScreen(this, isFullScreen);
@@ -899,7 +896,7 @@ public void setIsFullScreen(boolean isFullScreen) {
     }
 
     public boolean isFullScreen() {
-        return mIsFullScreen;
+        return mViewModel.getIsFullscreen().getValue().get();
     }
 
     public void addWindowListener(WindowListener aListener) {
@@ -1554,6 +1551,11 @@ private void hideContextMenus() {
 
     // GeckoSession.ContentDelegate
 
+    @Override
+    public void onFullScreen(@NonNull GeckoSession session, boolean aFullScreen) {
+        setIsFullScreen(aFullScreen);
+    }
+
     @Override
     public void onContextMenu(GeckoSession session, int screenX, int screenY, ContextElement element) {
         if (element.type == ContextElement.TYPE_VIDEO) {