Merge pull request #344 from QuickBlox/development

Development

.gitignore

@@ -5,6 +5,9 @@ Q-municate/.idea/
 .DS_Store
 Q-municate/.DS_Store
 
+Pods/
+Q-municate/Pods/
+
 ## Standard Xcode.gitignore from https://github.com/github/gitignore/blob/master/Global/Xcode.gitignore
 build/
 *.pbxuser

External/Quickblox.framework/Headers/QBASession.h

@@ -5,8 +5,12 @@
 //  Copyright (c) 2017 QuickBlox. All rights reserved.
 //
 
-@import Foundation;
-#import <Quickblox/QBCEntity.h>
+#import <Foundation/Foundation.h>
+#if __has_include("QBCEntity.h")
+#import "QBCEntity.h"
+#else
+#import <QBCEntity.h>
+#endif
 
 
 NS_ASSUME_NONNULL_BEGIN

External/Quickblox.framework/Headers/QBAddressBookContact.h

@@ -5,7 +5,7 @@
 //  Copyright (c) 2017 QuickBlox. All rights reserved.
 //
 
-@import Foundation;
+#import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

External/Quickblox.framework/Headers/QBAddressBookRejectDetails.h

@@ -5,7 +5,7 @@
 //  Copyright (c) 2017 QuickBlox. All rights reserved.
 //
 
-@import Foundation;
+#import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

External/Quickblox.framework/Headers/QBAddressBookUpdates.h

@@ -5,7 +5,7 @@
 //  Copyright (c) 2017 QuickBlox. All rights reserved.
 //
 
-@import Foundation;
+#import <Foundation/Foundation.h>
 
 @class QBAddressBookRejectDetails;
 

External/Quickblox.framework/Headers/QBCBlob.h

@@ -5,111 +5,116 @@
 //  Copyright (c) 2017 QuickBlox. All rights reserved.
 //
 
-@import Foundation;
-#import <Quickblox/QBCEntity.h>
-#import <Quickblox/QBContentEnums.h>
+#import <Foundation/Foundation.h>
+#if __has_include("QBCEntity.h")
+#import "QBCEntity.h"
+#import "QBContentEnums.h"
+#else
+#import <QBCEntity.h>
+#import <QBContentEnums.h>
+#endif
 
 @class QBCBlobObjectAccess;
 
 NS_ASSUME_NONNULL_BEGIN
 
 /**
- *  QBCBlob class interface.
- *  This class represents File in Content module. Limitations: max size of file is 5368709120 bytes (5 GB).
+ QBCBlob class interface.
+ This class represents File in Content module. Limitations: max size of file is 100mb.
  */
 @interface QBCBlob : QBCEntity <NSCoding, NSCopying>
 
 /**
- *  Content type in mime format.
+ Content type in mime format.
  */
 @property (nonatomic, copy, nullable) NSString *contentType;
 
 /**
- *  File name.
+ File name.
  */
 @property (nonatomic, copy, nullable) NSString *name;
 
 /**
- *  Status of the File.
+ Status of the File.
  */
 @property (nonatomic, assign) QBCBlobStatus status;
 
 /**
- *  Date when the file upload has been completed.
+ Date when the file upload has been completed.
  */
 @property (nonatomic, strong, nullable) NSDate *completedAt;
 
 /**
- *  The size of file in bytes, readonly
+ The size of file in bytes, readonly
  */
 @property (nonatomic, assign) NSUInteger size;
 
 /**
- *  File unique identifier.
+ File unique identifier.
  */
 @property (nonatomic, copy, nullable) NSString *UID;
 
 /**
- *  Last read file time.
+ Last read file time.
  */
 @property (nonatomic, strong, nullable) NSDate *lastReadAccessTs;
 
 /**
- *  An instance of BlobObjectAccess.
+ An instance of BlobObjectAccess.
  */
 @property (nonatomic, strong, nullable) QBCBlobObjectAccess *blobObjectAccess;
 
 /**
- *  Coma separated string with file's tags.
+ Coma separated string with file's tags.
  */
 @property (nonatomic, copy, nullable) NSString *tags;
 
 /**
- *  File's visibility.
+ File's visibility.
  */
 @property (nonatomic, assign) BOOL isPublic;
 
 /**
- *  Set as YES if you want to update blob's file.
+ Set as YES if you want to update blob's file.
  */
 @property (nonatomic, assign) BOOL isNew;
 
 /**
- *  Create new blob.
- *
- *  @return New QBCBlob instance
+ Create new blob.
+ 
+ @return New QBCBlob instance
  */
 + (QBCBlob *)blob;
 
 /**
- *  Get file's public url (available within Internet), if blob is public.
- *
- *  @return Public url for file
+ Get file's public url (available within Internet), if blob is public.
+ 
+ @return Public url for file
  */
 - (nullable NSString *)publicUrl;
 
 /**
- *  Get file's public url (available within Internet), if blob is public.
- *
- *  @param fileUID File unique identifier
- *
- *  @return Public url to file
+ Get file's public url (available within Internet), if blob is public.
+ 
+ @param fileUID File unique identifier
+ 
+ @return Public url to file
  */
 + (nullable NSString *)publicUrlForFileUID:(NSString *)fileUID;
 
 /**
- *  Get file's private url (available only with QuickBlox token), if blob is private.
- *
- *  @return Private url for file
+ Get file's private url (available only with QuickBlox token), if blob is private.
+ 
+ @return Private url for file
  */
 - (nullable NSString *)privateUrl;
 
 /**
- *  Get file's private url (available only with QuickBlox token), if blob is private.
- *
- *  @param fileUID File unique identifier
- *
- *  @return Private url to file
+ Get file's private url (available only with QuickBlox token), if blob is private.
+
+ @param fileUID File unique identifier
+ 
+ @return Private url to file
  */
 + (nullable NSString *)privateUrlForFileUID:(NSString *)fileUID;
 

External/Quickblox.framework/Headers/QBCBlobObjectAccess.h

@@ -4,9 +4,14 @@
 //  Created by QuickBlox team
 //  Copyright (c) 2017 QuickBlox. All rights reserved.
 //
-@import Foundation;
-#import <Quickblox/QBCEntity.h>
-#import <Quickblox/QBContentEnums.h>
+#import <Foundation/Foundation.h>
+#if __has_include("QBCEntity.h")
+#import "QBCEntity.h"
+#import "QBContentEnums.h"
+#else
+#import <QBCEntity.h>
+#import <QBContentEnums.h>
+#endif
 
 /**
  *  QBCBlobObjectAccess class interface.

External/Quickblox.framework/Headers/QBCEntity.h

@@ -5,7 +5,7 @@
 //  Copyright (c) 2017 QuickBlox. All rights reserved.
 //
 
-@import Foundation;
+#import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
 /** 

External/Quickblox.framework/Headers/QBCOCustomObject.h

@@ -5,7 +5,7 @@
 //  Copyright (c) 2017 QuickBlox. All rights reserved.
 //
 
-@import Foundation;
+#import <Foundation/Foundation.h>
 
 @class QBCOPermissions;
 

External/Quickblox.framework/Headers/QBCOFile.h

@@ -5,31 +5,36 @@
 //  Copyright (c) 2017 QuickBlox. All rights reserved.
 //
 
-@import Foundation;
+#import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
 @interface QBCOFile : NSObject <NSCoding, NSCopying>
 
 /** 
- *  File name.
+ The name of the file .
  */
 @property (nonatomic, copy, nullable) NSString *name;
 
 /**
- *  File content type.
+ The content type of the file.
  */
 @property (nonatomic, copy, nullable) NSString *contentType;
 
 /**
- *  File data.
+ The data of the file.
  */
 @property (nonatomic, strong, nullable) NSData *data;
 
+/**
+ The Local url of the file.
+ */
+@property (nonatomic, strong, nullable) NSURL *fileURL;
+
 /** 
- *  Create file object.
- *
- *  @return New instance of QBCOFile
+ Create file object.
+ 
+ @return New instance of `QBCOFile`
  */
 + (instancetype)file;
 

External/Quickblox.framework/Headers/QBCOFileUploadInfo.h

@@ -5,7 +5,7 @@
 //  Copyright (c) 2017 QuickBlox. All rights reserved.
 //
 
-@import Foundation.NSObject;
+#import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

External/Quickblox.framework/Headers/QBCOPermissions.h

@@ -5,8 +5,8 @@
 //  Copyright (c) 2017 QuickBlox. All rights reserved.
 //
 
-@import Foundation;
-#import <Quickblox/QBCustomObjectsEnums.h>
+#import <Foundation/Foundation.h>
+#import "QBCustomObjectsEnums.h"
 
 NS_ASSUME_NONNULL_BEGIN