From 0a54bd7ba6c2dc04cdbbb9592bcaaffd037ff162 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Tue, 27 Feb 2018 00:00:31 -0500
Subject: [PATCH] disablebybydefault on ff and mas

---
 src/app/accounts/settings.component.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/app/accounts/settings.component.ts b/src/app/accounts/settings.component.ts
index 1c80495876..3e71f53c9c 100644
--- a/src/app/accounts/settings.component.ts
+++ b/src/app/accounts/settings.component.ts
@@ -49,8 +49,11 @@ export class SettingsComponent implements OnInit {
 
     async ngOnInit() {
         this.lockOption = await this.storageService.get<number>(ConstantsService.lockOptionKey);
-        this.disableGa = await this.storageService.get<boolean>(ConstantsService.disableGaKey);
         this.disableFavicons = await this.storageService.get<boolean>(ConstantsService.disableFaviconKey);
+
+        const disableGa = await this.storageService.get<boolean>(ConstantsService.disableGaKey);
+        const disableGaByDefault = this.platformUtilsService.isFirefox() || this.platformUtilsService.isMacAppStore();
+        this.disableGa = disableGa || (disableGa == null && disableGaByDefault);
     }
 
     async saveLockOption() {