Fix some minor issues

chat-sdk · Dec 3, 2020 · 229bb1c · 229bb1c
1 parent 52e58a1
commit 229bb1c
Show file tree

Hide file tree

Showing 12 changed files with 82 additions and 106 deletions.
diff --git a/ChatSDK.podspec b/ChatSDK.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "ChatSDK"
-  s.version          = "4.15.8"
+  s.version          = "4.15.9"
   s.summary          = "Chat SDK - Mobile messaging framework for iOS"
   s.homepage         = "https://sdk.chat"
   s.license          = { :type => 'Chat SDK License', :file => 'LICENSE.md' }

diff --git a/ChatSDKCore/Classes/Interfaces/PStorageAdapter.h b/ChatSDKCore/Classes/Interfaces/PStorageAdapter.h
@@ -18,7 +18,6 @@
 #define bUserAccountEntity @"CDUserAccount"
 #define bMetaDataEntity @"CDMetaData"
 #define bUserConnectionEntity @"CDUserConnection"
-#define bGroupEntity @"CDGroup"
 
 #define bMessageOrderNewestFirst = 1;
 #define bMessageOrderOldestFirst = 2;

diff --git a/ChatSDKCoreData/Assets/ChatSDK.xcdatamodeld/.xccurrentversion b/ChatSDKCoreData/Assets/ChatSDK.xcdatamodeld/.xccurrentversion
@@ -3,6 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>_XCCurrentVersionName</key>
-	<string>DataModel v025.xcdatamodel</string>
+	<string>DataModel v026.xcdatamodel</string>
 </dict>
 </plist>
diff --git a/ChatSDKCoreData/Assets/ChatSDK.xcdatamodeld/DataModel v026.xcdatamodel/contents b/ChatSDKCoreData/Assets/ChatSDK.xcdatamodeld/DataModel v026.xcdatamodel/contents
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="17511" systemVersion="20B29" minimumToolsVersion="Xcode 9.0" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
+    <entity name="CDMessage" representedClassName="CDMessage" syncable="YES">
+        <attribute name="date" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="delivered" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="entityID" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="flagged" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="meta" optional="YES" attributeType="Transformable" valueTransformerName="NSSecureUnarchiveFromData" syncable="YES"/>
+        <attribute name="placeholder" optional="YES" attributeType="Binary" syncable="YES"/>
+        <attribute name="read" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="readStatus" optional="YES" attributeType="Transformable" valueTransformerName="NSSecureUnarchiveFromData" syncable="YES"/>
+        <attribute name="status" optional="YES" attributeType="Transformable" valueTransformerName="NSSecureUnarchiveFromData" syncable="YES"/>
+        <attribute name="type" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="userAccountID" optional="YES" attributeType="String" syncable="YES"/>
+        <relationship name="nextMessage" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="CDMessage" inverseName="previousMessage" inverseEntity="CDMessage" syncable="YES"/>
+        <relationship name="previousMessage" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="CDMessage" inverseName="nextMessage" inverseEntity="CDMessage" syncable="YES"/>
+        <relationship name="thread" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="CDThread" inverseName="messages" inverseEntity="CDThread" syncable="YES"/>
+        <relationship name="user" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="CDUser" inverseName="messages" inverseEntity="CDUser" syncable="YES"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="entityID"/>
+                <constraint value="userAccountID"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="CDThread" representedClassName="CDThread" syncable="YES">
+        <attribute name="creationDate" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="deletedDate" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="draft" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="entityID" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="meta" optional="YES" attributeType="Transformable" valueTransformerName="NSSecureUnarchiveFromData" syncable="YES"/>
+        <attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="type" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="userAccountID" optional="YES" attributeType="String" syncable="YES"/>
+        <relationship name="creator" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="CDUser" inverseName="threadsCreated" inverseEntity="CDUser" syncable="YES"/>
+        <relationship name="messages" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="CDMessage" inverseName="thread" inverseEntity="CDMessage" syncable="YES"/>
+        <relationship name="users" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="CDUser" inverseName="threads" inverseEntity="CDUser" syncable="YES"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="entityID"/>
+                <constraint value="userAccountID"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="CDUser" representedClassName="CDUser" syncable="YES">
+        <attribute name="entityID" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="image" optional="YES" attributeType="Binary" allowsExternalBinaryDataStorage="YES" syncable="YES"/>
+        <attribute name="lastOnline" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="meta" optional="YES" attributeType="Transformable" valueTransformerName="NSSecureUnarchiveFromData" syncable="YES"/>
+        <attribute name="online" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="userAccountID" optional="YES" attributeType="String" syncable="YES"/>
+        <relationship name="messages" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="CDMessage" inverseName="user" inverseEntity="CDMessage" syncable="YES"/>
+        <relationship name="threads" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="CDThread" inverseName="users" inverseEntity="CDThread" syncable="YES"/>
+        <relationship name="threadsCreated" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="CDThread" inverseName="creator" inverseEntity="CDThread" syncable="YES"/>
+        <relationship name="userConnections" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="CDUserConnection" inverseName="owner" inverseEntity="CDUserConnection" syncable="YES"/>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="entityID"/>
+                <constraint value="userAccountID"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="CDUserConnection" representedClassName="CDUserConnection" syncable="YES">
+        <attribute name="entityID" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="meta" optional="YES" attributeType="Transformable" valueTransformerName="NSSecureUnarchiveFromData" syncable="YES"/>
+        <attribute name="type" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="userAccountID" optional="YES" attributeType="String" syncable="YES"/>
+        <relationship name="owner" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="CDUser" inverseName="userConnections" inverseEntity="CDUser" syncable="YES"/>
+    </entity>
+    <elements>
+        <element name="CDMessage" positionX="-225" positionY="99" width="128" height="268"/>
+        <element name="CDThread" positionX="-309.0703125" positionY="-247.68359375" width="128" height="208"/>
+        <element name="CDUser" positionX="-671.1875" positionY="-230.85546875" width="128" height="193"/>
+        <element name="CDUserConnection" positionX="-945" positionY="-271" width="128" height="104"/>
+    </elements>
+</model>
diff --git a/ChatSDKCoreData/Classes/Entities/CDGroup+CoreDataProperties.h b/ChatSDKCoreData/Classes/Entities/CDGroup+CoreDataProperties.h
diff --git a/ChatSDKCoreData/Classes/Entities/CDGroup+CoreDataProperties.m b/ChatSDKCoreData/Classes/Entities/CDGroup+CoreDataProperties.m
diff --git a/ChatSDKCoreData/Classes/Entities/CDGroup.h b/ChatSDKCoreData/Classes/Entities/CDGroup.h
diff --git a/ChatSDKCoreData/Classes/Entities/CDGroup.m b/ChatSDKCoreData/Classes/Entities/CDGroup.m
diff --git a/ChatSDKCoreData/Classes/Entities/CDUserConnection+CoreDataProperties.h b/ChatSDKCoreData/Classes/Entities/CDUserConnection+CoreDataProperties.h
@@ -18,18 +18,13 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nullable, nonatomic, retain) NSString *entityID;
 @property (nullable, nonatomic, retain) id meta;
 @property (nullable, nonatomic, retain) NSNumber *type;
-@property (nullable, nonatomic, retain) NSSet<CDGroup *> *groups;
 @property (nullable, nonatomic, retain) CDUser *owner;
+@property (nullable, nonatomic, retain) NSString *userAccountID;
 
 @end
 
 @interface CDUserConnection (CoreDataGeneratedAccessors)
 
-- (void)addGroupsObject:(CDGroup *)value;
-- (void)removeGroupsObject:(CDGroup *)value;
-- (void)addGroups:(NSSet<CDGroup *> *)values;
-- (void)removeGroups:(NSSet<CDGroup *> *)values;
-
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/ChatSDKCoreData/Classes/Entities/CDUserConnection+CoreDataProperties.m b/ChatSDKCoreData/Classes/Entities/CDUserConnection+CoreDataProperties.m
@@ -16,7 +16,7 @@ @implementation CDUserConnection (CoreDataProperties)
 @dynamic entityID;
 @dynamic meta;
 @dynamic type;
-@dynamic groups;
 @dynamic owner;
+@dynamic userAccountID;
 
 @end
diff --git a/ChatSDKCoreData/Classes/Entities/CDUserConnection.h b/ChatSDKCoreData/Classes/Entities/CDUserConnection.h
@@ -10,7 +10,7 @@
 #import <CoreData/CoreData.h>
 #import <ChatSDK/PUserConnection.h>
 
-@class CDGroup, CDUser;
+@class CDUser;
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/ChatSDKFirebase.podspec b/ChatSDKFirebase.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "ChatSDKFirebase"
-  s.version          = "4.15.8"
+  s.version          = "4.15.9"
   s.summary          = "Chat SDK - Mobile messaging framework for iOS"
   s.homepage         = "https://sdk.chat"
   s.license          = { :type => 'Chat SDK License', :file => 'LICENSE.md' }