Fixing crash on responding to phone call.

signalapp · Jun 19, 2015 · 2fc2070 · 2fc2070 · WhisperBTC · Jun 19, 2015
1 parent 7acd8ff
commit 2fc2070
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 6 deletions.
diff --git a/Signal/src/contact/ContactsManager.m b/Signal/src/contact/ContactsManager.m
@@ -222,7 +222,7 @@ - (Contact *)contactForRecord:(ABRecordRef)record {
 }
 
 -(Contact*)latestContactForPhoneNumber:(PhoneNumber *)phoneNumber {
-    NSArray *allContacts = latestContactsById.allValues;
+    NSArray *allContacts = [self allContacts];
 
     ContactSearchBlock searchBlock = ^BOOL(Contact *contact, NSUInteger idx, BOOL *stop) {
         for (PhoneNumber *number in contact.parsedPhoneNumbers) {
@@ -336,7 +336,17 @@ -(Contact *)latestContactWithRecordId:(ABRecordID)recordId {
 }
 
 - (NSArray*)allContacts {
-    return [latestContactsById allValues];
+    NSMutableArray *allContacts = [NSMutableArray array];
+
+    for (NSString *key in latestContactsById.allKeys){
+        Contact *contact = [latestContactsById objectForKey:key];
+
+        if ([contact isKindOfClass:[Contact class]]) {
+            [allContacts addObject:contact];
+        }
+    }
+    return allContacts;
+
 }
 
 - (NSArray*)recordsForContacts:(NSArray*) contacts{

diff --git a/Signal/src/phone/signaling/SignalUtil.m b/Signal/src/phone/signaling/SignalUtil.m
@@ -32,15 +32,27 @@ -(bool) isKeepAlive {
 }
 
 -(bool) isRingingForSession:(int64_t)targetSessionId {
-    return [self.method isEqualToString:@"RING"] && [@(targetSessionId) isEqualToNumber:self.tryGetSessionId];
+    NSNumber *sessionId = self.tryGetSessionId;
+    BOOL isMethod  = [self.method isEqualToString:@"RING"];
+    BOOL isSession = sessionId?[@(targetSessionId) isEqualToNumber:sessionId]:NO;
+
+    return isMethod&&isSession;
 }
 
 -(bool) isHangupForSession:(int64_t)targetSessionId {
-    return [self.method isEqualToString:@"DELETE"] && self.tryGetSessionId?[@(targetSessionId) isEqualToNumber:self.tryGetSessionId]:NO;
+    NSNumber *sessionId = self.tryGetSessionId;
+    BOOL isMethod  = [self.method isEqualToString:@"DELETE"];
+    BOOL isSession = sessionId?[@(targetSessionId) isEqualToNumber:sessionId]:NO;
+
+    return isMethod&&isSession;
 }
 
 -(bool) isBusyForSession:(int64_t)targetSessionId {
-    return [self.method isEqualToString:@"BUSY"] && [@(targetSessionId) isEqualToNumber:self.tryGetSessionId];
+    NSNumber *sessionId = self.tryGetSessionId;
+    BOOL isMethod  = [self.method isEqualToString:@"BUSY"];
+    BOOL isSession = sessionId?[@(targetSessionId) isEqualToNumber:sessionId]:NO;
+
+    return isMethod&&isSession;
 }
 
 +(HttpRequest*) httpRequestToOpenPortWithSessionId:(int64_t)sessionId {

diff --git a/Signal/src/textsecure/Messages/TSMessagesManager.m b/Signal/src/textsecure/Messages/TSMessagesManager.m
@@ -430,7 +430,9 @@ - (void)notifyUserForCall:(TSCall*)call inThread:(TSThread*)thread {
         TSContactThread *cThread = (TSContactThread*)thread;
 
         if (call.callType == RPRecentCallTypeMissed) {
-            [[UIApplication sharedApplication] cancelLocalNotification:notif];
+            if (notif) {
+                [[UIApplication sharedApplication] cancelLocalNotification:notif];
+            }
 
             UILocalNotification *notification = [[UILocalNotification alloc] init];
             notification.category   = Signal_CallBack_Category;

diff --git a/Signal/src/view controllers/MessagesViewController.m b/Signal/src/view controllers/MessagesViewController.m
@@ -796,6 +796,11 @@ -(NSAttributedString*)collectionView:(JSQMessagesCollectionView *)collectionView
         if([self.thread isKindOfClass:[TSGroupThread class]]) {
             NSString *name = [[Environment getCurrent].contactsManager nameStringForPhoneIdentifier:msg.senderId];
             name = name ? name : msg.senderId;
+
+            if (!name) {
+                name = @"";
+            }
+
             NSMutableAttributedString *attrStr = [[NSMutableAttributedString alloc]initWithString:name];
             [attrStr appendAttributedString:[NSAttributedString attributedStringWithAttachment:textAttachment]];