Commit e311353e authored by n8fr8's avatar n8fr8 Committed by Georg Koppen
Browse files

fix #17 from https://github.com/amoghbl1/tor-browser/issues don't restore tabs by default 

fix #11 from https://github.com/amoghbl1/tor-browser/issues


turn off health report by default

search history disabled by default

fixes #12 sets private data to clear by default

disable camera permissions as part of WebRTC disable #15

more work on #15 to remove permissions

disable search history for v11+ as well

work on #15 to disable location permissions

ensure search history is off by default

make sure voice and qr is disabled by default

make sure autoplay is off by default

Signed-off-by: default avatarAmogh Pradeep <amoghbl1@gmail.com>
parent 572f377b

mobile/android/base/FennecManifest_permissions.xml.in

+11 −1
Original line number Diff line number Diff line
@@ -17,9 +17,15 @@ 
     (potentially) of the push feature. -->

#include GcmAndroidManifest_permissions.xml.in



#ifdef MOZ_WIFI_STATE

    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>

    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>

#endif



#ifdef MOZ_LOCATION

    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>

#endif



    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>

    <uses-permission android:name="android.permission.INTERNET"/>

    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
@@ -34,12 +40,16 @@ 


    <uses-permission android:name="android.permission.WAKE_LOCK"/>

    <uses-permission android:name="android.permission.VIBRATE"/>



#ifdef MOZ_ANDROID_DOWNLOADS_INTEGRATION

    <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />

#endif



#ifdef MOZ_LOCATION

    <uses-feature android:name="android.hardware.location" android:required="false"/>

    <uses-feature android:name="android.hardware.location.gps" android:required="false"/>

#endif



    <uses-feature android:name="android.hardware.touchscreen"/>



    <!-- Tab Queue -->
@@ -56,10 +66,10 @@ 
    <uses-feature android:name="android.hardware.audio.low_latency" android:required="false"/>

    <uses-feature android:name="android.hardware.camera.any" android:required="false"/>

    <uses-feature android:name="android.hardware.microphone" android:required="false"/>

#endif

    <uses-permission android:name="android.permission.CAMERA" />

    <uses-feature android:name="android.hardware.camera" android:required="false"/>

    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>

#endif



    <!-- App requires OpenGL ES 2.0 -->

    <uses-feature android:glEsVersion="0x00020000" android:required="true" />

mobile/android/base/java/org/mozilla/gecko/home/BrowserSearch.java

+1 −1
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ public class BrowserSearch extends HomeFragment 
        super.onResume();



        final SharedPreferences prefs = GeckoSharedPrefs.forApp(getContext());

        mSavedSearchesEnabled = prefs.getBoolean(GeckoPreferences.PREFS_HISTORY_SAVED_SEARCH, true);

        mSavedSearchesEnabled = prefs.getBoolean(GeckoPreferences.PREFS_HISTORY_SAVED_SEARCH, false);



        // Fetch engines if we need to.

        if (mSearchEngines.isEmpty() || !Locale.getDefault().equals(mLastLocale)) {

mobile/android/base/java/org/mozilla/gecko/home/SearchEngineRow.java

+1 −1
Original line number Diff line number Diff line
@@ -391,7 +391,7 @@ class SearchEngineRow extends AnimatedHeightLayout { 


        final int recycledSuggestionCount = mSuggestionView.getChildCount();

        final SharedPreferences prefs = GeckoSharedPrefs.forApp(getContext());

        final boolean savedSearchesEnabled = prefs.getBoolean(GeckoPreferences.PREFS_HISTORY_SAVED_SEARCH, true);

        final boolean savedSearchesEnabled = prefs.getBoolean(GeckoPreferences.PREFS_HISTORY_SAVED_SEARCH, false);



        // Remove duplicates of search engine suggestions from saved searches.

        List<String> searchHistorySuggestions = (rawSearchHistorySuggestions != null) ? rawSearchHistorySuggestions : new ArrayList<String>();

mobile/android/base/java/org/mozilla/gecko/toolbar/ToolbarEditLayout.java

+2 −2
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ public class ToolbarEditLayout extends ThemedLinearLayout { 
            return false;

        }

        return GeckoSharedPrefs.forApp(context)

                .getBoolean(GeckoPreferences.PREFS_VOICE_INPUT_ENABLED, true);

                .getBoolean(GeckoPreferences.PREFS_VOICE_INPUT_ENABLED, false);

    }



    private void launchVoiceRecognizer() {
@@ -315,7 +315,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() {

mobile/android/base/resources/values/arrays.xml

+12 −12
Original line number Diff line number Diff line
@@ -70,8 +70,8 @@ 
        <item>@string/history_title</item>

    </string-array>

    <string-array name="pref_import_android_defaults">

        <item>true</item>

        <item>true</item>

        <item>false</item>

        <item>false</item>

    </string-array>

    <string-array name="pref_import_android_values">

        <item>android_import.data.bookmarks</item>
@@ -126,16 +126,16 @@ 
        <item>private.data.passwords</item>

    </string-array>

    <string-array name="pref_clear_on_exit_defaults">

        <item>false</item>

        <item>false</item>

        <item>false</item>

        <item>false</item>

        <item>false</item>

        <item>false</item>

        <item>false</item>

        <item>false</item>

        <item>false</item>

        <item>false</item>

        <item>true</item>

        <item>true</item>

        <item>true</item>

        <item>true</item>

        <item>true</item>

        <item>true</item>

        <item>true</item>

        <item>true</item>

        <item>true</item>

        <item>true</item>

    </string-array>

    <string-array name="pref_restore_entries">

        <item>@string/pref_restore_always</item>