From 1e51bf48995005335a54eabe55f4b4439fefc85d Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Fri, 25 Aug 2017 17:19:31 -0400 Subject: [PATCH] extract event names // FREEBIE --- Signal/src/Profiles/OWSProfileManager.m | 16 ++++---- .../src/Util/OWSAnalyticsEvents.h | 16 ++++++++ .../src/Util/OWSAnalyticsEvents.m | 40 +++++++++++++++++++ 3 files changed, 64 insertions(+), 8 deletions(-) diff --git a/Signal/src/Profiles/OWSProfileManager.m b/Signal/src/Profiles/OWSProfileManager.m index 898eebef7..a3f304fbc 100644 --- a/Signal/src/Profiles/OWSProfileManager.m +++ b/Signal/src/Profiles/OWSProfileManager.m @@ -492,7 +492,7 @@ const NSUInteger kOWSProfileManager_MaxAvatarDiameter = 640; success:^(NSURLSessionDataTask *task, id formResponseObject) { if (![formResponseObject isKindOfClass:[NSDictionary class]]) { - OWSProdFail(@"profile_manager_error_avatar_upload_form_invalid_response"); + OWSProdFail([OWSAnalyticsEvents profileManagerErrorAvatarUploadFormInvalidResponse]); failureBlock(); return; } @@ -501,43 +501,43 @@ const NSUInteger kOWSProfileManager_MaxAvatarDiameter = 640; NSString *formAcl = responseMap[@"acl"]; if (![formAcl isKindOfClass:[NSString class]] || formAcl.length < 1) { - OWSProdFail(@"profile_manager_error_avatar_upload_form_invalid_acl"); + OWSProdFail([OWSAnalyticsEvents profileManagerErrorAvatarUploadFormInvalidAcl]); failureBlock(); return; } NSString *formKey = responseMap[@"key"]; if (![formKey isKindOfClass:[NSString class]] || formKey.length < 1) { - OWSProdFail(@"profile_manager_error_avatar_upload_form_invalid_key"); + OWSProdFail([OWSAnalyticsEvents profileManagerErrorAvatarUploadFormInvalidKey]); failureBlock(); return; } NSString *formPolicy = responseMap[@"policy"]; if (![formPolicy isKindOfClass:[NSString class]] || formPolicy.length < 1) { - OWSProdFail(@"profile_manager_error_avatar_upload_form_invalid_policy"); + OWSProdFail([OWSAnalyticsEvents profileManagerErrorAvatarUploadFormInvalidPolicy]); failureBlock(); return; } NSString *formAlgorithm = responseMap[@"algorithm"]; if (![formAlgorithm isKindOfClass:[NSString class]] || formAlgorithm.length < 1) { - OWSProdFail(@"profile_manager_error_avatar_upload_form_invalid_algorithm"); + OWSProdFail([OWSAnalyticsEvents profileManagerErrorAvatarUploadFormInvalidAlgorithm]); failureBlock(); return; } NSString *formCredential = responseMap[@"credential"]; if (![formCredential isKindOfClass:[NSString class]] || formCredential.length < 1) { - OWSProdFail(@"profile_manager_error_avatar_upload_form_invalid_credential"); + OWSProdFail([OWSAnalyticsEvents profileManagerErrorAvatarUploadFormInvalidCredential]); failureBlock(); return; } NSString *formDate = responseMap[@"date"]; if (![formDate isKindOfClass:[NSString class]] || formDate.length < 1) { - OWSProdFail(@"profile_manager_error_avatar_upload_form_invalid_date"); + OWSProdFail([OWSAnalyticsEvents profileManagerErrorAvatarUploadFormInvalidDate]); failureBlock(); return; } NSString *formSignature = responseMap[@"signature"]; if (![formSignature isKindOfClass:[NSString class]] || formSignature.length < 1) { - OWSProdFail(@"profile_manager_error_avatar_upload_form_invalid_signature"); + OWSProdFail([OWSAnalyticsEvents profileManagerErrorAvatarUploadFormInvalidSignature]); failureBlock(); return; } diff --git a/SignalServiceKit/src/Util/OWSAnalyticsEvents.h b/SignalServiceKit/src/Util/OWSAnalyticsEvents.h index a8b02e019..c331230f2 100755 --- a/SignalServiceKit/src/Util/OWSAnalyticsEvents.h +++ b/SignalServiceKit/src/Util/OWSAnalyticsEvents.h @@ -176,6 +176,22 @@ NS_ASSUME_NONNULL_BEGIN + (NSString *)prekeysDeletedOldUnacceptedSignedPrekey; ++ (NSString *)profileManagerErrorAvatarUploadFormInvalidAcl; + ++ (NSString *)profileManagerErrorAvatarUploadFormInvalidAlgorithm; + ++ (NSString *)profileManagerErrorAvatarUploadFormInvalidCredential; + ++ (NSString *)profileManagerErrorAvatarUploadFormInvalidDate; + ++ (NSString *)profileManagerErrorAvatarUploadFormInvalidKey; + ++ (NSString *)profileManagerErrorAvatarUploadFormInvalidPolicy; + ++ (NSString *)profileManagerErrorAvatarUploadFormInvalidResponse; + ++ (NSString *)profileManagerErrorAvatarUploadFormInvalidSignature; + + (NSString *)registrationBegan; + (NSString *)registrationRegisteredPhoneNumber; diff --git a/SignalServiceKit/src/Util/OWSAnalyticsEvents.m b/SignalServiceKit/src/Util/OWSAnalyticsEvents.m index 58900d877..2653b9a8b 100755 --- a/SignalServiceKit/src/Util/OWSAnalyticsEvents.m +++ b/SignalServiceKit/src/Util/OWSAnalyticsEvents.m @@ -422,6 +422,46 @@ NS_ASSUME_NONNULL_BEGIN return @"prekeys_deleted_old_unaccepted_signed_prekey"; } ++ (NSString *)profileManagerErrorAvatarUploadFormInvalidAcl +{ + return @"profile_manager_error_avatar_upload_form_invalid_acl"; +} + ++ (NSString *)profileManagerErrorAvatarUploadFormInvalidAlgorithm +{ + return @"profile_manager_error_avatar_upload_form_invalid_algorithm"; +} + ++ (NSString *)profileManagerErrorAvatarUploadFormInvalidCredential +{ + return @"profile_manager_error_avatar_upload_form_invalid_credential"; +} + ++ (NSString *)profileManagerErrorAvatarUploadFormInvalidDate +{ + return @"profile_manager_error_avatar_upload_form_invalid_date"; +} + ++ (NSString *)profileManagerErrorAvatarUploadFormInvalidKey +{ + return @"profile_manager_error_avatar_upload_form_invalid_key"; +} + ++ (NSString *)profileManagerErrorAvatarUploadFormInvalidPolicy +{ + return @"profile_manager_error_avatar_upload_form_invalid_policy"; +} + ++ (NSString *)profileManagerErrorAvatarUploadFormInvalidResponse +{ + return @"profile_manager_error_avatar_upload_form_invalid_response"; +} + ++ (NSString *)profileManagerErrorAvatarUploadFormInvalidSignature +{ + return @"profile_manager_error_avatar_upload_form_invalid_signature"; +} + + (NSString *)registrationBegan { return @"registration_began";