Commit 2a27a97f authored by Amogh Pradeep's avatar Amogh Pradeep Committed by Matthew Finkel
Browse files

Bug 25741 - TBA: Remove sync option from preferences 



We don't want this while the Sync subsystem is a proxy-bypass risk. We
can drop this when the feature is patched (Bug 1314778).

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

Also:
Bug 28507 - Don't call Push and Sync services during Sanitize
Bug 30086 - Prevent Sync-related crashes on Android
Bug 25741 - TBA: Only include Firefox Account permissions if we want them (using MOZ_ACCOUNT)
Bug 25741 - TBA: Neuter Firefox Accounts
parent f1326cca

mobile/android/app/src/main/res/xml/preferences.xml

+0 −6
Original line number Diff line number Diff line
@@ -9,12 +9,6 @@ 
                  xmlns:gecko="http://schemas.android.com/apk/res-auto"

                  android:enabled="false">



    <org.mozilla.gecko.preferences.SyncPreference android:key="android.not_a_preference.sync"

                                                  android:title="@string/pref_sync"

                                                  android:icon="@drawable/sync_avatar_default"

                                                  android:summary="@string/pref_sync_summary"

                                                  android:persistent="false" />



    <org.mozilla.gecko.preferences.DefaultBrowserPreference

            android:key="android.not_a_preference.default_browser.link"

            android:persistent="false"

mobile/android/base/AndroidManifest.xml.in

+4 −0
Original line number Diff line number Diff line
@@ -296,7 +296,9 @@ 
            </intent-filter>

        </receiver>



#ifdef MOZ_ACCOUNT

#include ../services/manifests/FxAccountAndroidManifest_activities.xml.in

#endif



#ifdef MOZ_CRASHREPORTER

        <activity android:name="org.mozilla.gecko.CrashReporterActivity"
@@ -475,7 +477,9 @@ 
            </intent-filter>

        </service>



#ifdef MOZ_ACCOUNT

#include ../services/manifests/FxAccountAndroidManifest_services.xml.in

#endif



        <service

            android:name="org.mozilla.gecko.tabqueue.TabReceivedService"

mobile/android/base/FennecManifest_permissions.xml.in

+2 −0
Original line number Diff line number Diff line 


#ifdef MOZ_ACCOUNT

#include ../services/manifests/FxAccountAndroidManifest_permissions.xml.in

#endif



<!-- Bug 1261302: we have two new permissions to request,

     RECEIVE_BOOT_COMPLETED and the permission for push.  We want to ask for

mobile/android/base/java/org/mozilla/gecko/BrowserApp.java

+0 −8
Original line number Diff line number Diff line
@@ -303,8 +303,6 @@ public class BrowserApp extends GeckoApp 


    private ReadingListHelper mReadingListHelper;



    private AccountsHelper mAccountsHelper;



    private ExtensionPermissionsHelper mExtensionPermissionsHelper;



    // The tab to be selected on editing mode exit.
@@ -843,7 +841,6 @@ public class BrowserApp extends GeckoApp 


        mSharedPreferencesHelper = new SharedPreferencesHelper(appContext);

        mReadingListHelper = new ReadingListHelper(appContext, profile);

        mAccountsHelper = new AccountsHelper(appContext, profile);

        mExtensionPermissionsHelper = new ExtensionPermissionsHelper(this);



        if (AppConstants.MOZ_ANDROID_BEAM) {
@@ -1545,11 +1542,6 @@ public class BrowserApp extends GeckoApp 
            mReadingListHelper = null;

        }



        if (mAccountsHelper != null) {

            mAccountsHelper.uninit();

            mAccountsHelper = null;

        }



        if (mExtensionPermissionsHelper != null) {

            mExtensionPermissionsHelper.uninit();

            mExtensionPermissionsHelper = null;

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

+10 −4
Original line number Diff line number Diff line
@@ -250,10 +250,16 @@ public class CombinedHistoryPanel extends HomeFragment implements RemoteClientsD 
        syncSetupButton.setOnClickListener(new View.OnClickListener() {

            @Override

            public void onClick(View view) {

                Telemetry.sendUIEvent(TelemetryContract.Event.ACTION, TelemetryContract.Method.BUTTON, "history_syncsetup");

                // This Activity will redirect to the correct Activity as needed.

                final Intent intent = new Intent(FxAccountConstants.ACTION_FXA_GET_STARTED);

                startActivity(intent);

                // Tell the user this action is not supported

                final AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(getActivity());

                dialogBuilder.setMessage(R.string.sync_not_supported);

                dialogBuilder.setNegativeButton(R.string.button_cancel, new AlertDialog.OnClickListener() {

                    @Override

                    public void onClick(final DialogInterface dialog, final int which) {

                        dialog.dismiss();

                    }

                });

                dialogBuilder.show();

            }

        });