oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename to 'attachment'

This commit is contained in:
Frederic Jacobs 2014-12-21 12:52:42 +01:00
parent f8db90014d
commit 9683451ed9
28 changed files with 164 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
Signal.xcodeproj/project.pbxproj
View File

@ -334,7 +334,7 @@
B63AF5CB1A1F757900D01AAD /* TSRegisterPrekeysRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = B63AF5B51A1F757900D01AAD /* TSRegisterPrekeysRequest.m */; };
B63AF5CC1A1F757900D01AAD /* TSRegisterWithTokenRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = B63AF5B71A1F757900D01AAD /* TSRegisterWithTokenRequest.m */; };
B63AF5CD1A1F757900D01AAD /* TSRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = B63AF5B91A1F757900D01AAD /* TSRequest.m */; };
B63AF5CE1A1F757900D01AAD /* TSAttachementRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = B63AF5BB1A1F757900D01AAD /* TSAttachementRequest.m */; };
B63AF5CE1A1F757900D01AAD /* TSAttachmentRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = B63AF5BB1A1F757900D01AAD /* TSAttachmentRequest.m */; };
B63AF5D01A1F757900D01AAD /* TSSubmitMessageRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = B63AF5BF1A1F757900D01AAD /* TSSubmitMessageRequest.m */; };
B63AF5D11A1F757900D01AAD /* TSUploadAttachment.m in Sources */ = {isa = PBXBuildFile; fileRef = B63AF5C11A1F757900D01AAD /* TSUploadAttachment.m */; };
B63AF5D21A1F757900D01AAD /* TSNetworkManager.m in Sources */ = {isa = PBXBuildFile; fileRef = B63AF5C31A1F757900D01AAD /* TSNetworkManager.m */; };
@ -348,7 +348,7 @@
B684A46D19C3446200B11029 /* PushManagerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B684A46C19C3446200B11029 /* PushManagerTest.m */; };
B6850E5A1995A4710068E715 /* whisperFake.cer in Resources */ = {isa = PBXBuildFile; fileRef = B6850E591995A4710068E715 /* whisperFake.cer */; };
B69CD25119773E79005CE69A /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B69CD25019773E79005CE69A /* XCTest.framework */; };
B6A3EB4B1A423B3800B2236B /* TSAttachementAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = B6A3EB4A1A423B3800B2236B /* TSAttachementAdapter.m */; };
B6A3EB4B1A423B3800B2236B /* TSAttachmentAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = B6A3EB4A1A423B3800B2236B /* TSAttachmentAdapter.m */; };
B6AE33BD1A1EB121003DF39D /* GroupModel.m in Sources */ = {isa = PBXBuildFile; fileRef = B6AE33BC1A1EB121003DF39D /* GroupModel.m */; };
B6B095E41A1D25C5008BFAA6 /* CryptographyTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = B6B095DE1A1D25C5008BFAA6 /* CryptographyTests.mm */; };
B6B095E51A1D25C5008BFAA6 /* TextSecureKitTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B095DF1A1D25C5008BFAA6 /* TextSecureKitTests.m */; };
@ -364,7 +364,7 @@
B6B096681A1D25ED008BFAA6 /* TSRecipient.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B095FD1A1D25ED008BFAA6 /* TSRecipient.m */; };
B6B096691A1D25ED008BFAA6 /* TSThread.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B095FF1A1D25ED008BFAA6 /* TSThread.m */; };
B6B0966A1A1D25ED008BFAA6 /* IncomingPushMessageSignal.pb.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B096021A1D25ED008BFAA6 /* IncomingPushMessageSignal.pb.m */; settings = {COMPILER_FLAGS = "-w"; }; };
B6B0966B1A1D25ED008BFAA6 /* TSAttachement.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B096041A1D25ED008BFAA6 /* TSAttachement.m */; };
B6B0966B1A1D25ED008BFAA6 /* TSAttachment.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B096041A1D25ED008BFAA6 /* TSAttachment.m */; };
B6B0966C1A1D25ED008BFAA6 /* TSCall.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B096061A1D25ED008BFAA6 /* TSCall.m */; };
B6B0966D1A1D25ED008BFAA6 /* TSErrorMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B096081A1D25ED008BFAA6 /* TSErrorMessage.m */; };
B6B0966E1A1D25ED008BFAA6 /* TSGroupMessageManager.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B0960A1A1D25ED008BFAA6 /* TSGroupMessageManager.m */; };
@ -393,15 +393,15 @@
B6B096941A1D25ED008BFAA6 /* NSString+escape.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B0965E1A1D25ED008BFAA6 /* NSString+escape.m */; };
B6B096951A1D25ED008BFAA6 /* NSURLSessionDataTask+StatusCode.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B096601A1D25ED008BFAA6 /* NSURLSessionDataTask+StatusCode.m */; };
B6B1013C196D213F007E3930 /* SignalKeyingStorage.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B1013B196D213F007E3930 /* SignalKeyingStorage.m */; };
B6B50AAB1A4192C500F8F607 /* TSMessagesManager+attachements.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B50AAA1A4192C500F8F607 /* TSMessagesManager+attachements.m */; };
B6B50AAB1A4192C500F8F607 /* TSMessagesManager+attachments.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B50AAA1A4192C500F8F607 /* TSMessagesManager+attachments.m */; };
B6B9ECFC198B31BA00C620D3 /* PushManager.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B9ECFB198B31BA00C620D3 /* PushManager.m */; };
B6C6AE551A305ED1006BAF8F /* redphone.cer in Resources */ = {isa = PBXBuildFile; fileRef = B6C6AE531A305ED1006BAF8F /* redphone.cer */; };
B6C6AE561A305ED1006BAF8F /* textsecure.cer in Resources */ = {isa = PBXBuildFile; fileRef = B6C6AE541A305ED1006BAF8F /* textsecure.cer */; };
B6C93C4E199567AD00EDF894 /* DebugLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = B6C93C4D199567AD00EDF894 /* DebugLogger.m */; };
B6CBF53F1A254BD1000D4184 /* ContactDetailCell.m in Sources */ = {isa = PBXBuildFile; fileRef = B6CBF53E1A254BD1000D4184 /* ContactDetailCell.m */; };
B6E314C91A38FAAF00A41AFB /* TSFingerprintGenerator.m in Sources */ = {isa = PBXBuildFile; fileRef = B6E314C81A38FAAF00A41AFB /* TSFingerprintGenerator.m */; };
B6FAAAE81A41BC6C007FEC1D /* TSAttachementPointer.m in Sources */ = {isa = PBXBuildFile; fileRef = B6FAAAE71A41BC6C007FEC1D /* TSAttachementPointer.m */; };
B6FAAAEE1A41C918007FEC1D /* TSAttachementStream.m in Sources */ = {isa = PBXBuildFile; fileRef = B6FAAAED1A41C918007FEC1D /* TSAttachementStream.m */; };
B6FAAAE81A41BC6C007FEC1D /* TSAttachmentPointer.m in Sources */ = {isa = PBXBuildFile; fileRef = B6FAAAE71A41BC6C007FEC1D /* TSAttachmentPointer.m */; };
B6FAAAEE1A41C918007FEC1D /* TSAttachmentStream.m in Sources */ = {isa = PBXBuildFile; fileRef = B6FAAAED1A41C918007FEC1D /* TSAttachmentStream.m */; };
B90418E6183E9DD40038554A /* DateUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = B90418E5183E9DD40038554A /* DateUtil.m */; };
B90418E7183E9DD40038554A /* DateUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = B90418E5183E9DD40038554A /* DateUtil.m */; };
B96A3100187DA1B600648F3E /* HelveticaNeueLTStd-Bd.otf in Resources */ = {isa = PBXBuildFile; fileRef = B96A30FE187DA1B600648F3E /* HelveticaNeueLTStd-Bd.otf */; };
@ -945,8 +945,8 @@
B63AF5B71A1F757900D01AAD /* TSRegisterWithTokenRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TSRegisterWithTokenRequest.m; sourceTree = "<group>"; };
B63AF5B81A1F757900D01AAD /* TSRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TSRequest.h; sourceTree = "<group>"; };
B63AF5B91A1F757900D01AAD /* TSRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TSRequest.m; sourceTree = "<group>"; };
B63AF5BA1A1F757900D01AAD /* TSAttachementRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TSAttachementRequest.h; sourceTree = "<group>"; };
B63AF5BB1A1F757900D01AAD /* TSAttachementRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TSAttachementRequest.m; sourceTree = "<group>"; };
B63AF5BA1A1F757900D01AAD /* TSAttachmentRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TSAttachmentRequest.h; sourceTree = "<group>"; };
B63AF5BB1A1F757900D01AAD /* TSAttachmentRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TSAttachmentRequest.m; sourceTree = "<group>"; };
B63AF5BE1A1F757900D01AAD /* TSSubmitMessageRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TSSubmitMessageRequest.h; sourceTree = "<group>"; };
B63AF5BF1A1F757900D01AAD /* TSSubmitMessageRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TSSubmitMessageRequest.m; sourceTree = "<group>"; };
B63AF5C01A1F757900D01AAD /* TSUploadAttachment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TSUploadAttachment.h; sourceTree = "<group>"; };
@ -969,8 +969,8 @@
B684A46C19C3446200B11029 /* PushManagerTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PushManagerTest.m; path = Signal/test/push/PushManagerTest.m; sourceTree = SOURCE_ROOT; };
B6850E591995A4710068E715 /* whisperFake.cer */ = {isa = PBXFileReference; lastKnownFileType = file; path = whisperFake.cer; sourceTree = "<group>"; };
B69CD25019773E79005CE69A /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
B6A3EB491A423B3800B2236B /* TSAttachementAdapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TSAttachementAdapter.h; sourceTree = "<group>"; };
B6A3EB4A1A423B3800B2236B /* TSAttachementAdapter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TSAttachementAdapter.m; sourceTree = "<group>"; };
B6A3EB491A423B3800B2236B /* TSAttachmentAdapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TSAttachmentAdapter.h; sourceTree = "<group>"; };
B6A3EB4A1A423B3800B2236B /* TSAttachmentAdapter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TSAttachmentAdapter.m; sourceTree = "<group>"; };
B6AE33BB1A1EB121003DF39D /* GroupModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GroupModel.h; sourceTree = "<group>"; };
B6AE33BC1A1EB121003DF39D /* GroupModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GroupModel.m; sourceTree = "<group>"; };
B6B095DE1A1D25C5008BFAA6 /* CryptographyTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CryptographyTests.mm; sourceTree = "<group>"; };
@ -995,8 +995,8 @@
B6B095FF1A1D25ED008BFAA6 /* TSThread.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TSThread.m; path = ../TSThread.m; sourceTree = "<group>"; };
B6B096011A1D25ED008BFAA6 /* IncomingPushMessageSignal.pb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IncomingPushMessageSignal.pb.h; sourceTree = "<group>"; };
B6B096021A1D25ED008BFAA6 /* IncomingPushMessageSignal.pb.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IncomingPushMessageSignal.pb.m; sourceTree = "<group>"; };
B6B096031A1D25ED008BFAA6 /* TSAttachement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TSAttachement.h; sourceTree = "<group>"; };
B6B096041A1D25ED008BFAA6 /* TSAttachement.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TSAttachement.m; sourceTree = "<group>"; };
B6B096031A1D25ED008BFAA6 /* TSAttachment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TSAttachment.h; sourceTree = "<group>"; };
B6B096041A1D25ED008BFAA6 /* TSAttachment.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TSAttachment.m; sourceTree = "<group>"; };
B6B096051A1D25ED008BFAA6 /* TSCall.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TSCall.h; sourceTree = "<group>"; };
B6B096061A1D25ED008BFAA6 /* TSCall.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TSCall.m; sourceTree = "<group>"; };
B6B096071A1D25ED008BFAA6 /* TSErrorMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TSErrorMessage.h; sourceTree = "<group>"; };
@ -1055,8 +1055,8 @@
B6B096601A1D25ED008BFAA6 /* NSURLSessionDataTask+StatusCode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSURLSessionDataTask+StatusCode.m"; sourceTree = "<group>"; };
B6B1013A196D213F007E3930 /* SignalKeyingStorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SignalKeyingStorage.h; sourceTree = "<group>"; };
B6B1013B196D213F007E3930 /* SignalKeyingStorage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SignalKeyingStorage.m; sourceTree = "<group>"; };
B6B50AA91A4192C500F8F607 /* TSMessagesManager+attachements.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "TSMessagesManager+attachements.h"; sourceTree = "<group>"; };
B6B50AAA1A4192C500F8F607 /* TSMessagesManager+attachements.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "TSMessagesManager+attachements.m"; sourceTree = "<group>"; };
B6B50AA91A4192C500F8F607 /* TSMessagesManager+attachments.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "TSMessagesManager+attachments.h"; sourceTree = "<group>"; };
B6B50AAA1A4192C500F8F607 /* TSMessagesManager+attachments.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "TSMessagesManager+attachments.m"; sourceTree = "<group>"; };
B6B9ECFA198B31BA00C620D3 /* PushManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PushManager.h; sourceTree = "<group>"; };
B6B9ECFB198B31BA00C620D3 /* PushManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PushManager.m; sourceTree = "<group>"; };
B6C6AE531A305ED1006BAF8F /* redphone.cer */ = {isa = PBXFileReference; lastKnownFileType = file; path = redphone.cer; sourceTree = "<group>"; };
@ -1067,10 +1067,10 @@
B6CBF53E1A254BD1000D4184 /* ContactDetailCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ContactDetailCell.m; path = "Signal/src/view controllers/ContactDetailCell.m"; sourceTree = SOURCE_ROOT; };
B6E314C71A38FAAF00A41AFB /* TSFingerprintGenerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TSFingerprintGenerator.h; sourceTree = "<group>"; };
B6E314C81A38FAAF00A41AFB /* TSFingerprintGenerator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TSFingerprintGenerator.m; sourceTree = "<group>"; };
B6FAAAE61A41BC6C007FEC1D /* TSAttachementPointer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TSAttachementPointer.h; path = Attachements/TSAttachementPointer.h; sourceTree = "<group>"; };
B6FAAAE71A41BC6C007FEC1D /* TSAttachementPointer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TSAttachementPointer.m; path = Attachements/TSAttachementPointer.m; sourceTree = "<group>"; };
B6FAAAEC1A41C918007FEC1D /* TSAttachementStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TSAttachementStream.h; path = Attachements/TSAttachementStream.h; sourceTree = "<group>"; };
B6FAAAED1A41C918007FEC1D /* TSAttachementStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TSAttachementStream.m; path = Attachements/TSAttachementStream.m; sourceTree = "<group>"; };
B6FAAAE61A41BC6C007FEC1D /* TSAttachmentPointer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TSAttachmentPointer.h; path = Attachements/TSAttachmentPointer.h; sourceTree = "<group>"; };
B6FAAAE71A41BC6C007FEC1D /* TSAttachmentPointer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TSAttachmentPointer.m; path = Attachements/TSAttachmentPointer.m; sourceTree = "<group>"; };
B6FAAAEC1A41C918007FEC1D /* TSAttachmentStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TSAttachmentStream.h; path = Attachements/TSAttachmentStream.h; sourceTree = "<group>"; };
B6FAAAED1A41C918007FEC1D /* TSAttachmentStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TSAttachmentStream.m; path = Attachements/TSAttachmentStream.m; sourceTree = "<group>"; };
B90418E4183E9DD40038554A /* DateUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DateUtil.h; sourceTree = "<group>"; };
B90418E5183E9DD40038554A /* DateUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DateUtil.m; sourceTree = "<group>"; };
B96A30FE187DA1B600648F3E /* HelveticaNeueLTStd-Bd.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "HelveticaNeueLTStd-Bd.otf"; sourceTree = "<group>"; };
@ -2126,8 +2126,8 @@
B62D53F41A23CC8B009AAF82 /* TSMessageAdapters */ = {
isa = PBXGroup;
children = (
B6A3EB491A423B3800B2236B /* TSAttachementAdapter.h */,
B6A3EB4A1A423B3800B2236B /* TSAttachementAdapter.m */,
B6A3EB491A423B3800B2236B /* TSAttachmentAdapter.h */,
B6A3EB4A1A423B3800B2236B /* TSAttachmentAdapter.m */,
B62D53F51A23CCAD009AAF82 /* TSMessageAdapter.h */,
B62D53F61A23CCAD009AAF82 /* TSMessageAdapter.m */,
);
@ -2235,8 +2235,8 @@
B63AF5B71A1F757900D01AAD /* TSRegisterWithTokenRequest.m */,
B63AF5B81A1F757900D01AAD /* TSRequest.h */,
B63AF5B91A1F757900D01AAD /* TSRequest.m */,
B63AF5BA1A1F757900D01AAD /* TSAttachementRequest.h */,
B63AF5BB1A1F757900D01AAD /* TSAttachementRequest.m */,
B63AF5BA1A1F757900D01AAD /* TSAttachmentRequest.h */,
B63AF5BB1A1F757900D01AAD /* TSAttachmentRequest.m */,
B63AF5BE1A1F757900D01AAD /* TSSubmitMessageRequest.h */,
B63AF5BF1A1F757900D01AAD /* TSSubmitMessageRequest.m */,
B63AF5C01A1F757900D01AAD /* TSUploadAttachment.h */,
@ -2373,8 +2373,8 @@
B6B096141A1D25ED008BFAA6 /* TSMessagesManager+sendMessages.m */,
B6B096151A1D25ED008BFAA6 /* TSMessagesManager.h */,
B6B096161A1D25ED008BFAA6 /* TSMessagesManager.m */,
B6B50AA91A4192C500F8F607 /* TSMessagesManager+attachements.h */,
B6B50AAA1A4192C500F8F607 /* TSMessagesManager+attachements.m */,
B6B50AA91A4192C500F8F607 /* TSMessagesManager+attachments.h */,
B6B50AAA1A4192C500F8F607 /* TSMessagesManager+attachments.m */,
B6B096171A1D25ED008BFAA6 /* TSOutgoingMessage.h */,
B6B096181A1D25ED008BFAA6 /* TSOutgoingMessage.m */,
B6B096191A1D25ED008BFAA6 /* TSServerMessage.h */,
@ -2469,12 +2469,12 @@
B6FAAAE91A41C7CC007FEC1D /* Attachement */ = {
isa = PBXGroup;
children = (
B6B096031A1D25ED008BFAA6 /* TSAttachement.h */,
B6B096041A1D25ED008BFAA6 /* TSAttachement.m */,
B6FAAAEC1A41C918007FEC1D /* TSAttachementStream.h */,
B6FAAAED1A41C918007FEC1D /* TSAttachementStream.m */,
B6FAAAE61A41BC6C007FEC1D /* TSAttachementPointer.h */,
B6FAAAE71A41BC6C007FEC1D /* TSAttachementPointer.m */,
B6B096031A1D25ED008BFAA6 /* TSAttachment.h */,
B6B096041A1D25ED008BFAA6 /* TSAttachment.m */,
B6FAAAEC1A41C918007FEC1D /* TSAttachmentStream.h */,
B6FAAAED1A41C918007FEC1D /* TSAttachmentStream.m */,
B6FAAAE61A41BC6C007FEC1D /* TSAttachmentPointer.h */,
B6FAAAE71A41BC6C007FEC1D /* TSAttachmentPointer.m */,
);
name = Attachement;
sourceTree = "<group>";
@ -3132,7 +3132,7 @@
76EB063C18170B33006006FC /* NumberUtil.m in Sources */,
B6B096691A1D25ED008BFAA6 /* TSThread.m in Sources */,
B6B096641A1D25ED008BFAA6 /* TSContactThread.m in Sources */,
B6A3EB4B1A423B3800B2236B /* TSAttachementAdapter.m in Sources */,
B6A3EB4B1A423B3800B2236B /* TSAttachmentAdapter.m in Sources */,
76EB063A18170B33006006FC /* FunctionalUtil.m in Sources */,
76EB060A18170B33006006FC /* SignalUtil.m in Sources */,
76EB062818170B33006006FC /* BadArgument.m in Sources */,
@ -3171,11 +3171,11 @@
76EB05DA18170B33006006FC /* LowLatencyConnector.m in Sources */,
76EB05EE18170B33006006FC /* CallTermination.m in Sources */,
E1CD329618BCFF9900B1A496 /* SoundInstance.m in Sources */,
B6FAAAEE1A41C918007FEC1D /* TSAttachementStream.m in Sources */,
B6FAAAEE1A41C918007FEC1D /* TSAttachmentStream.m in Sources */,
76EB05B418170B33006006FC /* HashChain.m in Sources */,
76EB05E418170B33006006FC /* UdpSocket.m in Sources */,
B6B096931A1D25ED008BFAA6 /* NSData+messagePadding.m in Sources */,
B63AF5CE1A1F757900D01AAD /* TSAttachementRequest.m in Sources */,
B63AF5CE1A1F757900D01AAD /* TSAttachmentRequest.m in Sources */,
76EB058218170B33006006FC /* Environment.m in Sources */,
76EB064418170B33006006FC /* ThreadManager.m in Sources */,
E197B61E18BBEC6D00F073E5 /* AudioRouter.m in Sources */,
@ -3198,7 +3198,7 @@
B6B096651A1D25ED008BFAA6 /* TSGroupThread.m in Sources */,
FCAC965119FF0A6E0046DFC5 /* MessagesViewController.m in Sources */,
B63AF5D01A1F757900D01AAD /* TSSubmitMessageRequest.m in Sources */,
B6B0966B1A1D25ED008BFAA6 /* TSAttachement.m in Sources */,
B6B0966B1A1D25ED008BFAA6 /* TSAttachment.m in Sources */,
76EB057618170B33006006FC /* Contact.m in Sources */,
B6B0968F1A1D25ED008BFAA6 /* TSYapDatabaseObject.m in Sources */,
E197B61118BBEC1A00F073E5 /* AudioProcessor.m in Sources */,
@ -3231,9 +3231,9 @@
7038632718F70C0700D4A43F /* CryptoTools.m in Sources */,
76EB058C18170B33006006FC /* DnsManager.m in Sources */,
B63AF5CB1A1F757900D01AAD /* TSRegisterPrekeysRequest.m in Sources */,
B6FAAAE81A41BC6C007FEC1D /* TSAttachementPointer.m in Sources */,
B6FAAAE81A41BC6C007FEC1D /* TSAttachmentPointer.m in Sources */,
B6B096881A1D25ED008BFAA6 /* TSStorageManager+keyFromIntLong.m in Sources */,
B6B50AAB1A4192C500F8F607 /* TSMessagesManager+attachements.m in Sources */,
B6B50AAB1A4192C500F8F607 /* TSMessagesManager+attachments.m in Sources */,
76EB059018170B33006006FC /* IgnoredPacketFailure.m in Sources */,
765052AF182AC9B5008313E1 /* DialerButtonView.m in Sources */,
76EB05D418170B33006006FC /* ZrtpManager.m in Sources */,

8
Signal/src/textsecure/Contacts/TSGroup.h
View File

@ -7,15 +7,15 @@
//
#import <Foundation/Foundation.h>
#import "TSAttachement.h"
#import "TSAttachment.h"
#import "TSYapDatabaseObject.h"
@interface TSGroup : TSYapDatabaseObject
@property (nonatomic) NSString *name; // Name of the group
@property (nonatomic) TSAttachement *avatar; // Link to the attachement object (group picture)
@property (nonatomic) NSSet *members; // Each member of the discussion is a TSUser
@property (nonatomic) NSString *name;// Name of the group
@property (nonatomic) TSAttachment *avatar;// Link to the attachment object (group picture)
@property (nonatomic) NSSet *members;// Each member of the discussion is a TSUser
- (NSData*)groupIdentifier;

4
Signal/src/textsecure/Messages/Attachements/TSAttachementPointer.h → Signal/src/textsecure/Messages/Attachements/TSAttachmentPointer.h
View File

@ -8,9 +8,9 @@
#import <Foundation/Foundation.h>
#import "TSAttachement.h"
#import "TSAttachment.h"
@interface TSAttachementPointer : TSAttachement
@interface TSAttachmentPointer : TSAttachment
- (instancetype)initWithIdentifier:(uint64_t)identifier
key:(NSData*)key

4
Signal/src/textsecure/Messages/Attachements/TSAttachementPointer.m → Signal/src/textsecure/Messages/Attachements/TSAttachmentPointer.m
View File

@ -6,9 +6,9 @@
// Copyright (c) 2014 Open Whisper Systems. All rights reserved.
//
#import "TSAttachementPointer.h"
#import "TSAttachmentPointer.h"
@implementation TSAttachementPointer
@implementation TSAttachmentPointer
- (instancetype)initWithIdentifier:(uint64_t)identifier
key:(NSData*)key

4
Signal/src/textsecure/Messages/Attachements/TSAttachementStream.h → Signal/src/textsecure/Messages/Attachements/TSAttachmentStream.h
View File

@ -6,9 +6,9 @@
// Copyright (c) 2014 Open Whisper Systems. All rights reserved.
//
#import "TSAttachement.h"
#import "TSAttachment.h"
@interface TSAttachementStream : TSAttachement
@interface TSAttachmentStream : TSAttachment
- (instancetype)initWithIdentifier:(NSString*)identifier
data:(NSData*)data

14
Signal/src/textsecure/Messages/Attachements/TSAttachementStream.m → Signal/src/textsecure/Messages/Attachements/TSAttachmentStream.m
View File

@ -1,20 +1,20 @@
//
// TSAttachementStream.m
// TSattachmentStream.m
// Signal
//
// Created by Frederic Jacobs on 17/12/14.
// Copyright (c) 2014 Open Whisper Systems. All rights reserved.
//
#import "TSAttachementStream.h"
#import "TSAttachmentStream.h"
@interface TSAttachementStream ()
@interface TSAttachmentStream ()
@property (nonatomic) NSString *path;
@end
@implementation TSAttachementStream
@implementation TSAttachmentStream
- (instancetype)initWithIdentifier:(NSString*)identifier
data:(NSData*)data
@ -36,10 +36,10 @@
NSFileManager* fileManager = [NSFileManager defaultManager];
NSURL *fileURL = [[fileManager URLsForDirectory:NSDocumentDirectory inDomains:NSUserDomainMask] lastObject];
NSString *path = [fileURL path];
NSString *attachementFolder = [path stringByAppendingFormat:@"/Attachements"];
NSString *attachmentFolder = [path stringByAppendingFormat:@"/Attachments"];
NSError * error = nil;
[[NSFileManager defaultManager] createDirectoryAtPath:attachementFolder
[[NSFileManager defaultManager] createDirectoryAtPath:attachmentFolder
withIntermediateDirectories:YES
attributes:nil
error:&error];
@ -47,7 +47,7 @@
DDLogError(@"Failed to create attachments directory: %@", error.description);
}
return attachementFolder;
return attachmentFolder;
}
- (NSString*)filePath {

4
Signal/src/textsecure/Messages/TSAttachement.h → Signal/src/textsecure/Messages/TSAttachment.h
View File

@ -1,5 +1,5 @@
//
// TSAttachement.h
// TSAttachment.h
// TextSecureKit
//
// Created by Frederic Jacobs on 12/11/14.
@ -9,7 +9,7 @@
#import <Foundation/Foundation.h>
#import "TSYapDatabaseObject.h"
@interface TSAttachement : TSYapDatabaseObject
@interface TSAttachment : TSYapDatabaseObject
- (NSNumber*)identifier;

4
Signal/src/textsecure/Messages/TSAttachement.m → Signal/src/textsecure/Messages/TSAttachment.m
View File

@ -7,9 +7,9 @@
// Copyright (c) 2014 Open Whisper Systems. All rights reserved.
//
#import "TSAttachement.h"
#import "TSAttachment.h"
@implementation TSAttachement
@implementation TSAttachment
- (instancetype)initWithIdentifier:(NSString*)identifier
encryptionKey:(NSData*)encryptionKey

2
Signal/src/textsecure/Messages/TSErrorMessage.m
View File

@ -31,7 +31,7 @@
}
- (instancetype)initWithTimestamp:(uint64_t)timestamp inThread:(TSThread *)thread failedMessageType:(TSErrorMessageType)errorMessageType{
self = [super initWithTimestamp:timestamp inThread:thread messageBody:nil attachements:nil];
self = [super initWithTimestamp:timestamp inThread:thread messageBody:nil attachments:nil];
if (self) {
_errorType = errorMessageType;

8
Signal/src/textsecure/Messages/TSIncomingMessage.h
View File

@ -16,7 +16,7 @@
* @param timestamp timestamp of the message in milliseconds since epoch
* @param thread thread to which the message belongs
* @param body body of the message
* @param attachements attachements of the message
* @param attachments attachments of the message
*
* @return initiated incoming message
*/
@ -24,7 +24,7 @@
- (instancetype)initWithTimestamp:(uint64_t)timestamp
inThread:(TSContactThread*)thread
messageBody:(NSString*)body
attachements:(NSArray*)attachements;
attachments:(NSArray*)attachments;
/**
* Initiates an incoming group message
@ -33,7 +33,7 @@
* @param thread thread to which the message belongs
* @param authorId author identifier of the user in the group that sent the message
* @param body body of the message
* @param attachements attachements of the message
* @param attachments attachments of the message
*
* @return initiated incoming group message
*/
@ -42,7 +42,7 @@
inThread:(TSGroupThread*)thread
authorId:(NSString*)authorId
messageBody:(NSString*)body
attachements:(NSArray*)attachements;
attachments:(NSArray*)attachments;
@property (nonatomic, readonly) NSString *authorId;
@property (nonatomic, getter = wasRead) BOOL read;

8
Signal/src/textsecure/Messages/TSIncomingMessage.m
View File

@ -14,9 +14,9 @@
inThread:(TSGroupThread*)thread
authorId:(NSString*)authorId
messageBody:(NSString*)body
attachements:(NSArray *)attachements
attachments:(NSArray *)attachments
{
self = [super initWithTimestamp:timestamp inThread:thread messageBody:body attachements:attachements];
self = [super initWithTimestamp:timestamp inThread:thread messageBody:body attachments:attachments];
if (self) {
_authorId = authorId;
@ -29,9 +29,9 @@
- (instancetype)initWithTimestamp:(uint64_t)timestamp
inThread:(TSContactThread *)thread
messageBody:(NSString *)body
attachements:(NSArray *)attachements
attachments:(NSArray *)attachments
{
self = [super initWithTimestamp:timestamp inThread:thread messageBody:body attachements:attachements];
self = [super initWithTimestamp:timestamp inThread:thread messageBody:body attachments:attachments];
if (self) {
_authorId = nil;

2
Signal/src/textsecure/Messages/TSInfoMessage.m
View File

@ -12,7 +12,7 @@
@implementation TSInfoMessage
- (instancetype)initWithTimestamp:(uint64_t)timestamp inThread:(TSContactThread *)contact messageType:(TSInfoMessageType)infoMessage{
self = [super initWithTimestamp:timestamp inThread:contact messageBody:nil attachements:nil];
self = [super initWithTimestamp:timestamp inThread:contact messageBody:nil attachments:nil];
if (self) {
_messageType = infoMessage;

10
Signal/src/textsecure/Messages/TSMessage.h
View File

@ -15,16 +15,16 @@
@interface TSMessage : TSInteraction
@property (nonatomic, readonly) NSMutableArray *attachements;
@property (nonatomic, readonly) NSMutableArray *attachments;
@property (nonatomic, readonly) NSString *body;
- (instancetype)initWithTimestamp:(uint64_t)timestamp
inThread:(TSThread*)thread
messageBody:(NSString*)body
attachements:(NSArray*)attachements;
attachments:(NSArray*)attachments;
- (void)addAttachements:(NSArray*)attachements;
- (void)addAttachement:(NSString*)attachement;
- (BOOL)hasAttachements;
- (void)addattachments:(NSArray*)attachments;
- (void)addattachment:(NSString*)attachment;
- (BOOL)hasattachments;
@end

26
Signal/src/textsecure/Messages/TSMessage.m
View File

@ -11,41 +11,41 @@
@implementation TSMessage
- (void)addAttachements:(NSArray*)attachements {
for (NSString *identifier in attachements) {
[self addAttachement:identifier];
- (void)addattachments:(NSArray*)attachments {
for (NSString *identifier in attachments) {
[self addattachment:identifier];
}
}
- (void)addAttachement:(NSString*)attachement {
if (!_attachements) {
_attachements = [NSMutableArray array];
- (void)addattachment:(NSString*)attachment {
if (!_attachments) {
_attachments = [NSMutableArray array];
}
[self.attachements addObject:attachement];
[self.attachments addObject:attachment];
}
- (instancetype)initWithTimestamp:(uint64_t)timestamp
inThread:(TSThread*)thread
messageBody:(NSString*)body
attachements:(NSArray*)attachements
attachments:(NSArray*)attachments
{
self = [super initWithTimestamp:timestamp inThread:thread];
if (self) {
_body = body;
_attachements = [attachements mutableCopy];
_attachments = [attachments mutableCopy];
}
return self;
}
- (BOOL)hasAttachements{
return self.attachements?(self.attachements.count>0):false;
- (BOOL)hasattachments{
return self.attachments?(self.attachments.count>0):false;
}
- (NSString *)description{
if(self.attachements > 0){
return @"Attachement";
if(self.attachments > 0){
return @"attachment";
} else {
return self.body;
}

8
Signal/src/textsecure/Messages/TSMessagesManager+attachements.h → Signal/src/textsecure/Messages/TSMessagesManager+attachments.h
View File

@ -1,5 +1,5 @@
//
// TSMessagesManager+attachements.h
// TSMessagesManager+attachments.h
// Signal
//
// Created by Frederic Jacobs on 17/12/14.
@ -7,11 +7,11 @@
//
#import "TSMessagesManager.h"
#import "TSAttachement.h"
#import "TSAttachment.h"
@interface TSMessagesManager (attachements)
@interface TSMessagesManager (attachments)
- (void)handleReceivedMediaMessage:(IncomingPushMessageSignal*)message withContent:(PushMessageContent*)content;
- (void)retrieveAttachment:(TSAttachement*)attachement;
- (void)retrieveAttachment:(TSAttachment*)attachment;
@end

58
Signal/src/textsecure/Messages/TSMessagesManager+attachements.m → Signal/src/textsecure/Messages/TSMessagesManager+attachments.m
View File

@ -1,5 +1,5 @@
//
// TSMessagesManager+attachements.m
// TSMessagesManager+attachments.m
// Signal
//
// Created by Frederic Jacobs on 17/12/14.
@ -12,59 +12,59 @@
#import "Cryptography.h"
#import "TSConstants.h"
#import "TSMessagesManager+attachements.h"
#import "TSAttachementRequest.h"
#import "TSMessagesManager+attachments.h"
#import "TSAttachmentRequest.h"
#import "TSUploadAttachment.h"
#import "TSInfoMessage.h"
#import "TSAttachementPointer.h"
#import "TSattachmentPointer.h"
#import "TSNetworkManager.h"
@interface TSMessagesManager ()
dispatch_queue_t attachementsQueue(void);
dispatch_queue_t attachmentsQueue(void);
@end
dispatch_queue_t attachementsQueue() {
dispatch_queue_t attachmentsQueue() {
static dispatch_once_t queueCreationGuard;
static dispatch_queue_t queue;
dispatch_once(&queueCreationGuard, ^{
queue = dispatch_queue_create("org.whispersystems.signal.attachements", NULL);
queue = dispatch_queue_create("org.whispersystems.signal.attachments", NULL);
});
return queue;
}
@implementation TSMessagesManager (attachements)
@implementation TSMessagesManager (attachments)
- (void)handleReceivedMediaMessage:(IncomingPushMessageSignal*)message withContent:(PushMessageContent*)content {
NSMutableArray *attachements = [NSMutableArray array];
NSMutableArray *attachments = [NSMutableArray array];
[self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
for (PushMessageContentAttachmentPointer *pointer in content.attachments) {
TSAttachementPointer *attachementPointer = [[TSAttachementPointer alloc] initWithIdentifier:pointer.id key:pointer.key contentType:pointer.contentType relay:message.relay];
[attachementPointer saveWithTransaction:transaction];
dispatch_async(attachementsQueue(), ^{
[self retrieveAttachment:attachementPointer];
TSAttachmentPointer *attachmentPointer = [[TSAttachmentPointer alloc] initWithIdentifier:pointer.id key:pointer.key contentType:pointer.contentType relay:message.relay];
[attachmentPointer saveWithTransaction:transaction];
dispatch_async(attachmentsQueue(), ^{
[self retrieveAttachment:attachmentPointer];
});
[attachements addObject:attachementPointer.uniqueId];
[attachments addObject:attachmentPointer.uniqueId];
}
}];
[self handleReceivedMessage:message withContent:content attachements:attachements];
[self handleReceivedMessage:message withContent:content attachments:attachments];
}
- (void)retrieveAttachment:(TSAttachementPointer*)attachement {
- (void)retrieveAttachment:(TSAttachmentPointer*)attachment {
TSAttachementRequest *attachementRequest = [[TSAttachementRequest alloc] initWithId:[attachement identifier]
relay:attachement.relay];
TSAttachmentRequest *attachmentRequest = [[TSAttachmentRequest alloc] initWithId:[attachment identifier]
relay:attachment.relay];
[[TSNetworkManager sharedManager] queueAuthenticatedRequest:attachementRequest success:^(NSURLSessionDataTask *task, id responseObject) {
[[TSNetworkManager sharedManager] queueAuthenticatedRequest:attachmentRequest success:^(NSURLSessionDataTask *task, id responseObject) {
if ([responseObject isKindOfClass:[NSDictionary class]]) {
NSString *location = [(NSDictionary*)responseObject objectForKey:@"location"];
NSData *data = [self downloadFromLocation:location];
if (data) {
dispatch_async(attachementsQueue(), ^{
[self decryptedAndSaveAttachement:attachement data:data];
dispatch_async(attachmentsQueue(), ^{
[self decryptedAndSaveAttachment:attachment data:data];
});
}
@ -78,7 +78,7 @@ dispatch_queue_t attachementsQueue() {
__block NSData *data;
AFHTTPRequestOperationManager *manager = [AFHTTPRequestOperationManager manager];
manager.completionQueue = attachementsQueue();
manager.completionQueue = attachmentsQueue();
manager.requestSerializer = [AFHTTPRequestSerializer serializer];
[manager.requestSerializer setValue:@"application/octet-stream" forHTTPHeaderField:@"Content-Type"];
@ -96,19 +96,19 @@ dispatch_queue_t attachementsQueue() {
return data;
}
- (void)decryptedAndSaveAttachement:(TSAttachementPointer*)attachement data:(NSData*)cipherText {
NSData *plaintext = [Cryptography decryptAttachment:cipherText withKey:attachement.encryptionKey];
- (void)decryptedAndSaveAttachment:(TSAttachmentPointer*)attachment data:(NSData*)cipherText {
NSData *plaintext = [Cryptography decryptAttachment:cipherText withKey:attachment.encryptionKey];
if (!plaintext) {
DDLogError(@"Failed to get attachement decrypted ...");
DDLogError(@"Failed to get attachment decrypted ...");
} else {
TSAttachementStream *stream = [[TSAttachementStream alloc] initWithIdentifier:attachement.uniqueId
data:plaintext key:attachement.encryptionKey
contentType:attachement.contentType];
TSAttachmentStream *stream = [[TSAttachmentStream alloc] initWithIdentifier:attachment.uniqueId
data:plaintext key:attachment.encryptionKey
contentType:attachment.contentType];
[self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
[stream saveWithTransaction:transaction];
}];
NSLog(@"We got %@ of type %@", plaintext, attachement.contentType);
NSLog(@"We got %@ of type %@", plaintext, attachment.contentType);
}
}

2
Signal/src/textsecure/Messages/TSMessagesManager.h
View File

@ -21,6 +21,6 @@
- (void)processException:(NSException*)exception outgoingMessage:(TSOutgoingMessage*)message;
- (void)handleReceivedMessage:(IncomingPushMessageSignal*)message withContent:(PushMessageContent*)content attachements:(NSArray*)attachements;
- (void)handleReceivedMessage:(IncomingPushMessageSignal*)message withContent:(PushMessageContent*)content attachments:(NSArray*)attachments;
@end

14
Signal/src/textsecure/Messages/TSMessagesManager.m
View File

@ -28,7 +28,7 @@
#import "TSStorageManager+PreKeyStore.h"
#import "TSNetworkManager.h"
#import "TSSubmitMessageRequest.h"
#import "TSMessagesManager+attachements.h"
#import "TSMessagesManager+attachments.h"
#import "NSData+messagePadding.h"
@ -183,7 +183,7 @@
DDLogVerbose(@"Received push group update message...");
[self handleGroupMessage:incomingMessage withContent:content];
} else if (content.attachments.count > 0) {
DDLogVerbose(@"Received push media message (attachement) ...");
DDLogVerbose(@"Received push media message (attachment) ...");
[self handleReceivedMediaMessage:incomingMessage withContent:content];
} else {
DDLogVerbose(@"Received push text message...");
@ -209,10 +209,10 @@
}
- (void)handleReceivedTextMessage:(IncomingPushMessageSignal*)message withContent:(PushMessageContent*)content{
[self handleReceivedMessage:message withContent:content attachements:nil];
[self handleReceivedMessage:message withContent:content attachments:nil];
}
- (void)handleReceivedMessage:(IncomingPushMessageSignal*)message withContent:(PushMessageContent*)content attachements:(NSArray*)attachements {
- (void)handleReceivedMessage:(IncomingPushMessageSignal*)message withContent:(PushMessageContent*)content attachments:(NSArray*)attachments {
uint64_t timeStamp = message.timestamp;
NSString *body = content.body;
NSData *groupId = content.hasGroup?content.group.id:nil;
@ -223,12 +223,12 @@
if (groupId) {
TSGroupThread *gThread = [TSGroupThread threadWithGroupId:groupId];
[gThread saveWithTransaction:transaction];
incomingMessage = [[TSIncomingMessage alloc] initWithTimestamp:timeStamp inThread:gThread authorId:message.source messageBody:body attachements:attachements];
incomingMessage = [[TSIncomingMessage alloc] initWithTimestamp:timeStamp inThread:gThread authorId:message.source messageBody:body attachments:attachments];
thread = gThread;
} else{
TSContactThread *cThread = [TSContactThread threadWithContactId:message.source transaction:transaction];
[cThread saveWithTransaction:transaction];
incomingMessage = [[TSIncomingMessage alloc] initWithTimestamp:timeStamp inThread:cThread messageBody:body attachements:attachements];
incomingMessage = [[TSIncomingMessage alloc] initWithTimestamp:timeStamp inThread:cThread messageBody:body attachments:attachments];
thread = cThread;
}
[incomingMessage saveWithTransaction:transaction];
@ -294,7 +294,7 @@
return [NSString stringWithFormat:@"%@ : %@", name, message.body];
break;
default:
DDLogWarn(@"Unexpected notification type %u", setting);
DDLogWarn(@"Unexpected notification type %lu", setting);
break;
}
}

4
Signal/src/textsecure/Messages/TSOutgoingMessage.m
View File

@ -13,10 +13,10 @@
- (instancetype)initWithTimestamp:(uint64_t)timestamp
inThread:(TSThread *)thread
messageBody:(NSString *)body
attachements:(NSMutableArray*)attachements
attachments:(NSMutableArray*)attachments
{
self = [super initWithTimestamp:timestamp inThread:thread
messageBody:body attachements:attachements];
messageBody:body attachments:attachments];
if (self) {
_messageState = TSOutgoingMessageStateAttemptingOut;

2
Signal/src/textsecure/Network/API/Requests/TSAttachementRequest.h → Signal/src/textsecure/Network/API/Requests/TSAttachmentRequest.h
View File

@ -8,7 +8,7 @@
#import "TSRequest.h"
@interface TSAttachementRequest : TSRequest
@interface TSAttachmentRequest : TSRequest
-(TSRequest*) initWithId:(NSNumber*) attachmentId relay:(NSString*)relay;

4
Signal/src/textsecure/Network/API/Requests/TSAttachementRequest.m → Signal/src/textsecure/Network/API/Requests/TSAttachmentRequest.m
View File

@ -6,10 +6,10 @@
// Copyright (c) 2013 Open Whisper Systems. All rights reserved.
//
#import "TSAttachementRequest.h"
#import "TSAttachmentRequest.h"
#import "TSConstants.h"
@implementation TSAttachementRequest
@implementation TSAttachmentRequest
-(TSRequest*) initWithId:(NSNumber*) attachmentId relay:(NSString*)relay {

4
Signal/src/textsecure/Network/API/Requests/TSUploadAttachment.h
View File

@ -7,10 +7,10 @@
//
#import "TSRequest.h"
#import "TSAttachementStream.h"
#import "TSAttachmentStream.h"
@interface TSUploadAttachment : TSRequest
-(TSRequest*) initWithAttachment:(TSAttachementStream*)attachment;
-(TSRequest*) initWithAttachment:(TSAttachmentStream*)attachment;
@end

6
Signal/src/textsecure/Network/API/Requests/TSUploadAttachment.m
View File

@ -7,16 +7,16 @@
//
#import "TSUploadAttachment.h"
#import "TSAttachementStream.h"
#import "TSAttachmentStream.h"
#import <AFNetworking/AFHTTPRequestOperation.h>
@interface TSUploadAttachment ()
@property(nonatomic,strong) TSAttachement* attachment;
@property(nonatomic,strong) TSAttachment* attachment;
@end
@implementation TSUploadAttachment
-(TSRequest*) initWithAttachment:(TSAttachementStream*)attachment{
-(TSRequest*) initWithAttachment:(TSAttachmentStream*)attachment{
// self = [super initWithURL:attachment.attachmentURL];
// self.HTTPMethod = @"PUT";

13
Signal/src/view controllers/MessagesViewController.m
View File

@ -37,7 +37,7 @@
#import "TSErrorMessage.h"
#import "TSIncomingMessage.h"
#import "TSInteraction.h"
#import "TSAttachementAdapter.h"
#import "TSAttachmentAdapter.h"
#import "TSMessagesManager+sendMessages.h"
#import "NSDate+millisecondTimeStamp.h"
@ -233,7 +233,7 @@ typedef enum : NSUInteger {
if (text.length > 0) {
[JSQSystemSoundPlayer jsq_playMessageSentSound];
TSOutgoingMessage *message = [[TSOutgoingMessage alloc] initWithTimestamp:[NSDate ows_millisecondTimeStamp] inThread:self.thread messageBody:text attachements:nil];
TSOutgoingMessage *message = [[TSOutgoingMessage alloc] initWithTimestamp:[NSDate ows_millisecondTimeStamp] inThread:self.thread messageBody:text attachments:nil];
[[TSMessagesManager sharedManager] sendMessage:message inThread:self.thread];
[self finishSendingMessage];
@ -467,7 +467,7 @@ typedef enum : NSUInteger {
BOOL isMediaMessage = [messageItem isMediaMessage];
if (isMediaMessage) {
TSAttachementAdapter * messageMedia = (TSAttachementAdapter*)[messageItem media];
TSAttachmentAdapter * messageMedia = (TSAttachmentAdapter*)[messageItem media];
if ([messageMedia isImage]) {
//is a photo
@ -616,21 +616,22 @@ typedef enum : NSUInteger {
if (CFStringCompare ((__bridge_retained CFStringRef)mediaType, kUTTypeMovie, 0) == kCFCompareEqualTo) {
//Is a video
NSURL* videoURL = [info objectForKey:UIImagePickerControllerMediaURL];
NSURL* videoURL = [info objectForKey:UIImagePickerControllerMediaURL];
AVURLAsset *asset1 = [[AVURLAsset alloc] initWithURL:videoURL options:nil];
//Create a snapshot image
AVAssetImageGenerator *generate1 = [[AVAssetImageGenerator alloc] initWithAsset:asset1];
generate1.appliesPreferredTrackTransform = YES;
NSError *err = NULL;
CMTime time = CMTimeMake(2, 1);
CGImageRef snapshotRef = [generate1 copyCGImageAtTime:time actualTime:NULL error:&err];
__unused UIImage *snapshot = [[UIImage alloc] initWithCGImage:snapshotRef];
JSQVideoMediaItem * videoItem = [[JSQVideoMediaItem alloc] initWithFileURL:videoURL isReadyToPlay:YES];
JSQMessage * videoMessage = [JSQMessage messageWithSenderId:self.senderId
displayName:self.senderDisplayName
media:videoItem];
self.
[self finishSendingMessage];
} else if (picture_camera) {

6
Signal/src/view controllers/TSAttachementAdapter.h → Signal/src/view controllers/TSAttachmentAdapter.h
View File

@ -7,12 +7,12 @@
//
#import <JSQMessagesViewController/JSQMediaItem.h>
#import "TSAttachementStream.h"
#import "TSAttachmentStream.h"
#import <Foundation/Foundation.h>
@interface TSAttachementAdapter : JSQMediaItem
@interface TSAttachmentAdapter : JSQMediaItem
- (instancetype)initWithAttachement:(TSAttachementStream*)attachement;
- (instancetype)initWithAttachment:(TSAttachmentStream*)attachment;
- (BOOL)isImage;

10
Signal/src/view controllers/TSAttachementAdapter.m → Signal/src/view controllers/TSAttachmentAdapter.m
View File

@ -6,12 +6,12 @@
// Copyright (c) 2014 Open Whisper Systems. All rights reserved.
//
#import "TSAttachementAdapter.h"
#import "TSAttachmentAdapter.h"
#import "UIDevice+TSHardwareVersion.h"
#import "JSQMessagesMediaViewBubbleImageMasker.h"
@interface TSAttachementAdapter ()
@interface TSAttachmentAdapter ()
@property UIImage *image;
@ -20,13 +20,13 @@
@end
@implementation TSAttachementAdapter
@implementation TSAttachmentAdapter
- (instancetype)initWithAttachement:(TSAttachementStream*)attachement{
- (instancetype)initWithAttachment:(TSAttachmentStream*)attachment{
self = [super init];
if (self) {
_image = [UIImage imageWithCGImage:attachement.image.CGImage];
_image = [UIImage imageWithCGImage:attachment.image.CGImage];
_cachedImageView = nil;
_isImageAttachment = YES;
}

18
Signal/src/view controllers/TSMessageAdapter.m
View File

@ -12,9 +12,9 @@
#import "TSCall.h"
#import "TSInfoMessage.h"
#import "TSErrorMessage.h"
#import "TSAttachement.h"
#import "TSAttachementStream.h"
#import "TSAttachementAdapter.h"
#import "TSattachment.h"
#import "TSAttachmentStream.h"
#import "TSAttachmentAdapter.h"
@interface TSMessageAdapter ()
@ -88,16 +88,16 @@
TSMessage *message = (TSMessage*)interaction;
adapter.messageBody = message.body;
if (message.attachements > 0) {
if (message.attachments > 0) {
for (NSString *attachementID in message.attachements) {
TSAttachement *attachement = [TSAttachement fetchObjectWithUniqueID:attachementID];
for (NSString *attachmentID in message.attachments) {
TSAttachment *attachment = [TSAttachment fetchObjectWithUniqueID:attachmentID];
if ([attachement isKindOfClass:[TSAttachementStream class]]) {
TSAttachementStream *stream = (TSAttachementStream*)attachement;
if ([attachment isKindOfClass:[TSAttachmentStream class]]) {
TSAttachmentStream *stream = (TSAttachmentStream*)attachment;
if ([stream isImage]) {
adapter.mediaItem = [[TSAttachementAdapter alloc] initWithAttachement:stream];
adapter.mediaItem = [[TSAttachmentAdapter alloc] initWithAttachment:stream];
adapter.mediaItem.appliesMediaViewMaskAsOutgoing = [interaction isKindOfClass:[TSOutgoingMessage class]];
}
}

8
Signal/test/textsecure/TSMessageStorageTests.m
View File

@ -57,7 +57,7 @@
TSIncomingMessage *newMessage = [[TSIncomingMessage alloc] initWithTimestamp:timestamp
inThread:self.thread
messageBody:body
attachements:nil];
attachments:nil];
[[TSStorageManager sharedManager].newDatabaseConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
[newMessage saveWithTransaction:transaction];
}];
@ -65,7 +65,7 @@
TSIncomingMessage *fetchedMessage = [TSIncomingMessage fetchObjectWithUniqueID:[TSInteraction stringFromTimeStamp:timestamp]];
NSAssert([fetchedMessage.body isEqualToString:body], @"Body of incoming message recovered");
NSAssert(fetchedMessage.attachements == nil, @"Attachements are nil");
NSAssert(fetchedMessage.attachments == nil, @"attachments are nil");
NSAssert([fetchedMessage.uniqueId isEqualToString:[TSInteraction stringFromTimeStamp:timestamp]], @"Unique identifier is accurate");
NSAssert(fetchedMessage.wasRead == false, @"Message should originally be unread");
NSAssert([fetchedMessage.uniqueThreadId isEqualToString:self.thread.uniqueId], @"Isn't stored in the right thread!");
@ -79,7 +79,7 @@
TSIncomingMessage *newMessage = [[TSIncomingMessage alloc] initWithTimestamp:i
inThread:self.thread
messageBody:body
attachements:nil];
attachments:nil];
[newMessage save];
}
@ -90,7 +90,7 @@
TSIncomingMessage *fetchedMessage = [TSIncomingMessage fetchObjectWithUniqueID:[TSInteraction stringFromTimeStamp:timestamp] transaction:transaction];
NSAssert([fetchedMessage.body isEqualToString:body], @"Body of incoming message recovered");
NSAssert(fetchedMessage.attachements == nil, @"Attachements are nil");
NSAssert(fetchedMessage.attachments == nil, @"attachments are nil");
NSAssert([fetchedMessage.uniqueId isEqualToString:[TSInteraction stringFromTimeStamp:timestamp]], @"Unique identifier is accurate");
NSAssert(fetchedMessage.wasRead == false, @"Message should originally be unread");
NSAssert([fetchedMessage.uniqueThreadId isEqualToString:self.thread.uniqueId], @"Isn't stored in the right thread!");