[tor-commits] [tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 25741 - TBA: Move GCM Push prefs within preprocessor guard

[gk at torproject.org]

commit 75c6114151ff3f97595c51e75e07413d06da336a
Author: Matthew Finkel <Matthew.Finkel at gmail.com>
Date:   Sun Apr 15 14:19:38 2018 +0000

    Bug 25741 - TBA: Move GCM Push prefs within preprocessor guard
    
    Otherwise the preprocessor is sad because MOZ_ANDROID_GCM_SENDERID is
    not defined. We don't need any of this, so we exclude it.
---
 mobile/android/app/mobile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js
index a737a1bda4ce..a11e1b033396 100644
--- a/mobile/android/app/mobile.js
+++ b/mobile/android/app/mobile.js
@@ -859,13 +859,13 @@ pref("dom.serviceWorkers.interception.enabled", true);
 // click on mobile.  This is to account for some devices being quite slow.
 pref("dom.serviceWorkers.disable_open_click_delay", 5000);
 
+#ifdef MOZ_ANDROID_GCM
 pref("dom.push.debug", false);
 // The upstream autopush endpoint must have the Google API key corresponding to
 // the App's sender ID; we bake this assumption directly into the URL.
 pref("dom.push.serverURL", "https://updates.push.services.mozilla.com/v1/gcm/@MOZ_ANDROID_GCM_SENDERID@");
 pref("dom.push.maxRecentMessageIDsPerSubscription", 0);
 
-#ifdef MOZ_ANDROID_GCM
 pref("dom.push.enabled", true);
 #endif