Merge pull request #197 from gavia/bugfix

Merging some AddressBook related changes

Signal/src/phone/signaling/CallConnectUtil_Responder.m

@@ -40,7 +40,7 @@
                                                                                     untilCancelled:[callController untilCancelledToken]];
     
     return [futureSignalConnection thenTry:^id(HttpManager* httpManager) {
-        require([httpManager isKindOfClass:httpManager.class]);
+        require([httpManager isKindOfClass:HttpManager.class]);
         
         HttpResponse*(^serverRequestHandler)(HttpRequest*) = ^(HttpRequest* remoteRequest) {
             return [self respondToServerRequest:remoteRequest

Signal/src/phone/signaling/number directory/PhoneNumberDirectoryFilterManager.m

@@ -81,8 +81,11 @@
         BloomFilter* filter = [phoneNumberDirectoryFilter bloomFilter];
         NSDate* retryDate = [NSDate dateWithTimeInterval:DIRECTORY_UPDATE_RETRY_PERIOD
                                                sinceDate:[NSDate date]];
-        [PhoneNumberDirectoryFilter phoneNumberDirectoryFilterWithBloomFilter:filter
+        @synchronized(self) {
+            phoneNumberDirectoryFilter = [PhoneNumberDirectoryFilter phoneNumberDirectoryFilterWithBloomFilter:filter
                                                                                             andExpirationDate:retryDate];
+        }
+        
         [[NSNotificationCenter defaultCenter] postNotificationName:NOTIFICATION_DIRECTORY_FAILED object:nil];
     }];
 }