Fix crash on iPad when no conversations are loaded

vfa-thinhhq · Apr 21, 2015 · c37a46a · c37a46a
1 parent 7ba4ecd
commit c37a46a
Showing 1 changed file with 21 additions and 4 deletions.
diff --git a/ChatSecure/Classes/View Controllers/OTRMessagesViewController.m b/ChatSecure/Classes/View Controllers/OTRMessagesViewController.m
@@ -446,6 +446,9 @@ - (void)setupLockButton
 
 -(void)updateEncryptionState
 {
+    if (!self.account) {
+        return;
+    }
     [[OTRKit sharedInstance] checkIfGeneratingKeyForAccountName:self.account.username protocol:self.account.protocolTypeString completion:^(BOOL isGeneratingKey) {
         if( isGeneratingKey) {
             [self addLockSpinner];
@@ -1022,15 +1025,29 @@ - (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSe
 
 - (NSString *)senderDisplayName
 {
-    if ([self.account.displayName length]) {
-        return self.account.displayName;
+    NSString *senderDisplayName = nil;
+    if (self.account) {
+        if ([self.account.displayName length]) {
+            senderDisplayName = self.account.displayName;
+        } else {
+            senderDisplayName = self.account.username;
+        }
+    } else {
+        senderDisplayName = @"";
     }
-    return self.account.username;
+
+    return senderDisplayName;
 }
 
 - (NSString *)senderId
 {
-    return self.account.uniqueId;
+    NSString *senderId = nil;
+    if (self.account) {
+        senderId = self.account.uniqueId;
+    } else {
+        senderId = @"";
+    }
+    return senderId;
 }
 
 - (id<JSQMessageData>)collectionView:(JSQMessagesCollectionView *)collectionView messageDataForItemAtIndexPath:(NSIndexPath *)indexPath