vaultwarden
/
Bitwarden-app-android-iphone-ios
mirror of https://github.com/bitwarden/mobile
1
0
Fork 0
Code Issues 2 Releases Wiki Activity

Remove userid from Ga service, not being used

This commit is contained in:
Kyle Spearrin 2017-04-19 21:05:03 -04:00
parent a960ccd786
commit 8e29a990cb
8 changed files with 5 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Android/Services/GoogleAnalyticsService.cs
View File

@ -9,8 +9,6 @@ namespace Bit.Android.Services
{
public class GoogleAnalyticsService : IGoogleAnalyticsService
{
private const string UserId = "&uid";
private readonly GoogleAnalytics _instance;
private readonly IAuthService _authService;
private readonly Tracker _tracker;
@ -33,16 +31,10 @@ namespace Bit.Android.Services
_tracker.EnableAutoActivityTracking(true);
_tracker.SetClientId(appIdService.AnonymousAppId);
var gaOptOut = settings.GetValueOrDefault(Constants.SettingGAOptOut, false);
var gaOptOut = settings.GetValueOrDefault(Constants.SettingGaOptOut, false);
SetAppOptOut(gaOptOut);
}
public void RefreshUserId()
{
_tracker.Set(UserId, null);
_setUserId = true;
}
public void TrackAppEvent(string eventName, string label = null)
{
TrackEvent("App", eventName, label);
@ -63,7 +55,6 @@ namespace Bit.Android.Services
builder.SetLabel(label);
}
SetUserId();
_tracker.Send(builder.Build());
}
@ -73,26 +64,15 @@ namespace Bit.Android.Services
builder.SetDescription(message);
builder.SetFatal(fatal);
SetUserId();
_tracker.Send(builder.Build());
}
public void TrackPage(string pageName)
{
SetUserId();
_tracker.SetScreenName(pageName);
_tracker.Send(new HitBuilders.ScreenViewBuilder().Build());
}
private void SetUserId()
{
if(_setUserId && _authService.IsAuthenticated)
{
_tracker.Set(UserId, _authService.UserId);
_setUserId = false;
}
}
public void Dispatch(Action completionHandler = null)
{
_instance.DispatchLocalHits();

1
src/App/Abstractions/Services/IGoogleAnalyticsService.cs
View File

@ -4,7 +4,6 @@ namespace Bit.App.Abstractions
{
public interface IGoogleAnalyticsService
{
void RefreshUserId();
void TrackPage(string pageName);
void TrackAppEvent(string eventName, string label = null);
void TrackExtensionEvent(string eventName, string label = null);

1
src/App/App.cs
View File

@ -226,7 +226,6 @@ namespace Bit.App
await Task.Run(() => deviceApiRepository.PutClearTokenAsync(appIdService.AppId)).ConfigureAwait(false);
_googleAnalyticsService.TrackAppEvent("LoggedOut");
_googleAnalyticsService.RefreshUserId();
Device.BeginInvokeOnMainThread(() => Current.MainPage = new ExtendedNavigationPage(new HomePage()));
if(!string.IsNullOrWhiteSpace(logoutMessage))

2
src/App/Constants.cs
View File

@ -7,7 +7,7 @@
public const string SettingFingerprintUnlockOn = "setting:fingerprintUnlockOn";
public const string SettingPinUnlockOn = "setting:pinUnlockOn";
public const string SettingLockSeconds = "setting:lockSeconds";
public const string SettingGAOptOut = "setting:googleAnalyticsOptOut";
public const string SettingGaOptOut = "setting:googleAnalyticsOptOut";
public const string PasswordGeneratorLength = "pwGenerator:length";
public const string PasswordGeneratorUppercase = "pwGenerator:uppercase";

1
src/App/Pages/LoginPage.cs
View File

@ -221,7 +221,6 @@ namespace Bit.App.Pages
_authService.UserId = _tokenService.TokenUserId;
_authService.Email = _tokenService.TokenEmail;
_settings.AddOrUpdateValue(Constants.LastLoginEmail, _authService.Email);
_googleAnalyticsService.RefreshUserId();
_googleAnalyticsService.TrackAppEvent("LoggedIn");
if(Device.OS == TargetPlatform.Android)

1
src/App/Pages/LoginTwoFactorPage.cs
View File

@ -183,7 +183,6 @@ namespace Bit.App.Pages
_authService.UserId = _tokenService.TokenUserId;
_authService.Email = _tokenService.TokenEmail;
_settings.AddOrUpdateValue(Constants.LastLoginEmail, _authService.Email);
_googleAnalyticsService.RefreshUserId();
_googleAnalyticsService.TrackAppEvent("LoggedIn From Two-step");
if(Device.OS == TargetPlatform.Android)

4
src/App/Pages/Settings/SettingsPage.cs
View File

@ -107,7 +107,7 @@ namespace Bit.App.Pages
AnalyticsCell = new ExtendedSwitchCell
{
Text = AppResources.DisableGA,
On = _settings.GetValueOrDefault(Constants.SettingGAOptOut, false)
On = _settings.GetValueOrDefault(Constants.SettingGaOptOut, false)
};
FoldersCell = new ExtendedTextCell
@ -429,7 +429,7 @@ namespace Bit.App.Pages
return;
}
_settings.AddOrUpdateValue(Constants.SettingGAOptOut, cell.On);
_settings.AddOrUpdateValue(Constants.SettingGaOptOut, cell.On);
_googleAnalyticsService.SetAppOptOut(cell.On);
}

21
src/iOS.Core/Services/GoogleAnalyticsService.cs
View File

@ -9,7 +9,6 @@ namespace Bit.iOS.Core.Services
{
private readonly ITracker _tracker;
private readonly IAuthService _authService;
private bool _setUserId = true;
public GoogleAnalyticsService(
IAppIdService appIdService,
@ -24,16 +23,10 @@ namespace Bit.iOS.Core.Services
_tracker.SetAllowIdfaCollection(true);
_tracker.Set(GaiConstants.ClientId, appIdService.AnonymousAppId);
var gaOptOut = settings.GetValueOrDefault(App.Constants.SettingGAOptOut, false);
var gaOptOut = settings.GetValueOrDefault(App.Constants.SettingGaOptOut, false);
SetAppOptOut(gaOptOut);
}
public void RefreshUserId()
{
_tracker.Set(GaiConstants.UserId, null);
_setUserId = true;
}
public void TrackAppEvent(string eventName, string label = null)
{
TrackEvent("App", eventName, label);
@ -46,7 +39,6 @@ namespace Bit.iOS.Core.Services
public void TrackEvent(string category, string eventName, string label = null)
{
SetUserId();
var dict = DictionaryBuilder.CreateEvent(category, eventName, label, null).Build();
_tracker.Send(dict);
Gai.SharedInstance.Dispatch();
@ -54,14 +46,12 @@ namespace Bit.iOS.Core.Services
public void TrackException(string message, bool fatal)
{
SetUserId();
var dict = DictionaryBuilder.CreateException(message, fatal).Build();
_tracker.Send(dict);
}
public void TrackPage(string pageName)
{
SetUserId();
_tracker.Set(GaiConstants.ScreenName, pageName);
var dict = DictionaryBuilder.CreateScreenView().Build();
_tracker.Send(dict);
@ -75,15 +65,6 @@ namespace Bit.iOS.Core.Services
});
}
private void SetUserId()
{
if(_setUserId && _authService.IsAuthenticated)
{
_tracker.Set(GaiConstants.UserId, _authService.UserId);
_setUserId = false;
}
}
public void SetAppOptOut(bool optOut)
{
Gai.SharedInstance.OptOut = optOut;