[tbb-commits] [tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 25741 - TBA: Disable QR Code reader by default

[gk at torproject.org]

commit 2b04ca6766a34dc4edb0f7ae8f49ee84667e8f97
Author: Matthew Finkel <Matthew.Finkel at gmail.com>
Date:   Mon Apr 9 22:36:53 2018 +0000

    Bug 25741 - TBA: Disable QR Code reader by default
    
    This is another accessibility and usability concern, so we allow
    this as an opt-in.
---
 mobile/android/app/src/main/res/xml/preferences_accessibility.xml       | 2 +-
 .../android/base/java/org/mozilla/gecko/toolbar/ToolbarEditLayout.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mobile/android/app/src/main/res/xml/preferences_accessibility.xml b/mobile/android/app/src/main/res/xml/preferences_accessibility.xml
index c82006ee2473..c5afa4d8d644 100644
--- a/mobile/android/app/src/main/res/xml/preferences_accessibility.xml
+++ b/mobile/android/app/src/main/res/xml/preferences_accessibility.xml
@@ -23,6 +23,6 @@
     <SwitchPreference android:key="android.not_a_preference.qrcode_enabled"
                       android:title="@string/pref_qrcode_enabled"
                       android:summary="@string/pref_qrcode_enabled_summary"
-                      android:defaultValue="true"/>
+                      android:defaultValue="false"/>
 
 </PreferenceScreen>
diff --git a/mobile/android/base/java/org/mozilla/gecko/toolbar/ToolbarEditLayout.java b/mobile/android/base/java/org/mozilla/gecko/toolbar/ToolbarEditLayout.java
index c1ac4dc0f36a..b44b261b75ef 100644
--- a/mobile/android/base/java/org/mozilla/gecko/toolbar/ToolbarEditLayout.java
+++ b/mobile/android/base/java/org/mozilla/gecko/toolbar/ToolbarEditLayout.java
@@ -324,7 +324,7 @@ public class ToolbarEditLayout extends ThemedLinearLayout {
             return false;
         }
         return GeckoSharedPrefs.forApp(context)
-                .getBoolean(GeckoPreferences.PREFS_QRCODE_ENABLED, true);
+                .getBoolean(GeckoPreferences.PREFS_QRCODE_ENABLED, false);
     }
 
     private void launchQRCodeReader() {