From f459c9ce6d350ca4173867da6d4b4ce5c2d02308 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 6 Mar 2018 13:57:59 -0500 Subject: [PATCH] CR: rename SignalClassic constant // FREEBIE --- SignalMessaging/environment/OWSSounds.h | 2 +- SignalMessaging/environment/OWSSounds.m | 6 +++--- SignalMessaging/environment/migrations/OWS107LegacySounds.m | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/SignalMessaging/environment/OWSSounds.h b/SignalMessaging/environment/OWSSounds.h index 99d40ccfc..506560d13 100644 --- a/SignalMessaging/environment/OWSSounds.h +++ b/SignalMessaging/environment/OWSSounds.h @@ -20,7 +20,7 @@ typedef NS_ENUM(NSUInteger, OWSSound) { OWSSound_Popcorn, OWSSound_Pulse, OWSSound_Synth, - OWSSound_ClassicNotification, + OWSSound_SignalClassic, // Ringtone Sounds OWSSound_Opening, diff --git a/SignalMessaging/environment/OWSSounds.m b/SignalMessaging/environment/OWSSounds.m index a29b16c77..0c7e29ba4 100644 --- a/SignalMessaging/environment/OWSSounds.m +++ b/SignalMessaging/environment/OWSSounds.m @@ -74,7 +74,7 @@ NSString *const kOWSSoundsStorageGlobalNotificationKey = @"kOWSSoundsStorageGlob @(OWSSound_Keys), @(OWSSound_Popcorn), @(OWSSound_Pulse), - @(OWSSound_ClassicNotification), + @(OWSSound_SignalClassic), @(OWSSound_Synth), ]; } @@ -112,7 +112,7 @@ NSString *const kOWSSoundsStorageGlobalNotificationKey = @"kOWSSoundsStorageGlob return @"Pulse"; case OWSSound_Synth: return @"Synth"; - case OWSSound_ClassicNotification: + case OWSSound_SignalClassic: return @"Signal Classic"; // Call Audio @@ -172,7 +172,7 @@ NSString *const kOWSSoundsStorageGlobalNotificationKey = @"kOWSSoundsStorageGlob return (quiet ? @"pulse-quiet.aifc" : @"pulse.aifc"); case OWSSound_Synth: return (quiet ? @"synth-quiet.aifc" : @"synth.aifc"); - case OWSSound_ClassicNotification: + case OWSSound_SignalClassic: return (quiet ? @"classic-quiet.aifc" : @"classic.aifc"); // Ringtone Sounds diff --git a/SignalMessaging/environment/migrations/OWS107LegacySounds.m b/SignalMessaging/environment/migrations/OWS107LegacySounds.m index 2c3214edb..20cb6c48a 100644 --- a/SignalMessaging/environment/migrations/OWS107LegacySounds.m +++ b/SignalMessaging/environment/migrations/OWS107LegacySounds.m @@ -22,7 +22,7 @@ static NSString *const OWS107LegacySoundsMigrationId = @"107"; { OWSAssert(transaction); - [OWSSounds setGlobalNotificationSound:OWSSound_ClassicNotification transaction:transaction]; + [OWSSounds setGlobalNotificationSound:OWSSound_SignalClassic transaction:transaction]; } @end