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

rename our custom JSQ classes to OWS so it's clear what is/not our code.

Browse Source 
This was done as part of unforking JSQMessagesViewController, but is
intentionally a separate commit so we can separate formatting changes
from code changes in git history.

* Import frameworks like:
    #import <FrameworkName/HeaderName.h>
* instead of:
    #import "HeaderName.h"

// FREEBIE
pull/1/head
Michael Kirk 9 years ago
parent 933281f234
commit e930574b1b
30 changed files with 211 additions and 305 deletions
Show Stats Download Patch File Download Diff File

108
Signal.xcodeproj/project.pbxproj
Unescape Escape View File

@ -9,24 +9,24 @@
/* Begin PBXBuildFile section */
0DD55B166906AF3368995978 /* libPods-Signal.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 80CD5E19DD23200E7926EEA7 /* libPods-Signal.a */; };
30209C98DABCE82064B4EAF5 /* libPods-SignalTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A33D3C7EB4B17BDBD47F0FCC /* libPods-SignalTests.a */; };
453D28B31D32B87100D523F0 /* JSQErrorMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 453D28B01D32B87100D523F0 /* JSQErrorMessage.m */; };
453D28B41D32B87100D523F0 /* JSQInfoMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 453D28B21D32B87100D523F0 /* JSQInfoMessage.m */; };
453D28B71D32BA5F00D523F0 /* JSQDisplayedMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 453D28B61D32BA5F00D523F0 /* JSQDisplayedMessage.m */; };
453D28B31D32B87100D523F0 /* OWSErrorMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 453D28B01D32B87100D523F0 /* OWSErrorMessage.m */; };
453D28B41D32B87100D523F0 /* OWSInfoMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 453D28B21D32B87100D523F0 /* OWSInfoMessage.m */; };
453D28B71D32BA5F00D523F0 /* OWSDisplayedMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 453D28B61D32BA5F00D523F0 /* OWSDisplayedMessage.m */; };
453D28BA1D332DB100D523F0 /* OWSMessagesBubblesSizeCalculator.m in Sources */ = {isa = PBXBuildFile; fileRef = 453D28B91D332DB100D523F0 /* OWSMessagesBubblesSizeCalculator.m */; };
453D28BB1D332DB100D523F0 /* OWSMessagesBubblesSizeCalculator.m in Sources */ = {isa = PBXBuildFile; fileRef = 453D28B91D332DB100D523F0 /* OWSMessagesBubblesSizeCalculator.m */; };
45843D1F1D2236B30013E85A /* OWSContactsSearcher.m in Sources */ = {isa = PBXBuildFile; fileRef = 45843D1E1D2236B30013E85A /* OWSContactsSearcher.m */; };
45843D201D2236B30013E85A /* OWSContactsSearcher.m in Sources */ = {isa = PBXBuildFile; fileRef = 45843D1E1D2236B30013E85A /* OWSContactsSearcher.m */; };
45843D221D223BA10013E85A /* OWSContactsSearcherTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 45843D211D223BA10013E85A /* OWSContactsSearcherTest.m */; };
45C681B71D305A580050903A /* JSQCall.m in Sources */ = {isa = PBXBuildFile; fileRef = 45C681B61D305A580050903A /* JSQCall.m */; };
45C681B81D305A580050903A /* JSQCall.m in Sources */ = {isa = PBXBuildFile; fileRef = 45C681B61D305A580050903A /* JSQCall.m */; };
45C681BC1D305C080050903A /* JSQCallCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 45C681BA1D305C080050903A /* JSQCallCollectionViewCell.m */; };
45C681BD1D305C080050903A /* JSQCallCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 45C681BA1D305C080050903A /* JSQCallCollectionViewCell.m */; };
45C681C41D305C9E0050903A /* JSQCallCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 45C681C01D305C9E0050903A /* JSQCallCollectionViewCell.xib */; };
45C681C51D305C9E0050903A /* JSQCallCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 45C681C01D305C9E0050903A /* JSQCallCollectionViewCell.xib */; };
45C681C61D305C9E0050903A /* JSQDisplayedMessageCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 45C681C21D305C9E0050903A /* JSQDisplayedMessageCollectionViewCell.m */; };
45C681C71D305C9E0050903A /* JSQDisplayedMessageCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 45C681C21D305C9E0050903A /* JSQDisplayedMessageCollectionViewCell.m */; };
45C681C81D305C9E0050903A /* JSQDisplayedMessageCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 45C681C31D305C9E0050903A /* JSQDisplayedMessageCollectionViewCell.xib */; };
45C681C91D305C9E0050903A /* JSQDisplayedMessageCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 45C681C31D305C9E0050903A /* JSQDisplayedMessageCollectionViewCell.xib */; };
45C681B71D305A580050903A /* OWSCall.m in Sources */ = {isa = PBXBuildFile; fileRef = 45C681B61D305A580050903A /* OWSCall.m */; };
45C681B81D305A580050903A /* OWSCall.m in Sources */ = {isa = PBXBuildFile; fileRef = 45C681B61D305A580050903A /* OWSCall.m */; };
45C681BC1D305C080050903A /* OWSCallCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 45C681BA1D305C080050903A /* OWSCallCollectionViewCell.m */; };
45C681BD1D305C080050903A /* OWSCallCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 45C681BA1D305C080050903A /* OWSCallCollectionViewCell.m */; };
45C681C41D305C9E0050903A /* OWSCallCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 45C681C01D305C9E0050903A /* OWSCallCollectionViewCell.xib */; };
45C681C51D305C9E0050903A /* OWSCallCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 45C681C01D305C9E0050903A /* OWSCallCollectionViewCell.xib */; };
45C681C61D305C9E0050903A /* OWSDisplayedMessageCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 45C681C21D305C9E0050903A /* OWSDisplayedMessageCollectionViewCell.m */; };
45C681C71D305C9E0050903A /* OWSDisplayedMessageCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 45C681C21D305C9E0050903A /* OWSDisplayedMessageCollectionViewCell.m */; };
45C681C81D305C9E0050903A /* OWSDisplayedMessageCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 45C681C31D305C9E0050903A /* OWSDisplayedMessageCollectionViewCell.xib */; };
45C681C91D305C9E0050903A /* OWSDisplayedMessageCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 45C681C31D305C9E0050903A /* OWSDisplayedMessageCollectionViewCell.xib */; };
45CB2FA81CB7146C00E1B343 /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 45CB2FA71CB7146C00E1B343 /* Launch Screen.storyboard */; };
4CE0E3771B954546007210CF /* TSAnimatedAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CE0E3761B954546007210CF /* TSAnimatedAdapter.m */; };
701231B518ECAA4500D456C4 /* EvpMessageDigest.m in Sources */ = {isa = PBXBuildFile; fileRef = 701231B418ECAA4500D456C4 /* EvpMessageDigest.m */; };
@ -506,26 +506,26 @@
/* Begin PBXFileReference section */
453CC0361D08E1A60040EBA3 /* sn */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sn; path = translations/sn.lproj/Localizable.strings; sourceTree = "<group>"; };
453D28AF1D32B87100D523F0 /* JSQErrorMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSQErrorMessage.h; sourceTree = "<group>"; };
453D28B01D32B87100D523F0 /* JSQErrorMessage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSQErrorMessage.m; sourceTree = "<group>"; };
453D28B11D32B87100D523F0 /* JSQInfoMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSQInfoMessage.h; sourceTree = "<group>"; };
453D28B21D32B87100D523F0 /* JSQInfoMessage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSQInfoMessage.m; sourceTree = "<group>"; };
453D28B51D32BA5F00D523F0 /* JSQDisplayedMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSQDisplayedMessage.h; sourceTree = "<group>"; };
453D28B61D32BA5F00D523F0 /* JSQDisplayedMessage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSQDisplayedMessage.m; sourceTree = "<group>"; };
453D28AF1D32B87100D523F0 /* OWSErrorMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSErrorMessage.h; sourceTree = "<group>"; };
453D28B01D32B87100D523F0 /* OWSErrorMessage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSErrorMessage.m; sourceTree = "<group>"; };
453D28B11D32B87100D523F0 /* OWSInfoMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSInfoMessage.h; sourceTree = "<group>"; };
453D28B21D32B87100D523F0 /* OWSInfoMessage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSInfoMessage.m; sourceTree = "<group>"; };
453D28B51D32BA5F00D523F0 /* OWSDisplayedMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSDisplayedMessage.h; sourceTree = "<group>"; };
453D28B61D32BA5F00D523F0 /* OWSDisplayedMessage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSDisplayedMessage.m; sourceTree = "<group>"; };
453D28B81D332DB100D523F0 /* OWSMessagesBubblesSizeCalculator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSMessagesBubblesSizeCalculator.h; sourceTree = "<group>"; };
453D28B91D332DB100D523F0 /* OWSMessagesBubblesSizeCalculator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSMessagesBubblesSizeCalculator.m; sourceTree = "<group>"; };
454B35071D08EED80026D658 /* mk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = mk; path = translations/mk.lproj/Localizable.strings; sourceTree = "<group>"; };
45843D1D1D2236B30013E85A /* OWSContactsSearcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSContactsSearcher.h; sourceTree = "<group>"; };
45843D1E1D2236B30013E85A /* OWSContactsSearcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSContactsSearcher.m; sourceTree = "<group>"; };
45843D211D223BA10013E85A /* OWSContactsSearcherTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSContactsSearcherTest.m; sourceTree = "<group>"; };
45C681B51D305A580050903A /* JSQCall.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSQCall.h; sourceTree = "<group>"; };
45C681B61D305A580050903A /* JSQCall.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSQCall.m; sourceTree = "<group>"; };
45C681B91D305C080050903A /* JSQCallCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSQCallCollectionViewCell.h; sourceTree = "<group>"; };
45C681BA1D305C080050903A /* JSQCallCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSQCallCollectionViewCell.m; sourceTree = "<group>"; };
45C681C01D305C9E0050903A /* JSQCallCollectionViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = JSQCallCollectionViewCell.xib; sourceTree = "<group>"; };
45C681C11D305C9E0050903A /* JSQDisplayedMessageCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSQDisplayedMessageCollectionViewCell.h; sourceTree = "<group>"; };
45C681C21D305C9E0050903A /* JSQDisplayedMessageCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSQDisplayedMessageCollectionViewCell.m; sourceTree = "<group>"; };
45C681C31D305C9E0050903A /* JSQDisplayedMessageCollectionViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = JSQDisplayedMessageCollectionViewCell.xib; sourceTree = "<group>"; };
45C681B51D305A580050903A /* OWSCall.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSCall.h; sourceTree = "<group>"; };
45C681B61D305A580050903A /* OWSCall.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSCall.m; sourceTree = "<group>"; };
45C681B91D305C080050903A /* OWSCallCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSCallCollectionViewCell.h; sourceTree = "<group>"; };
45C681BA1D305C080050903A /* OWSCallCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSCallCollectionViewCell.m; sourceTree = "<group>"; };
45C681C01D305C9E0050903A /* OWSCallCollectionViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = OWSCallCollectionViewCell.xib; sourceTree = "<group>"; };
45C681C11D305C9E0050903A /* OWSDisplayedMessageCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSDisplayedMessageCollectionViewCell.h; sourceTree = "<group>"; };
45C681C21D305C9E0050903A /* OWSDisplayedMessageCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSDisplayedMessageCollectionViewCell.m; sourceTree = "<group>"; };
45C681C31D305C9E0050903A /* OWSDisplayedMessageCollectionViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = OWSDisplayedMessageCollectionViewCell.xib; sourceTree = "<group>"; };
45CB2FA71CB7146C00E1B343 /* Launch Screen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = "Launch Screen.storyboard"; path = "Signal/src/util/Launch Screen.storyboard"; sourceTree = SOURCE_ROOT; };
45E282DE1D08E67800ADD4C8 /* gl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = gl; path = translations/gl.lproj/Localizable.strings; sourceTree = "<group>"; };
45E282DF1D08E6CC00ADD4C8 /* id */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = id; path = translations/id.lproj/Localizable.strings; sourceTree = "<group>"; };
@ -1125,14 +1125,14 @@
isa = PBXGroup;
children = (
B62D53F41A23CC8B009AAF82 /* TSMessageAdapters */,
453D28B51D32BA5F00D523F0 /* JSQDisplayedMessage.h */,
453D28B61D32BA5F00D523F0 /* JSQDisplayedMessage.m */,
453D28AF1D32B87100D523F0 /* JSQErrorMessage.h */,
453D28B01D32B87100D523F0 /* JSQErrorMessage.m */,
453D28B11D32B87100D523F0 /* JSQInfoMessage.h */,
453D28B21D32B87100D523F0 /* JSQInfoMessage.m */,
45C681B51D305A580050903A /* JSQCall.h */,
45C681B61D305A580050903A /* JSQCall.m */,
453D28B51D32BA5F00D523F0 /* OWSDisplayedMessage.h */,
453D28B61D32BA5F00D523F0 /* OWSDisplayedMessage.m */,
453D28AF1D32B87100D523F0 /* OWSErrorMessage.h */,
453D28B01D32B87100D523F0 /* OWSErrorMessage.m */,
453D28B11D32B87100D523F0 /* OWSInfoMessage.h */,
453D28B21D32B87100D523F0 /* OWSInfoMessage.m */,
45C681B51D305A580050903A /* OWSCall.h */,
45C681B61D305A580050903A /* OWSCall.m */,
453D28B81D332DB100D523F0 /* OWSMessagesBubblesSizeCalculator.h */,
453D28B91D332DB100D523F0 /* OWSMessagesBubblesSizeCalculator.m */,
);
@ -1679,12 +1679,12 @@
76EB052B18170B33006006FC /* Views */ = {
isa = PBXGroup;
children = (
45C681C11D305C9E0050903A /* JSQDisplayedMessageCollectionViewCell.h */,
45C681C21D305C9E0050903A /* JSQDisplayedMessageCollectionViewCell.m */,
45C681C31D305C9E0050903A /* JSQDisplayedMessageCollectionViewCell.xib */,
45C681B91D305C080050903A /* JSQCallCollectionViewCell.h */,
45C681BA1D305C080050903A /* JSQCallCollectionViewCell.m */,
45C681C01D305C9E0050903A /* JSQCallCollectionViewCell.xib */,
45C681C11D305C9E0050903A /* OWSDisplayedMessageCollectionViewCell.h */,
45C681C21D305C9E0050903A /* OWSDisplayedMessageCollectionViewCell.m */,
45C681C31D305C9E0050903A /* OWSDisplayedMessageCollectionViewCell.xib */,
45C681B91D305C080050903A /* OWSCallCollectionViewCell.h */,
45C681BA1D305C080050903A /* OWSCallCollectionViewCell.m */,
45C681C01D305C9E0050903A /* OWSCallCollectionViewCell.xib */,
A5509ECB1A69B1D600ABA4BC /* CountryCodeTableViewCell.h */,
A5509ECC1A69B1D600ABA4BC /* CountryCodeTableViewCell.m */,
FCAC963D19FEF99A0046DFC5 /* InboxTableViewCell.h */,
@ -2446,7 +2446,7 @@
A5509ECA1A69AB8B00ABA4BC /* Storyboard.storyboard in Resources */,
A507A3B11A6C60E300BEED0D /* InboxTableViewCell.xib in Resources */,
AD83FF421A73426500B5C81A /* audio_play_button.png in Resources */,
45C681C41D305C9E0050903A /* JSQCallCollectionViewCell.xib in Resources */,
45C681C41D305C9E0050903A /* OWSCallCollectionViewCell.xib in Resources */,
B633C5C41A1D190B0059AC12 /* mute_on@2x.png in Resources */,
B633C5CE1A1D190B0059AC12 /* quit@2x.png in Resources */,
AD83FF441A73426500B5C81A /* audio_pause_button.png in Resources */,
@ -2455,7 +2455,7 @@
B633C59D1A1D190B0059AC12 /* endcall@2x.png in Resources */,
FC5CDF391A3393DD00B47253 /* error_white@2x.png in Resources */,
B633C5D21A1D190B0059AC12 /* savephoto@2x.png in Resources */,
45C681C81D305C9E0050903A /* JSQDisplayedMessageCollectionViewCell.xib in Resources */,
45C681C81D305C9E0050903A /* OWSDisplayedMessageCollectionViewCell.xib in Resources */,
B10C9B611A7049EC00ECA2BF /* play_icon.png in Resources */,
AD83FF401A73426500B5C81A /* audio_pause_button_blue@2x.png in Resources */,
B66DBF4A19D5BBC8006EA940 /* Images.xcassets in Resources */,
@ -2492,8 +2492,8 @@
files = (
B660F6D41C29868000687D6E /* whisperFake.cer in Resources */,
76EB060118170B33006006FC /* InitiateSignal.proto in Resources */,
45C681C91D305C9E0050903A /* JSQDisplayedMessageCollectionViewCell.xib in Resources */,
45C681C51D305C9E0050903A /* JSQCallCollectionViewCell.xib in Resources */,
45C681C91D305C9E0050903A /* OWSDisplayedMessageCollectionViewCell.xib in Resources */,
45C681C51D305C9E0050903A /* OWSCallCollectionViewCell.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -2652,7 +2652,7 @@
76EB05A618170B33006006FC /* RtpPacket.m in Sources */,
76EB064218170B33006006FC /* StringUtil.m in Sources */,
A547DD741A70A87800103EC7 /* DJWActionSheet+OWS.m in Sources */,
45C681B71D305A580050903A /* JSQCall.m in Sources */,
45C681B71D305A580050903A /* OWSCall.m in Sources */,
76EB062618170B33006006FC /* Queue.m in Sources */,
D221A09A169C9E5E00537ABF /* main.m in Sources */,
45843D1F1D2236B30013E85A /* OWSContactsSearcher.m in Sources */,
@ -2663,18 +2663,18 @@
76EB05FE18170B33006006FC /* InitiateSignal.pb.m in Sources */,
76EB05CA18170B33006006FC /* RecipientUnavailable.m in Sources */,
E197B61418BBEC1A00F073E5 /* DropoutTracker.m in Sources */,
453D28B41D32B87100D523F0 /* JSQInfoMessage.m in Sources */,
453D28B41D32B87100D523F0 /* OWSInfoMessage.m in Sources */,
FCAC963C19FEF9280046DFC5 /* SignalsViewController.m in Sources */,
76EB05DA18170B33006006FC /* LowLatencyConnector.m in Sources */,
76EB05EE18170B33006006FC /* CallTermination.m in Sources */,
B66B9F7D1AEAF40500E2E609 /* NotificationSettingsOptionsViewController.m in Sources */,
453D28B31D32B87100D523F0 /* JSQErrorMessage.m in Sources */,
453D28B31D32B87100D523F0 /* OWSErrorMessage.m in Sources */,
E1CD329618BCFF9900B1A496 /* SoundInstance.m in Sources */,
76EB05B418170B33006006FC /* HashChain.m in Sources */,
76EB05E418170B33006006FC /* UdpSocket.m in Sources */,
76EB058218170B33006006FC /* Environment.m in Sources */,
76EB064418170B33006006FC /* ThreadManager.m in Sources */,
45C681C61D305C9E0050903A /* JSQDisplayedMessageCollectionViewCell.m in Sources */,
45C681C61D305C9E0050903A /* OWSDisplayedMessageCollectionViewCell.m in Sources */,
E197B61E18BBEC6D00F073E5 /* AudioRouter.m in Sources */,
E197B60D18BBEC1A00F073E5 /* AudioSocket.m in Sources */,
A5D0699B1A50E9CB004CB540 /* ShowGroupMembersViewController.m in Sources */,
@ -2726,7 +2726,7 @@
E16E5BF018AAC40200B7C403 /* EvpKeyAgreement.m in Sources */,
FCFD25821A154B3800F4C644 /* CodeVerificationViewController.m in Sources */,
B65EDA1219E1BE6400AAA7CB /* RPAPICall.m in Sources */,
453D28B71D32BA5F00D523F0 /* JSQDisplayedMessage.m in Sources */,
453D28B71D32BA5F00D523F0 /* OWSDisplayedMessage.m in Sources */,
76EB05DC18170B33006006FC /* StreamPair.m in Sources */,
76EB064618170B33006006FC /* TimeUtil.m in Sources */,
70BAFD5D190584BE00FA5E0B /* NotificationTracker.m in Sources */,
@ -2764,7 +2764,7 @@
B63761E319E1F487005735D1 /* AFHTTPSessionManager+SignalMethods.m in Sources */,
76EB05CC18170B33006006FC /* ShortAuthenticationStringGenerator.m in Sources */,
E16E5BEF18AAC40200B7C403 /* EC25KeyAgreementProtocol.m in Sources */,
45C681BC1D305C080050903A /* JSQCallCollectionViewCell.m in Sources */,
45C681BC1D305C080050903A /* OWSCallCollectionViewCell.m in Sources */,
76EB064018170B33006006FC /* AnonymousTerminator.m in Sources */,
76EB058818170B33006006FC /* PropertyListPreferences.m in Sources */,
76EB05B218170B33006006FC /* DH3KKeyAgreementProtocol.m in Sources */,
@ -2843,7 +2843,7 @@
B660F7341C29988E00687D6E /* RtpSocket.m in Sources */,
B660F7351C29988E00687D6E /* SequenceCounter.m in Sources */,
B660F7361C29988E00687D6E /* SrtpSocket.m in Sources */,
45C681C71D305C9E0050903A /* JSQDisplayedMessageCollectionViewCell.m in Sources */,
45C681C71D305C9E0050903A /* OWSDisplayedMessageCollectionViewCell.m in Sources */,
B660F7371C29988E00687D6E /* SrtpStream.m in Sources */,
B660F7381C29988E00687D6E /* DH3KKeyAgreementParticipant.m in Sources */,
B660F7391C29988E00687D6E /* DH3KKeyAgreementProtocol.m in Sources */,
@ -2864,7 +2864,7 @@
B660F7481C29988E00687D6E /* RecipientUnavailable.m in Sources */,
45843D201D2236B30013E85A /* OWSContactsSearcher.m in Sources */,
B660F7491C29988E00687D6E /* ShortAuthenticationStringGenerator.m in Sources */,
45C681BD1D305C080050903A /* JSQCallCollectionViewCell.m in Sources */,
45C681BD1D305C080050903A /* OWSCallCollectionViewCell.m in Sources */,
B660F74A1C29988E00687D6E /* ZrtpHandshakeResult.m in Sources */,
B660F74B1C29988E00687D6E /* ZrtpHandshakeSocket.m in Sources */,
B660F74C1C29988E00687D6E /* ZrtpInitiator.m in Sources */,
@ -2896,7 +2896,7 @@
B660F7641C29988E00687D6E /* InitiateSignal.pb.m in Sources */,
B660F7651C29988E00687D6E /* InitiatorSessionDescriptor.m in Sources */,
B660F7661C29988E00687D6E /* ResponderSessionDescriptor.m in Sources */,
45C681B81D305A580050903A /* JSQCall.m in Sources */,
45C681B81D305A580050903A /* OWSCall.m in Sources */,
B660F7671C29988E00687D6E /* SignalUtil.m in Sources */,
B660F7681C29988E00687D6E /* CategorizingLogger.m in Sources */,
B660F7691C29988E00687D6E /* DecayingSampleEstimator.m in Sources */,

36
Signal/src/Models/JSQErrorMessage.h
Unescape Escape View File

@ -1,36 +0,0 @@
//
// JSQErrorMessage.h
// JSQMessages
//
// Created by Dylan Bourgeois on 29/11/14.
// Copyright (c) 2014 Hexed Bits. All rights reserved.
//
#import "JSQDisplayedMessage.h"
typedef NS_ENUM(NSInteger, JSQErrorMessageType) {
JSQErrorMessageNoSession,
JSQErrorMessageWrongTrustedIdentityKey,
JSQErrorMessageInvalidKeyException,
JSQErrorMessageMissingKeyId,
JSQErrorMessageInvalidMessage,
JSQErrorMessageDuplicateMessage,
JSQErrorMessageInvalidVersion
};
@interface JSQErrorMessage : JSQDisplayedMessage
@property (nonatomic) JSQErrorMessageType errorMessageType;
@property (nonatomic) TSMessageAdapterType messageType;
#pragma mark - Initialization
- (instancetype)initWithErrorType:(JSQErrorMessageType)messageType
senderId:(NSString *)senderId
senderDisplayName:(NSString *)senderDisplayName
date:(NSDate *)date;
- (NSString *)text;
@end

31
Signal/src/Models/JSQInfoMessage.h
Unescape Escape View File

@ -1,31 +0,0 @@
//
// JSQInfoMessage.h
// JSQMessages
//
// Created by Dylan Bourgeois on 29/11/14.
// Copyright (c) 2014 Hexed Bits. All rights reserved.
//
#import "JSQDisplayedMessage.h"
typedef NS_ENUM(NSInteger, JSQInfoMessageType) {
JSQInfoMessageTypeSessionDidEnd,
};
@interface JSQInfoMessage : JSQDisplayedMessage
@property (nonatomic) JSQInfoMessageType infoMessageType;
@property (nonatomic) TSMessageAdapterType messageType;
#pragma mark - Initialization
- (instancetype)initWithInfoType:(JSQInfoMessageType)messageType
senderId:(NSString *)senderId
senderDisplayName:(NSString *)senderDisplayName
date:(NSDate *)date;
- (NSString *)text;
@end

13
Signal/src/Models/JSQCall.h → Signal/src/Models/OWSCall.h
Unescape Escape View File

@ -1,14 +1,9 @@
//
// JSQCall.h
// JSQMessages
//
// Created by Dylan Bourgeois on 20/11/14.
//
// Portions Copyright (c) 2016 Open Whisper Systems. All rights reserved.
#import <Foundation/Foundation.h>
#import "JSQMessageData.h"
#import "TSMessageAdapter.h"
#import <Foundation/Foundation.h>
#import <JSQMessagesViewController/JSQMessageData.h>
typedef enum : NSUInteger {
kCallOutgoing = 1,
@ -20,7 +15,7 @@ typedef enum : NSUInteger {
} CallStatus;
@interface JSQCall : NSObject <JSQMessageData, NSCoding, NSCopying>
@interface OWSCall : NSObject <JSQMessageData, NSCoding, NSCopying>
/*
* Returns the string Id of the user who initiated the call

16
Signal/src/Models/JSQCall.m → Signal/src/Models/OWSCall.m
Unescape Escape View File

@ -1,16 +1,12 @@
//
// JSQCall.m
// JSQMessages
//
// Created by Dylan Bourgeois on 20/11/14.
//
// Portions Copyright (c) 2016 Open Whisper Systems. All rights reserved.
#import "JSQCall.h"
#import "OWSCall.h"
#import "JSQMessagesTimestampFormatter.h"
#import "UIImage+JSQMessages.h"
#import <JSQMessagesViewController/JSQMessagesTimestampFormatter.h>
#import <JSQMessagesViewController/UIImage+JSQMessages.h>
@implementation JSQCall
@implementation OWSCall
#pragma mark - Initialzation
@ -102,7 +98,7 @@
return NO;
}
JSQCall *aCall = (JSQCall *)object;
OWSCall *aCall = (OWSCall *)object;
return [self.senderId isEqualToString:aCall.senderId] &&
[self.senderDisplayName isEqualToString:aCall.senderDisplayName]

15
Signal/src/Models/JSQDisplayedMessage.h → Signal/src/Models/OWSDisplayedMessage.h
Unescape Escape View File

@ -1,24 +1,19 @@
//
// JSQDisplayedMessage.h
// JSQMessages
//
// Created by Dylan Bourgeois on 29/11/14.
// Copyright (c) 2014 Hexed Bits. All rights reserved.
//
// Portions Copyright (c) 2016 Open Whisper Systems. All rights reserved.
#import "JSQMessageData.h"
#import "TSMessageAdapter.h"
#import <Foundation/Foundation.h>
/* JSQDisplayed message is the parent class for displaying information to the user
/* OWSDisplayedMessage message is the parent class for displaying information to the user
* from within the conversation view. Do not use directly :
*
* @see JSQInfoMessage
* @see JSQErrorMessage
* @see OWSInfoMessage
* @see OWSErrorMessage
*
*/
@interface JSQDisplayedMessage : NSObject <JSQMessageData>
@interface OWSDisplayedMessage : NSObject <JSQMessageData>
/*
* Returns the unique identifier of the person affected by the displayed message

10
Signal/src/Models/JSQDisplayedMessage.m → Signal/src/Models/OWSDisplayedMessage.m
Unescape Escape View File

@ -1,14 +1,10 @@
//
// JSQDisplayedMessage.m
// JSQMessages
//
// Created by Dylan Bourgeois on 29/11/14.
// Copyright (c) 2014 Hexed Bits. All rights reserved.
//
// Portions Copyright (c) 2016 Open Whisper Systems. All rights reserved.
#import "JSQDisplayedMessage.h"
#import "OWSDisplayedMessage.h"
@implementation JSQDisplayedMessage
@implementation OWSDisplayedMessage
- (id)init
{

32
Signal/src/Models/OWSErrorMessage.h
Unescape Escape View File

@ -0,0 +1,32 @@
// Created by Dylan Bourgeois on 29/11/14.
// Copyright (c) 2014 Hexed Bits. All rights reserved.
// Portions Copyright (c) 2016 Open Whisper Systems. All rights reserved.
#import "OWSDisplayedMessage.h"
#import "TSMessageAdapter.h"
typedef NS_ENUM(NSInteger, OWSErrorMessageType) {
OWSErrorMessageNoSession,
OWSErrorMessageWrongTrustedIdentityKey,
OWSErrorMessageInvalidKeyException,
OWSErrorMessageMissingKeyId,
OWSErrorMessageInvalidMessage,
OWSErrorMessageDuplicateMessage,
OWSErrorMessageInvalidVersion
};
@interface OWSErrorMessage : OWSDisplayedMessage
@property (nonatomic) OWSErrorMessageType errorMessageType;
@property (nonatomic) TSMessageAdapterType messageType;
#pragma mark - Initialization
- (instancetype)initWithErrorType:(OWSErrorMessageType)messageType
senderId:(NSString *)senderId
senderDisplayName:(NSString *)senderDisplayName
date:(NSDate *)date;
- (NSString *)text;
@end

25
Signal/src/Models/JSQErrorMessage.m → Signal/src/Models/OWSErrorMessage.m
Unescape Escape View File

@ -1,16 +1,11 @@
//
// JSQErrorMessage.m
// JSQMessages
//
// Created by Dylan Bourgeois on 29/11/14.
// Copyright (c) 2014 Hexed Bits. All rights reserved.
//
#import "JSQErrorMessage.h"
#import "OWSErrorMessage.h"
@implementation JSQErrorMessage
@implementation OWSErrorMessage
- (instancetype)initWithErrorType:(JSQErrorMessageType)messageType
- (instancetype)initWithErrorType:(OWSErrorMessageType)messageType
senderId:(NSString *)senderId
senderDisplayName:(NSString *)senderDisplayName
date:(NSDate *)date
@ -28,25 +23,25 @@
- (NSString *)text
{
switch (self.errorMessageType) {
case JSQErrorMessageNoSession:
case OWSErrorMessageNoSession:
return [NSString stringWithFormat:@"No session error"];
break;
case JSQErrorMessageWrongTrustedIdentityKey:
case OWSErrorMessageWrongTrustedIdentityKey:
return [NSString stringWithFormat:@"Error : Wrong trusted identity key for %@.", self.senderDisplayName];
break;
case JSQErrorMessageInvalidKeyException:
case OWSErrorMessageInvalidKeyException:
return [NSString stringWithFormat:@"Error : Invalid key exception for %@.", self.senderDisplayName];
break;
case JSQErrorMessageMissingKeyId:
case OWSErrorMessageMissingKeyId:
return [NSString stringWithFormat:@"Error: Missing key identifier for %@", self.senderDisplayName];
break;
case JSQErrorMessageInvalidMessage:
case OWSErrorMessageInvalidMessage:
return [NSString stringWithFormat:@"Error: Invalid message"];
break;
case JSQErrorMessageDuplicateMessage:
case OWSErrorMessageDuplicateMessage:
return [NSString stringWithFormat:@"Error: Duplicate message"];
break;
case JSQErrorMessageInvalidVersion:
case OWSErrorMessageInvalidVersion:
return [NSString stringWithFormat:@"Error: Invalid version for contact %@.", self.senderDisplayName];
break;

27
Signal/src/Models/OWSInfoMessage.h
Unescape Escape View File

@ -0,0 +1,27 @@
// Created by Dylan Bourgeois on 29/11/14.
// Copyright (c) 2014 Hexed Bits. All rights reserved.
// Portions Copyright (c) 2016 Open Whisper Systems. All rights reserved.
#import "OWSDisplayedMessage.h"
#import "TSMessageAdapter.h"
typedef NS_ENUM(NSInteger, OWSInfoMessageType) {
OWSInfoMessageTypeSessionDidEnd,
};
@interface OWSInfoMessage : OWSDisplayedMessage
@property (nonatomic) OWSInfoMessageType infoMessageType;
@property (nonatomic) TSMessageAdapterType messageType;
#pragma mark - Initialization
- (instancetype)initWithInfoType:(OWSInfoMessageType)messageType
senderId:(NSString *)senderId
senderDisplayName:(NSString *)senderDisplayName
date:(NSDate *)date;
- (NSString *)text;
@end

14
Signal/src/Models/JSQInfoMessage.m → Signal/src/Models/OWSInfoMessage.m
Unescape Escape View File

@ -1,16 +1,12 @@
//
// JSQInfoMessage.m
// JSQMessages
//
// Created by Dylan Bourgeois on 29/11/14.
// Copyright (c) 2014 Hexed Bits. All rights reserved.
//
// Portions Copyright (c) 2016 Open Whisper Systems. All rights reserved.
#import "JSQInfoMessage.h"
#import "OWSInfoMessage.h"
@implementation JSQInfoMessage
@implementation OWSInfoMessage
- (instancetype)initWithInfoType:(JSQInfoMessageType)messageType
- (instancetype)initWithInfoType:(OWSInfoMessageType)messageType
senderId:(NSString *)senderId
senderDisplayName:(NSString *)senderDisplayName
date:(NSDate *)date
@ -30,7 +26,7 @@
- (NSString *)text
{
switch (self.infoMessageType) {
case JSQInfoMessageTypeSessionDidEnd:
case OWSInfoMessageTypeSessionDidEnd:
return [NSString stringWithFormat:@"Session with %@ ended.", self.senderDisplayName];
break;

8
Signal/src/Models/OWSMessagesBubblesSizeCalculator.h
Unescape Escape View File

@ -1,10 +1,4 @@
//
// OWSMessagesBubblesSizeCalculator.h
// Signal
//
// Created by Michael Kirk on 7/10/16.
// Copyright © 2016 Open Whisper Systems. All rights reserved.
//
// Copyright (c) 2016 Open Whisper Systems. All rights reserved.
#import <JSQMessagesViewController/JSQMessagesBubblesSizeCalculator.h>

10
Signal/src/Models/OWSMessagesBubblesSizeCalculator.m
Unescape Escape View File

@ -1,13 +1,7 @@
//
// OWSMessagesBubblesSizeCalculator.m
// Signal
//
// Created by Michael Kirk on 7/10/16.
// Copyright © 2016 Open Whisper Systems. All rights reserved.
//
// Copyright (c) 2016 Open Whisper Systems. All rights reserved.
#import "OWSMessagesBubblesSizeCalculator.h"
#import "JSQDisplayedMessageCollectionViewCell.h"
#import "OWSDisplayedMessageCollectionViewCell.h"
#import "TSMessageAdapter.h"
@implementation OWSMessagesBubblesSizeCalculator

3
Signal/src/Models/TSMessageAdapaters/TSAnimatedAdapter.m
Unescape Escape View File

@ -7,10 +7,9 @@
//
#import "TSAnimatedAdapter.h"
#import "FLAnimatedImage.h"
#import "JSQMessagesMediaViewBubbleImageMasker.h"
#import "UIDevice+TSHardwareVersion.h"
#import <JSQMessagesViewController/JSQMessagesMediaViewBubbleImageMasker.h>
@interface TSAnimatedAdapter ()

1
Signal/src/Models/TSMessageAdapaters/TSMessageAdapter.h
Unescape Escape View File

@ -8,7 +8,6 @@
#import <Foundation/Foundation.h>
#import <JSQMessagesViewController/JSQMessageData.h>
#import "TSInteraction.h"
#import "TSMessageAdapter.h"
#import "TSThread.h"

12
Signal/src/Models/TSMessageAdapaters/TSMessageAdapter.m
Unescape Escape View File

@ -6,9 +6,9 @@
// Copyright (c) 2014 Open Whisper Systems. All rights reserved.
//
#import "JSQCall.h"
#import "TSAttachmentPointer.h"
#import "TSCall.h"
#import "OWSCall.h"
#import "TSContentAdapters.h"
#import "TSErrorMessage.h"
#import "TSIncomingMessage.h"
@ -137,7 +137,7 @@
} else if ([interaction isKindOfClass:[TSCall class]]) {
adapter.messageBody = @"Placeholder for TSCalls";
adapter.messageType = TSCallAdapter;
JSQCall *call = [self jsqCallForTSCall:(TSCall *)interaction thread:(TSContactThread *)thread];
OWSCall *call = [self owsCallForTSCall:(TSCall *)interaction thread:(TSContactThread *)thread];
call.useThumbnail = NO; // disables use of iconography to represent group update actions
return call;
} else if ([interaction isKindOfClass:[TSInfoMessage class]]) {
@ -155,7 +155,7 @@
} else if (adapter.infoMessageType == TSInfoMessageTypeGroupUpdate) {
status = kGroupUpdate;
}
JSQCall *call = [[JSQCall alloc] initWithCallerId:@""
OWSCall *call = [[OWSCall alloc] initWithCallerId:@""
callerDisplayName:adapter.messageBody
date:nil
status:status
@ -177,7 +177,7 @@
return adapter;
}
+ (JSQCall *)jsqCallForTSCall:(TSCall *)call thread:(TSContactThread *)thread {
+ (OWSCall *)owsCallForTSCall:(TSCall *)call thread:(TSContactThread *)thread {
CallStatus status = 0;
NSString *name = thread.name;
NSString *detailString = @"";
@ -211,12 +211,12 @@
break;
}
JSQCall *jsqCall = [[JSQCall alloc] initWithCallerId:thread.contactIdentifier
OWSCall *owsCall = [[OWSCall alloc] initWithCallerId:thread.contactIdentifier
callerDisplayName:thread.name
date:call.date
status:status
displayString:detailString];
return jsqCall;
return owsCall;
}
- (NSString *)senderId {

5
Signal/src/Models/TSMessageAdapaters/TSPhotoAdapter.h
Unescape Escape View File

@ -1,10 +1,5 @@
//
// TSAttachementAdapter.h
// Signal
//
// Created by Frederic Jacobs on 17/12/14.
// Copyright (c) 2014 Open Whisper Systems. All rights reserved.
//
#import <Foundation/Foundation.h>
#import <JSQMessagesViewController/JSQPhotoMediaItem.h>

8
Signal/src/Models/TSMessageAdapaters/TSPhotoAdapter.m
Unescape Escape View File

@ -1,15 +1,9 @@
//
// TSAttachementAdapter.m
// Signal
//
// Created by Frederic Jacobs on 17/12/14.
// Copyright (c) 2014 Open Whisper Systems. All rights reserved.
//
#import "TSPhotoAdapter.h"
#import "JSQMessagesMediaViewBubbleImageMasker.h"
#import "UIDevice+TSHardwareVersion.h"
#import <JSQMessagesViewController/JSQMessagesMediaViewBubbleImageMasker.h>
@interface TSPhotoAdapter ()

5
Signal/src/Models/TSMessageAdapaters/TSVideoAttachmentAdapter.h
Unescape Escape View File

@ -1,10 +1,5 @@
//
// TSAttachementAdapter.h
// Signal
//
// Created by Frederic Jacobs on 17/12/14.
// Copyright (c) 2014 Open Whisper Systems. All rights reserved.
//
#import <Foundation/Foundation.h>
#import <JSQMessagesViewController/JSQVideoMediaItem.h>

14
Signal/src/Models/TSMessageAdapaters/TSVideoAttachmentAdapter.m
Unescape Escape View File

@ -1,19 +1,13 @@
//
// TSAttachementAdapter.m
// Signal
//
// Created by Frederic Jacobs on 17/12/14.
// Copyright (c) 2014 Open Whisper Systems. All rights reserved.
//
#import "TSMessagesManager.h"
#import "TSVideoAttachmentAdapter.h"
#import "FFCircularProgressView.h"
#import "JSQMessagesMediaViewBubbleImageMasker.h"
#import "MIMETypeUtil.h"
#import "SCWaveformView.h"
#import "TSMessagesManager.h"
#import "TSStorageManager+keyingMaterial.h"
#import <FFCircularProgressView.h>
#import <JSQMessagesViewController/JSQMessagesMediaViewBubbleImageMasker.h>
#import <SCWaveformView.h>
#define AUDIO_BAR_HEIGHT 36
@interface TSVideoAttachmentAdapter ()

9
Signal/src/view controllers/InboxTableViewCell.m
Unescape Escape View File

@ -1,19 +1,14 @@
//
// TableViewCell.m
// Signal
//
// Created by Dylan Bourgeois on 27/10/14.
// Copyright (c) 2014 Open Whisper Systems. All rights reserved.
//
#import <JSQMessagesViewController/JSQMessagesAvatarImageFactory.h>
#import <JSQMessagesViewController/UIImage+JSQMessages.h>
#import "Environment.h"
#import "InboxTableViewCell.h"
#import "JSQMessagesAvatarImageFactory.h"
#import "PreferencesUtil.h"
#import "TSContactThread.h"
#import "TSGroupThread.h"
#import "TSMessagesManager.h"
#import "UIImage+JSQMessages.h"
#import "Util.h"
#define ARCHIVE_IMAGE_VIEW_WIDTH 22.0f

11
Signal/src/view controllers/MessageComposeTableViewController.h
Unescape Escape View File

@ -7,14 +7,11 @@
//
#import <UIKit/UIKit.h>
#import <JSQMessagesViewController/JSQMessagesComposerTextView.h>
#import <JSQMessagesViewController/JSQMessagesInputToolbar.h>
#import <JSQMessagesViewController/JSQMessagesToolbarContentView.h>
#import <JSQMessagesViewController/JSQMessagesKeyboardController.h>
#import "Contact.h"
#import "JSQMessagesComposerTextView.h"
#import "JSQMessagesInputToolbar.h"
#import "JSQMessagesToolbarContentView.h"
#import "JSQMessagesKeyboardController.h"
#import "LocalizableText.h"
@interface MessageComposeTableViewController : UITableViewController

3
Signal/src/view controllers/MessagesViewController.h
Unescape Escape View File

@ -9,8 +9,7 @@
#import <AVFoundation/AVFoundation.h>
#import <MediaPlayer/MediaPlayer.h>
#import "APNavigationController.h"
#import "JSQMessages.h"
#import "JSQMessagesViewController.h"
#import <JSQMessagesViewController/JSQMessagesViewController.h>
#import "TSGroupModel.h"
@class TSThread;

49
Signal/src/view controllers/MessagesViewController.m
Unescape Escape View File

@ -14,13 +14,20 @@
#import <MobileCoreServices/UTCoreTypes.h>
#import <SignalServiceKit/TSAccountManager.h>
#import <YapDatabase/YapDatabaseView.h>
#import <JSQMessagesViewController/JSQMessagesBubbleImage.h>
#import <JSQMessagesViewController/JSQMessagesBubbleImageFactory.h>
#import <JSQMessagesViewController/JSQMessagesTimestampFormatter.h>
#import <JSQMessagesViewController/UIColor+JSQMessages.h>
#import <JSQMessagesViewController/JSQMessagesCollectionViewFlowLayoutInvalidationContext.h>
#import <JSQMessagesViewController/JSQSystemSoundPlayer+JSQMessages.h>
#import <JSQSystemSoundPlayer.h>
#import "OWSContactsManager.h"
#import "DJWActionSheet+OWS.h"
#import "Environment.h"
#import "FingerprintViewController.h"
#import "FullImageViewController.h"
#import "JSQCallCollectionViewCell.h"
#import "JSQDisplayedMessageCollectionViewCell.h"
#import "OWSCallCollectionViewCell.h"
#import "OWSDisplayedMessageCollectionViewCell.h"
#import "MessagesViewController.h"
#import "NSDate+millisecondTimeStamp.h"
#import "NewGroupViewController.h"
@ -32,14 +39,14 @@
#import "TSContentAdapters.h"
#import "TSDatabaseView.h"
#import "OWSMessagesBubblesSizeCalculator.h"
//TODO should JSQInfoMessage be rolled into JSQDisplayedMessageCollectionViewCell?
#import "JSQInfoMessage.h"
//TODO should OWSInfoMessage be rolled into OWSDisplayedMessageCollectionViewCell?
#import "OWSInfoMessage.h"
#import "TSInfoMessage.h"
//TODO should JSQErrorMessage be rolled into JSQDisplayedMessageCollectionViewCell?
#import "JSQErrorMessage.h"
//TODO should OWSErrorMessage be rolled into OWSDisplayedMessageCollectionViewCell?
#import "OWSErrorMessage.h"
#import "TSErrorMessage.h"
//TODO should JSQCall be rolled into JSQCallCollectionViewCell?
#import "JSQCall.h"
//TODO should OWSCall be rolled into OWSCallCollectionViewCell?
#import "OWSCall.h"
#import "TSCall.h"
#import "TSIncomingMessage.h"
#import "TSInvalidIdentityKeyErrorMessage.h"
@ -209,11 +216,11 @@ typedef enum : NSUInteger {
- (void)registerCustomMessageNibs
{
[self.collectionView registerNib:[JSQCallCollectionViewCell nib]
forCellWithReuseIdentifier:[JSQCallCollectionViewCell cellReuseIdentifier]];
[self.collectionView registerNib:[OWSCallCollectionViewCell nib]
forCellWithReuseIdentifier:[OWSCallCollectionViewCell cellReuseIdentifier]];
[self.collectionView registerNib:[JSQDisplayedMessageCollectionViewCell nib]
forCellWithReuseIdentifier:[JSQDisplayedMessageCollectionViewCell cellReuseIdentifier]];
[self.collectionView registerNib:[OWSDisplayedMessageCollectionViewCell nib]
forCellWithReuseIdentifier:[OWSDisplayedMessageCollectionViewCell cellReuseIdentifier]];
}
- (void)toggleObservers:(BOOL)shouldObserve {
@ -744,17 +751,17 @@ typedef enum : NSUInteger {
switch (message.messageType) {
case TSCallAdapter: {
DDLogDebug(@"building cell for Call");
JSQCall *call = (JSQCall *)message;
OWSCall *call = (OWSCall *)message;
cell = [self loadCallCellForCall:call atIndexPath:indexPath];
} break;
case TSInfoMessageAdapter: {
DDLogDebug(@"building cell for InfoMessage");
JSQInfoMessage *infoMessage = (JSQInfoMessage *)message;
OWSInfoMessage *infoMessage = (OWSInfoMessage *)message;
cell = [self loadInfoMessageCellForMessage:infoMessage atIndexPath:indexPath];
} break;
case TSErrorMessageAdapter: {
DDLogDebug(@"building cell for ErrorMessage");
JSQErrorMessage *errorMessage = (JSQErrorMessage *)message;
OWSErrorMessage *errorMessage = (OWSErrorMessage *)message;
cell = [self loadErrorMessageCellForMessage:errorMessage atIndexPath:indexPath];
} break;
case TSIncomingMessageAdapter: {
@ -808,11 +815,11 @@ typedef enum : NSUInteger {
return cell;
}
- (JSQCallCollectionViewCell *)loadCallCellForCall:(JSQCall *)call
- (OWSCallCollectionViewCell *)loadCallCellForCall:(OWSCall *)call
atIndexPath:(NSIndexPath *)indexPath
{
JSQCallCollectionViewCell *callCell = [self.collectionView dequeueReusableCellWithReuseIdentifier:[JSQCallCollectionViewCell cellReuseIdentifier]
OWSCallCollectionViewCell *callCell = [self.collectionView dequeueReusableCellWithReuseIdentifier:[OWSCallCollectionViewCell cellReuseIdentifier]
forIndexPath:indexPath];
NSString *text = call.date != nil ? [call text] : call.senderDisplayName;
@ -857,10 +864,10 @@ typedef enum : NSUInteger {
return callCell;
}
- (JSQDisplayedMessageCollectionViewCell *)loadInfoMessageCellForMessage:(JSQInfoMessage *)infoMessage
- (OWSDisplayedMessageCollectionViewCell *)loadInfoMessageCellForMessage:(OWSInfoMessage *)infoMessage
atIndexPath:(NSIndexPath *)indexPath
{
JSQDisplayedMessageCollectionViewCell *infoCell = [self.collectionView dequeueReusableCellWithReuseIdentifier:[JSQDisplayedMessageCollectionViewCell cellReuseIdentifier]
OWSDisplayedMessageCollectionViewCell *infoCell = [self.collectionView dequeueReusableCellWithReuseIdentifier:[OWSDisplayedMessageCollectionViewCell cellReuseIdentifier]
forIndexPath:indexPath];
infoCell.cellLabel.text = [infoMessage text];
infoCell.cellLabel.textColor = [UIColor darkGrayColor];
@ -873,9 +880,9 @@ typedef enum : NSUInteger {
return infoCell;
}
- (JSQDisplayedMessageCollectionViewCell *)loadErrorMessageCellForMessage:(JSQErrorMessage *)errorMessage
- (OWSDisplayedMessageCollectionViewCell *)loadErrorMessageCellForMessage:(OWSErrorMessage *)errorMessage
atIndexPath:(NSIndexPath *)indexPath {
JSQDisplayedMessageCollectionViewCell *errorCell = [self.collectionView dequeueReusableCellWithReuseIdentifier:[JSQDisplayedMessageCollectionViewCell cellReuseIdentifier]
OWSDisplayedMessageCollectionViewCell *errorCell = [self.collectionView dequeueReusableCellWithReuseIdentifier:[OWSDisplayedMessageCollectionViewCell cellReuseIdentifier]
forIndexPath:indexPath];
errorCell.cellLabel.text = [errorMessage text];
errorCell.cellLabel.textColor = [UIColor darkGrayColor];

12
Signal/src/views/JSQCallCollectionViewCell.h → Signal/src/views/OWSCallCollectionViewCell.h
Unescape Escape View File

@ -1,31 +1,23 @@
//
// JSQCallCollectionViewCell.h
// JSQMessages
//
// Created by Dylan Bourgeois on 20/11/14.
//
// Portions Copyright (c) 2014 Open Whisper Systems. All rights reserved.
#import <UIKit/UIKit.h>
#import <JSQMessagesViewController/JSQMessagesCollectionViewCell.h>
#define kCallCellHeight 40.0f
#define kCallCellWidth 400.0f
@interface JSQCallCollectionViewCell : JSQMessagesCollectionViewCell
@interface OWSCallCollectionViewCell : JSQMessagesCollectionViewCell
// TODO can we use an existing label from JSQMessagesCollectionViewCell?
@property (weak, nonatomic, readonly) JSQMessagesLabel *cellLabel;
@property (weak, nonatomic, readonly) UIImageView *outgoingCallImageView;
@property (weak, nonatomic, readonly) UIImageView *incomingCallImageView;
#pragma mark - Class methods
+ (UINib *)nib;
+ (NSString *)cellReuseIdentifier;
@end

15
Signal/src/views/JSQCallCollectionViewCell.m → Signal/src/views/OWSCallCollectionViewCell.m
Unescape Escape View File

@ -1,16 +1,11 @@
//
// JSQCallCollectionViewCell.m
// JSQMessages
//
// Created by Dylan Bourgeois on 20/11/14.
//
// Portions Copyright (c) 2014 Open Whisper Systems. All rights reserved.
#import "JSQCallCollectionViewCell.h"
#import "OWSCallCollectionViewCell.h"
#import <JSQMessagesViewController/UIView+JSQMessages.h>
#import "UIView+JSQMessages.h"
@interface JSQCallCollectionViewCell ()
@interface OWSCallCollectionViewCell ()
@property (weak, nonatomic) IBOutlet JSQMessagesLabel *cellLabel;
@property (weak, nonatomic) IBOutlet UIImageView *outgoingCallImageView;
@ -18,7 +13,7 @@
@end
@implementation JSQCallCollectionViewCell
@implementation OWSCallCollectionViewCell
#pragma mark - Class Methods

2
Signal/src/views/JSQCallCollectionViewCell.xib → Signal/src/views/OWSCallCollectionViewCell.xib
Unescape Escape View File

@ -7,7 +7,7 @@
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="Efo-Hk-7Hw" customClass="JSQCallCollectionViewCell">
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="Efo-Hk-7Hw" customClass="OWSCallCollectionViewCell">
<rect key="frame" x="0.0" y="0.0" width="320" height="20"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">

8
Signal/src/views/JSQDisplayedMessageCollectionViewCell.h → Signal/src/views/OWSDisplayedMessageCollectionViewCell.h
Unescape Escape View File

@ -1,17 +1,13 @@
//
// JSQDisplayedMessageCollectionViewCell.h
// JSQMessages
//
// Created by Dylan Bourgeois on 29/11/14.
// Copyright (c) 2014 Hexed Bits. All rights reserved.
//
// Portions Copyright (c) 2016 Open Whisper Systems. All rights reserved.
#import <JSQMessagesViewController/JSQMessagesCollectionViewCell.h>
#import <UIKit/UIKit.h>
static const CGFloat OWSDisplayedMessageCellHeight = 70.0f;
@interface JSQDisplayedMessageCollectionViewCell : JSQMessagesCollectionViewCell
@interface OWSDisplayedMessageCollectionViewCell : JSQMessagesCollectionViewCell
// TODO can we use existing label from superclass?
@property (weak, nonatomic, readonly) JSQMessagesLabel *cellLabel;

12
Signal/src/views/JSQDisplayedMessageCollectionViewCell.m → Signal/src/views/OWSDisplayedMessageCollectionViewCell.m
Unescape Escape View File

@ -1,16 +1,12 @@
//
// JSQDisplayedMessageCollectionViewCell.m
// JSQMessages
//
// Created by Dylan Bourgeois on 29/11/14.
// Copyright (c) 2014 Hexed Bits. All rights reserved.
//
// Portions Copyright (c) 2016 Open Whisper Systems. All rights reserved.
#import "JSQDisplayedMessageCollectionViewCell.h"
#import "OWSDisplayedMessageCollectionViewCell.h"
#import <JSQMessagesViewController/UIView+JSQMessages.h>
@interface JSQDisplayedMessageCollectionViewCell ()
@interface OWSDisplayedMessageCollectionViewCell ()
@property (weak, nonatomic) IBOutlet JSQMessagesLabel *cellLabel;
@property (weak, nonatomic) IBOutlet UIImageView *headerImageView;
@ -18,7 +14,7 @@
@end
@implementation JSQDisplayedMessageCollectionViewCell
@implementation OWSDisplayedMessageCollectionViewCell
#pragma mark - Class Methods

2
Signal/src/views/JSQDisplayedMessageCollectionViewCell.xib → Signal/src/views/OWSDisplayedMessageCollectionViewCell.xib
Unescape Escape View File

@ -8,7 +8,7 @@
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="eMU-z2-CzM" customClass="JSQDisplayedMessageCollectionViewCell">
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="eMU-z2-CzM" customClass="OWSDisplayedMessageCollectionViewCell">
<rect key="frame" x="0.0" y="0.0" width="320" height="70"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
Write Preview
Loading…
Cancel
Save