From 8374ca149eabe5d87cf3dd5692c6314dfb2e103f Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Fri, 31 Mar 2017 18:45:51 -0400
Subject: [PATCH] Apply assert to ensure singletons are only created once.

// FREEBIE
---
 Signal/src/contact/OWSContactsManager.m          |  2 ++
 Signal/src/environment/Environment.m             |  2 ++
 Signal/src/environment/NotificationsManager.m    |  2 ++
 Signal/src/environment/PropertyListPreferences.m | 12 ++++++++++++
 Signal/src/util/Pastelog.m                       |  2 ++
 5 files changed, 20 insertions(+)

diff --git a/Signal/src/contact/OWSContactsManager.m b/Signal/src/contact/OWSContactsManager.m
index 8001c7f84..ce7c32f86 100644
--- a/Signal/src/contact/OWSContactsManager.m
+++ b/Signal/src/contact/OWSContactsManager.m
@@ -41,6 +41,8 @@ NSString *const OWSContactsManagerSignalRecipientsDidChangeNotification =
     _latestContactsById = @{};
     _avatarCache = [NSCache new];
 
+    OWSSingletonAssert();
+
     return self;
 }
 
diff --git a/Signal/src/environment/Environment.m b/Signal/src/environment/Environment.m
index 76da3d1b1..a2f3d474c 100644
--- a/Signal/src/environment/Environment.m
+++ b/Signal/src/environment/Environment.m
@@ -52,6 +52,8 @@ static Environment *environment = nil;
     _networkManager = networkManager;
     _messageSender = messageSender;
 
+    OWSSingletonAssert();
+
     return self;
 }
 
diff --git a/Signal/src/environment/NotificationsManager.m b/Signal/src/environment/NotificationsManager.m
index 038d6a051..bf8edcb27 100644
--- a/Signal/src/environment/NotificationsManager.m
+++ b/Signal/src/environment/NotificationsManager.m
@@ -37,6 +37,8 @@
     NSURL *newMessageURL = [[NSBundle mainBundle] URLForResource:@"NewMessage" withExtension:@"aifc"];
     AudioServicesCreateSystemSoundID((__bridge CFURLRef)newMessageURL, &_newMessageSound);
 
+    OWSSingletonAssert();
+
     return self;
 }
 
diff --git a/Signal/src/environment/PropertyListPreferences.m b/Signal/src/environment/PropertyListPreferences.m
index e2f628bc7..7f65b46ec 100644
--- a/Signal/src/environment/PropertyListPreferences.m
+++ b/Signal/src/environment/PropertyListPreferences.m
@@ -29,6 +29,18 @@ NSString *const PropertyListPreferencesKeyHasDeclinedNoContactsView = @"hasDecli
 
 @implementation PropertyListPreferences
 
+- (instancetype)init
+{
+    self = [super init];
+    if (!self) {
+        return self;
+    }
+
+    OWSSingletonAssert();
+
+    return self;
+}
+
 #pragma mark - Helpers
 
 - (void)clear {
diff --git a/Signal/src/util/Pastelog.m b/Signal/src/util/Pastelog.m
index f8a990256..c5bbb53cf 100644
--- a/Signal/src/util/Pastelog.m
+++ b/Signal/src/util/Pastelog.m
@@ -103,6 +103,8 @@
 -(instancetype)init {
     if (self = [super init]) {
         self.responseData = [NSMutableData data];
+
+        OWSSingletonAssert();
     }
     return self;
 }