Pods with warnings

FredericJacobs · Dec 8, 2014 · 6641c0c · 6641c0c
1 parent 0b6f683
commit 6641c0c
Show file tree

Hide file tree

Showing 35 changed files with 13,887 additions and 13,843 deletions.
diff --git a/JSQMessagesViewController/JSQMessagesViewController/Controllers/JSQMessagesViewController.m b/JSQMessagesViewController/JSQMessagesViewController/Controllers/JSQMessagesViewController.m
@@ -436,9 +436,9 @@ - (UICollectionViewCell *)collectionView:(JSQMessagesCollectionView *)collection
     NSParameterAssert(messageSenderId != nil);
 
     BOOL isOutgoingMessage = [messageSenderId isEqualToString:self.senderId];
-    BOOL isCall = [messageItem isKindOfClass:[JSQCall class]];
-    BOOL isInfoMessage = [messageItem isKindOfClass:[JSQInfoMessage class]];
-    BOOL isErrorMessage = isInfoMessage ? NO : [messageItem isKindOfClass:[JSQErrorMessage class]];
+    BOOL isCall = [messageItem messageType] == TSCallAdapter;
+    BOOL isInfoMessage = [messageItem messageType] == TSInfoMessageAdapter;
+    BOOL isErrorMessage = [messageItem messageType] == TSErrorMessageAdapter;
 
     BOOL isMediaMessage = NO;
 

diff --git a/...agesViewController/JSQMessagesViewController/Layout/JSQMessagesCollectionViewFlowLayout.m b/...agesViewController/JSQMessagesViewController/Layout/JSQMessagesCollectionViewFlowLayout.m
@@ -449,7 +449,7 @@ - (CGSize)messageBubbleSizeForItemAtIndexPath:(NSIndexPath *)indexPath
 
     CGSize finalSize = CGSizeZero;
 
-    if (![messageItem isKindOfClass:[JSQCall class]] && ![messageItem isKindOfClass:[JSQErrorMessage class]] && ![messageItem isKindOfClass:[JSQInfoMessage class]]) {
+    if (messageItem.messageType != TSCallAdapter && messageItem.messageType != TSErrorMessageAdapter && messageItem.messageType != TSInfoMessageAdapter) {
         if ([messageItem isMediaMessage]) {
             finalSize = [[messageItem media] mediaViewDisplaySize];
         }
@@ -484,7 +484,7 @@ - (CGSize)messageBubbleSizeForItemAtIndexPath:(NSIndexPath *)indexPath
             finalSize = CGSizeMake(finalWidth, stringSize.height + verticalInsets);
         }
     }
-    else if ([messageItem isKindOfClass:[JSQCall class]])
+    else if (messageItem.messageType == TSCallAdapter)
     {
         finalSize = CGSizeMake(kCallCellWidth, kCallCellHeight);
     } else {

diff --git a/JSQMessagesViewController/JSQMessagesViewController/Model/JSQCall.h b/JSQMessagesViewController/JSQMessagesViewController/Model/JSQCall.h
@@ -47,6 +47,11 @@ typedef enum : NSUInteger {
  */
 @property (nonatomic) CallStatus status;
 
+/*
+ * Returns message type for adapter
+ */
+@property (nonatomic) TSMessageAdapterType messageType;
+
 
 #pragma mark - Initialization 
 

diff --git a/JSQMessagesViewController/JSQMessagesViewController/Model/JSQCall.m b/JSQMessagesViewController/JSQMessagesViewController/Model/JSQCall.m
@@ -31,6 +31,8 @@ -(instancetype)initWithCallerId:(NSString *)senderId
         _date = [date copy];
         _duration = durationInSeconds;
         _status = status;
+        _messageType = TSCallAdapter;
+
     }
     return self;
 }

diff --git a/JSQMessagesViewController/JSQMessagesViewController/Model/JSQErrorMessage.h b/JSQMessagesViewController/JSQMessagesViewController/Model/JSQErrorMessage.h
@@ -22,6 +22,8 @@ typedef NS_ENUM(NSInteger, JSQErrorMessageType){
 
 @property (nonatomic) JSQErrorMessageType errorMessageType;
 
+@property (nonatomic) TSMessageAdapterType messageType;
+
 #pragma mark - Initialization
 
 - (instancetype)initWithErrorType:(JSQErrorMessageType)messageType

diff --git a/JSQMessagesViewController/JSQMessagesViewController/Model/JSQErrorMessage.m b/JSQMessagesViewController/JSQMessagesViewController/Model/JSQErrorMessage.m
@@ -19,6 +19,7 @@ - (instancetype)initWithErrorType:(JSQErrorMessageType)messageType
 
     if (self) {
         _errorMessageType = messageType;
+        _messageType = TSErrorMessageAdapter;
     }
 
     return self;
@@ -66,4 +67,9 @@ - (NSString*)description
             [self class], self.senderId, self.senderDisplayName, self.date, self.errorMessageType];
 }
 
+-(TSMessageAdapterType)messageType
+{
+    return TSErrorMessageAdapter;
+}
+
 @end
diff --git a/JSQMessagesViewController/JSQMessagesViewController/Model/JSQInfoMessage.h b/JSQMessagesViewController/JSQMessagesViewController/Model/JSQInfoMessage.h
@@ -16,6 +16,8 @@ typedef NS_ENUM(NSInteger, JSQInfoMessageType){
 
 @property (nonatomic) JSQInfoMessageType infoMessageType;
 
+@property (nonatomic) TSMessageAdapterType messageType;
+
 #pragma mark - Initialization
 
 - (instancetype)initWithInfoType:(JSQInfoMessageType)messageType
@@ -25,4 +27,5 @@ typedef NS_ENUM(NSInteger, JSQInfoMessageType){
 
 - (NSString*)text;
 
+
 @end
diff --git a/JSQMessagesViewController/JSQMessagesViewController/Model/JSQInfoMessage.m b/JSQMessagesViewController/JSQMessagesViewController/Model/JSQInfoMessage.m
@@ -21,6 +21,7 @@ - (instancetype)initWithInfoType:(JSQInfoMessageType)messageType
 
     if (self) {
         _infoMessageType = messageType;
+        _messageType = TSInfoMessageAdapter;
     }
 
     return self;

diff --git a/JSQMessagesViewController/JSQMessagesViewController/Model/JSQMessage.h b/JSQMessagesViewController/JSQMessagesViewController/Model/JSQMessage.h
@@ -75,6 +75,9 @@ typedef enum : NSUInteger {
 @property (copy, nonatomic, readonly) id<JSQMessageMediaData> media;
 
 
+@property (nonatomic) TSMessageAdapterType messageType;
+
+
 #pragma mark - Initialization
 
 /**

diff --git a/JSQMessagesViewController/JSQMessagesViewController/Model/JSQMessage.m b/JSQMessagesViewController/JSQMessagesViewController/Model/JSQMessage.m
@@ -97,6 +97,7 @@ - (instancetype)initWithSenderId:(NSString *)senderId
         _senderDisplayName = [senderDisplayName copy];
         _date = [date copy];
         _isMediaMessage = isMedia;
+        _messageType = TSGenericTextMessageAdapter;
     }
     return self;
 }

diff --git a/JSQMessagesViewController/JSQMessagesViewController/Model/JSQMessageData.h b/JSQMessagesViewController/JSQMessagesViewController/Model/JSQMessageData.h
@@ -20,6 +20,16 @@
 
 #import "JSQMessageMediaData.h"
 
+typedef NS_ENUM(NSInteger, TSMessageAdapterType) {
+    TSIncomingMessageAdapter,
+    TSOutgoingMessageAdapter,
+    TSCallAdapter,
+    TSInfoMessageAdapter,
+    TSErrorMessageAdapter,
+    TSMediaAttachmentAdapter,
+    TSGenericTextMessageAdapter,       //Used when message direction is unknown (outgoing or incoming)
+};
+
 /**
  *  The `JSQMessageData` protocol defines the common interface through which 
  *  a `JSQMessagesViewController` and `JSQMessagesCollectionView` interact with message model objects.
@@ -108,4 +118,14 @@
  */
 - (NSInteger) messageState;
 
+/*
+ * Returns the type of message. 
+ * Does not need to be implemented for JSQMessage, 
+ * only for children JSQOutgoingMessage or JSQIncomingMessage.
+ *
+ * @see TSMessageType
+ */
+
+- (TSMessageAdapterType) messageType;
+
 @end
diff --git a/JSQMessagesViewController/JSQMessagesViewController/Model/JSQPhotoMediaItem.m b/JSQMessagesViewController/JSQMessagesViewController/Model/JSQPhotoMediaItem.m
@@ -49,6 +49,7 @@ - (void)dealloc
     _cachedImageView = nil;
 }
 
+
 #pragma mark - Setters
 
 - (void)setImage:(UIImage *)image

diff --git a/Manifest.lock b/Manifest.lock
@@ -83,7 +83,7 @@ EXTERNAL SOURCES:
 
 CHECKOUT OPTIONS:
   JSQMessagesViewController:
-    :commit: 82482a1fc560fb4f716babbe49a20cf9c0bc7fc3
+    :commit: bc976a04d906ab3e5316148ee66de172a6e370b2
     :git: https://github.com/dtsbourg/JSQMessagesViewController
   SocketRocket:
     :commit: d0585af165