signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Respond to CR.

Browse Source
This commit is contained in:
Matthew Chen 2019-04-16 13:04:17 -04:00
parent 230d10efa0
commit 041d838bcd
4 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Scripts/sds_codegen/sds_codegen.sh
View File

@ -25,24 +25,22 @@ REPO_ROOT=`git rev-parse --show-toplevel`
# and generates fake Obj-c headers (.h) that @interface and @protocol
# stubs for each swift class. This is analogous to a very simplified
# version of the "-Swift.h" files used by Swift for bridging.
# $REPO_ROOT/Scripts/sds_codegen/sds_parse_swift_bridging.py --src-path . --swift-bridging-path $REPO_ROOT/Scripts/sds_codegen/sds-includes
$REPO_ROOT/Scripts/sds_codegen/sds_parse_swift_bridging.py --src-path . --swift-bridging-path $REPO_ROOT/Scripts/sds_codegen/sds-includes
# # We parse Obj-C source files (.m only, not .mm yet) to extract simple class descriptions (class name, base class, property names and types, etc.)
# #
# # Common
# $REPO_ROOT/Scripts/sds_codegen/sds_parse_objc.py --src-path SignalServiceKit/src/Storage/TSYapDatabaseObject.m --swift-bridging-path $REPO_ROOT/Scripts/sds_codegen/sds-includes
# We parse Obj-C source files (.m only, not .mm yet) to extract simple class descriptions (class name, base class, property names and types, etc.)
#
# # Threads
# $REPO_ROOT/Scripts/sds_codegen/sds_parse_objc.py --src-path SignalServiceKit/src/Contacts/TSThread.m --swift-bridging-path $REPO_ROOT/Scripts/sds_codegen/sds-includes
# $REPO_ROOT/Scripts/sds_codegen/sds_parse_objc.py --src-path SignalServiceKit/src/Contacts/Threads/TSContactThread.m --swift-bridging-path $REPO_ROOT/Scripts/sds_codegen/sds-includes
# $REPO_ROOT/Scripts/sds_codegen/sds_parse_objc.py --src-path SignalServiceKit/src/Contacts/Threads/TSGroupThread.m --swift-bridging-path $REPO_ROOT/Scripts/sds_codegen/sds-includes
#
# # Interactions
# $REPO_ROOT/Scripts/sds_codegen/sds_parse_objc.py --src-path Signal/src/ViewControllers/ConversationView/TypingIndicatorInteraction.swift --swift-bridging-path $REPO_ROOT/Scripts/sds_codegen/sds-includes
# $REPO_ROOT/Scripts/sds_codegen/sds_parse_objc.py --src-path SignalServiceKit/src/Messages --swift-bridging-path $REPO_ROOT/Scripts/sds_codegen/sds-includes
# Common
$REPO_ROOT/Scripts/sds_codegen/sds_parse_objc.py --src-path SignalServiceKit/src/Storage/TSYapDatabaseObject.m --swift-bridging-path $REPO_ROOT/Scripts/sds_codegen/sds-includes
# $REPO_ROOT/Scripts/sds_codegen/sds_parse_objc.py --src-path ./SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSyncMessage.m --swift-bridging-path $REPO_ROOT/Scripts/sds_codegen/sds-includes
# Threads
$REPO_ROOT/Scripts/sds_codegen/sds_parse_objc.py --src-path SignalServiceKit/src/Contacts/TSThread.m --swift-bridging-path $REPO_ROOT/Scripts/sds_codegen/sds-includes
$REPO_ROOT/Scripts/sds_codegen/sds_parse_objc.py --src-path SignalServiceKit/src/Contacts/Threads/TSContactThread.m --swift-bridging-path $REPO_ROOT/Scripts/sds_codegen/sds-includes
$REPO_ROOT/Scripts/sds_codegen/sds_parse_objc.py --src-path SignalServiceKit/src/Contacts/Threads/TSGroupThread.m --swift-bridging-path $REPO_ROOT/Scripts/sds_codegen/sds-includes
# Interactions
$REPO_ROOT/Scripts/sds_codegen/sds_parse_objc.py --src-path Signal/src/ViewControllers/ConversationView/TypingIndicatorInteraction.swift --swift-bridging-path $REPO_ROOT/Scripts/sds_codegen/sds-includes
$REPO_ROOT/Scripts/sds_codegen/sds_parse_objc.py --src-path SignalServiceKit/src/Messages --swift-bridging-path $REPO_ROOT/Scripts/sds_codegen/sds-includes
# We parse Swift source files to extract simple class descriptions (class name, base class, property names and types, etc.)
#

1
Scripts/sds_codegen/sds_generate.py
View File

@ -890,6 +890,7 @@ class %sSerializer: SDSSerializer {
swift_body = sds_common.clean_up_generated_swift(swift_body)
# Add some random whitespace to trigger the auto-formatter.
swift_body = swift_body + (' ' * random.randint(1, 100))
with open(swift_filepath, 'wt') as f:

14
SignalServiceKit/src/Messages/TSCall.h
View File

@ -35,13 +35,13 @@ NSString *NSStringFromCallType(RPRecentCallType callType);
inThread:(TSContactThread *)thread NS_DESIGNATED_INITIALIZER;
- (instancetype)initWithUniqueId:(NSString *)uniqueId
receivedAtTimestamp:(uint64_t)receivedAtTimestamp
sortId:(uint64_t)sortId
timestamp:(uint64_t)timestamp
uniqueThreadId:(NSString *)uniqueThreadId
callSchemaVersion:(NSUInteger)callSchemaVersion
callType:(RPRecentCallType)callType
read:(BOOL)read NS_DESIGNATED_INITIALIZER;
receivedAtTimestamp:(uint64_t)receivedAtTimestamp
sortId:(uint64_t)sortId
timestamp:(uint64_t)timestamp
uniqueThreadId:(NSString *)uniqueThreadId
callSchemaVersion:(NSUInteger)callSchemaVersion
callType:(RPRecentCallType)callType
read:(BOOL)read NS_DESIGNATED_INITIALIZER;
- (instancetype)initWithCoder:(NSCoder *)coder NS_DESIGNATED_INITIALIZER;

14
SignalServiceKit/src/Messages/TSCall.m
View File

@ -72,13 +72,13 @@ NSUInteger TSCallCurrentSchemaVersion = 1;
}
- (instancetype)initWithUniqueId:(NSString *)uniqueId
receivedAtTimestamp:(uint64_t)receivedAtTimestamp
sortId:(uint64_t)sortId
timestamp:(uint64_t)timestamp
uniqueThreadId:(NSString *)uniqueThreadId
callSchemaVersion:(NSUInteger)callSchemaVersion
callType:(RPRecentCallType)callType
read:(BOOL)read
receivedAtTimestamp:(uint64_t)receivedAtTimestamp
sortId:(uint64_t)sortId
timestamp:(uint64_t)timestamp
uniqueThreadId:(NSString *)uniqueThreadId
callSchemaVersion:(NSUInteger)callSchemaVersion
callType:(RPRecentCallType)callType
read:(BOOL)read
{
self = [super initWithUniqueId:uniqueId
receivedAtTimestamp:receivedAtTimestamp