Avoid duplicated GeckoSession setActive calls (#2392)

* Avoid duplicated GeckoSession setActive calls * Ensure we save state and call Telemetry
MozillaReality · Nov 28, 2019 · e162b3a · e162b3a
1 parent 143a88a
commit e162b3a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 14 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/browser/engine/Session.java b/app/src/common/shared/org/mozilla/vrbrowser/browser/engine/Session.java
@@ -658,7 +658,9 @@ public void setActive(boolean aActive) {
         }
 
         if (mState.mSession != null) {
-            mState.mSession.setActive(aActive);
+            if (mState.isActive() != aActive) {
+                mState.mSession.setActive(aActive);
+            }
             mState.setActive(aActive);
         } else if (aActive) {
             restore();

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/Windows.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/Windows.java
@@ -412,24 +412,11 @@ public void onPause() {
         mIsPaused = true;
 
         saveState();
-        for (WindowWidget window: mRegularWindows) {
-            window.onPause();
-        }
-        for (WindowWidget window: mPrivateWindows) {
-            window.onPause();
-        }
     }
 
     public void onResume() {
         mIsPaused = false;
 
-        for (WindowWidget window: mRegularWindows) {
-            window.onResume();
-        }
-        for (WindowWidget window: mPrivateWindows) {
-            window.onResume();
-        }
-
         TelemetryWrapper.resetOpenedWindowsCount(mRegularWindows.size(), false);
         TelemetryWrapper.resetOpenedWindowsCount(mPrivateWindows.size(), true);
     }