Skip to content

Commit 3544a74

Browse files
committed
Disappearing Messages
* Per thread settings menu accessed by tapping on thread title This removed the toggle-phone behavior. You'll be able to see the phone number in the settings table view. This removed the "add contact" functionality, although it was already broken for ios>=9 (which is basically everybody). The group actions menu was absorbed into this screen * Added a confirm alert to leave group (fixes signalapp#938) * New Translation Strings * Extend "Add People" label to fit translations. * resolved issues with translations not fitting in group menu * Fix the long standing type warning where TSCalls were assigned to a TSMessageAdapter. * Can delete info messages Follow the JSQMVC pattern and put UIResponder-able content in the messageBubbleContainer. This gives us more functionality *and* allows us to delete some code. yay! It's still not yet possible to delete phone messages. =( * Fixed some compiler warnings. * xcode8 touching storyboard. So long xcode7! * Fixup multiline info messages. We were seeing info messages like "You set disappearing message timer to 10" instead of "You set disappearing message timer to 10 seconds." Admittedly this isn't a very good fix, as now one liners feel like they have too much padding. If the message is well over one line, we were wrapping properly, but there's a problem when the message is *just barely* two lines, the cell height grows, but the label still thinks it's just one line (as evinced by the one line appearing in the center of the label frame. The result being that the last word of the label is cropped. * Disable group actions after leaving group. // FREEBIE
1 parent 9697e1b commit 3544a74

File tree

117 files changed

+2706
-1075
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+2706
-1075
lines changed

.travis.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: objective-c
22
cache: cocoapods # pod install somtimes takes >20 minutes, so lets cache this
33

4-
osx_image: xcode7.3
4+
osx_image: xcode8
55

66
before_install:
77
- brew update # we may not be running the latest version so always update
@@ -16,5 +16,8 @@ script:
1616
- |
1717
set -o pipefail
1818
# default xctool was hanging. see https://github.com/travis-ci/travis-ci/issues/3986
19-
xcodebuild -workspace Signal.xcworkspace -scheme Signal -sdk iphonesimulator build test | xcpretty
19+
xcodebuild -workspace Signal.xcworkspace -scheme Signal \
20+
-sdk iphonesimulator \
21+
-destination 'platform=iOS Simulator,name=iPhone 6,OS=10.0' \
22+
build test | xcpretty
2023

Libraries/iRate/iRate.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
#error This class requires automatic reference counting
4040
#endif
4141

42-
43-
#pragma clang diagnostic ignored "-Wreceiver-is-weak"
42+
// Unknown diagnostic
43+
// #pragma clang diagnostic ignored "-Wreceiver-is-weak"
4444
#pragma clang diagnostic ignored "-Warc-repeated-use-of-weak"
4545
#pragma clang diagnostic ignored "-Wobjc-missing-property-synthesis"
4646
#pragma clang diagnostic ignored "-Wdirect-ivar-access"

Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ source 'https://github.com/CocoaPods/Specs.git'
33

44
target 'Signal' do
55
pod 'SocketRocket', :git => 'https://github.com/facebook/SocketRocket.git'
6-
pod 'SignalServiceKit', git: 'https://github.com/WhisperSystems/SignalServiceKit.git', branch: 'new-fingerprint-format'
6+
pod 'SignalServiceKit', git: 'https://github.com/WhisperSystems/SignalServiceKit.git', branch: 'release/2.6'
77
#pod 'SignalServiceKit', path: '../SignalServiceKit'
88
pod 'OpenSSL', '~> 1.0.208'
99
pod 'PastelogKit', '~> 1.3'

Podfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,20 +122,20 @@ DEPENDENCIES:
122122
- OpenSSL (~> 1.0.208)
123123
- PastelogKit (~> 1.3)
124124
- SCWaveformView (~> 1.0)
125-
- SignalServiceKit (from `https://github.com/WhisperSystems/SignalServiceKit.git`, branch `new-fingerprint-format`)
125+
- SignalServiceKit (from `https://github.com/WhisperSystems/SignalServiceKit.git`, branch `release/2.6`)
126126
- SocketRocket (from `https://github.com/facebook/SocketRocket.git`)
127127
- ZXingObjC
128128

129129
EXTERNAL SOURCES:
130130
SignalServiceKit:
131-
:branch: new-fingerprint-format
131+
:branch: release/2.6
132132
:git: https://github.com/WhisperSystems/SignalServiceKit.git
133133
SocketRocket:
134134
:git: https://github.com/facebook/SocketRocket.git
135135

136136
CHECKOUT OPTIONS:
137137
SignalServiceKit:
138-
:commit: 2b612e9ab72b427b310b125b1dc82eef1d3f85ec
138+
:commit: a277fbfacb10599ce609e625e599a9903f8d0ebf
139139
:git: https://github.com/WhisperSystems/SignalServiceKit.git
140140
SocketRocket:
141141
:commit: 41b57bb2fc292a814f758441a05243eb38457027
@@ -167,6 +167,6 @@ SPEC CHECKSUMS:
167167
YapDatabase: b1e43555a34a5298e23a045be96817a5ef0da58f
168168
ZXingObjC: bf15b3814f7a105b6d99f47da2333c93a063650a
169169

170-
PODFILE CHECKSUM: d4204cf787649f9512dc74e5844f48d2570d5b2e
170+
PODFILE CHECKSUM: 1e76310fe364da5f11d50ef76ccf13714b52926b
171171

172172
COCOAPODS: 1.0.1

Signal.xcodeproj/project.pbxproj

Lines changed: 66 additions & 10 deletions
Large diffs are not rendered by default.
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"filename" : "ic_hourglass_empty.png",
6+
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"filename" : "[email protected]",
11+
"scale" : "2x"
12+
},
13+
{
14+
"idiom" : "universal",
15+
"filename" : "[email protected]",
16+
"scale" : "3x"
17+
}
18+
],
19+
"info" : {
20+
"version" : 1,
21+
"author" : "xcode"
22+
},
23+
"properties" : {
24+
"template-rendering-intent" : "template"
25+
}
26+
}
271 Bytes
Loading
315 Bytes
Loading
421 Bytes
Loading
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"filename" : "ic_hourglass_full.png",
6+
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"filename" : "[email protected]",
11+
"scale" : "2x"
12+
},
13+
{
14+
"idiom" : "universal",
15+
"filename" : "[email protected]",
16+
"scale" : "3x"
17+
}
18+
],
19+
"info" : {
20+
"version" : 1,
21+
"author" : "xcode"
22+
},
23+
"properties" : {
24+
"template-rendering-intent" : "template"
25+
}
26+
}

0 commit comments

Comments
 (0)