From 953a87852061e66c2c932b636f10ffc463648eb7 Mon Sep 17 00:00:00 2001
From: "Randall E. Barker" <simstorm@mac.com>
Date: Fri, 6 Sep 2019 12:43:16 -0700
Subject: [PATCH] Save autoplay state. Fixes #1781

---
 .../org/mozilla/vrbrowser/browser/SettingsStore.java   | 10 ++++++++++
 .../mozilla/vrbrowser/browser/engine/SessionStore.java |  1 +
 .../ui/widgets/settings/DisplayOptionsView.java        |  1 +
 app/src/main/res/values/non_L10n.xml                   |  1 +
 4 files changed, 13 insertions(+)

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/browser/SettingsStore.java b/app/src/common/shared/org/mozilla/vrbrowser/browser/SettingsStore.java
index 85c0a19b9..daf110249 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/browser/SettingsStore.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/browser/SettingsStore.java
@@ -567,5 +567,15 @@ public void setDebugLoggingEnabled(boolean isEnabled) {
         editor.putBoolean(mContext.getString(R.string.settings_key_debug_logging), isEnabled);
         editor.commit();
     }
+
+    public boolean isAutoplayEnabled() {
+        return mPrefs.getBoolean(mContext.getString(R.string.settings_key_autoplay), AUTOPLAY_ENABLED);
+    }
+
+    public void setAutoplayEnabled(boolean isEnabled) {
+        SharedPreferences.Editor editor = mPrefs.edit();
+        editor.putBoolean(mContext.getString(R.string.settings_key_autoplay), isEnabled);
+        editor.commit();
+    }
 }
 
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/browser/engine/SessionStore.java b/app/src/common/shared/org/mozilla/vrbrowser/browser/engine/SessionStore.java
index 63fde3322..e5f6c97d5 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/browser/engine/SessionStore.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/browser/engine/SessionStore.java
@@ -72,6 +72,7 @@ public void setContext(Context context, Bundle aExtras) {
             runtimeSettingsBuilder.displayDpiOverride(SettingsStore.getInstance(context).getDisplayDpi());
             runtimeSettingsBuilder.screenSizeOverride(SettingsStore.getInstance(context).getMaxWindowWidth(),
                     SettingsStore.getInstance(context).getMaxWindowHeight());
+            runtimeSettingsBuilder.autoplayDefault(SettingsStore.getInstance(mContext).isAutoplayEnabled() ? GeckoRuntimeSettings.AUTOPLAY_DEFAULT_ALLOWED : GeckoRuntimeSettings.AUTOPLAY_DEFAULT_BLOCKED);
 
             if (SettingsStore.getInstance(context).getTransparentBorderWidth() > 0) {
                 runtimeSettingsBuilder.useMaxScreenDepth(true);
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/settings/DisplayOptionsView.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/settings/DisplayOptionsView.java
index 32f8805db..2aea905c0 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/settings/DisplayOptionsView.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/settings/DisplayOptionsView.java
@@ -302,6 +302,7 @@ private void setAutoplay(boolean value, boolean doApply) {
 
         if (doApply) {
             SessionStore.get().setAutoplayEnabled(value);
+            SettingsStore.getInstance(getContext()).setAutoplayEnabled(value);
         }
     }
 
diff --git a/app/src/main/res/values/non_L10n.xml b/app/src/main/res/values/non_L10n.xml
index 446b8d45d..e56e46d34 100644
--- a/app/src/main/res/values/non_L10n.xml
+++ b/app/src/main/res/values/non_L10n.xml
@@ -45,6 +45,7 @@
     <string name="settings_key_browser_world_height" translatable="false">settings_browser_world_height</string>
     <string name="settings_key_notifications" translatable="false">settings_key_notifications</string>
     <string name="settings_key_debug_logging" translatable="false">settings_key_debug_logging</string>
+    <string name="settings_key_autoplay" translatable="false">settings_key_autoplay</string>
     <string name="environment_override_help_url" translatable="false">https://github.com/MozillaReality/FirefoxReality/wiki/Environments</string>
     <string name="private_policy_url" translatable="false">https://www.mozilla.org/privacy/firefox/</string>
     <string name="private_report_url" translatable="false">https://mixedreality.mozilla.org/fxr/report?src=browser-fxr&amp;label=browser-firefox-reality&amp;url=%1$s</string>