Skip to content

Commit bab6eec

Browse files
chrisballingerchrisballinger
committed
Add terms and privacy links
1 parent 50a410e commit bab6eec

File tree

4 files changed

+45
-14
lines changed

4 files changed

+45
-14
lines changed

‎ChatSecure/Classes/View Controllers/Purchase.storyboard‎

Lines changed: 33 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,19 @@
3232
<nil key="highlightedColor"/>
3333
</label>
3434
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LOM-g8-hSh">
35-
<rect key="frame" x="24" y="46" width="240" height="22.5"/>
35+
<rect key="frame" x="24" y="46" width="240" height="6.5"/>
3636
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
3737
</view>
3838
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="tzh-dS-ZUa">
39-
<rect key="frame" x="0.0" y="78.5" width="288" height="76.5"/>
39+
<rect key="frame" x="0.0" y="62.5" width="288" height="76.5"/>
4040
<string key="text">Help us make developing free and open source privacy tools sustainable. We welcome any contribution to support ongoing development. </string>
4141
<fontDescription key="fontDescription" type="system" pointSize="16"/>
4242
<nil key="textColor"/>
4343
<nil key="highlightedColor"/>
4444
<string key="userLabel">Help us make developing free and open source privacy tools sustainable. We welcome any contribution to support ongoing development.</string>
4545
</label>
4646
<label opaque="NO" userInteractionEnabled="NO" contentMode="TopLeft" horizontalHuggingPriority="251" verticalHuggingPriority="251" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="L5z-3N-jCk">
47-
<rect key="frame" x="20" y="165" width="248.5" height="50.5"/>
47+
<rect key="frame" x="20" y="149" width="248.5" height="50.5"/>
4848
<string key="text">• Feel good supporting indie software
4949
• Continued development and updates
5050
• Help keep the app free for everyone</string>
@@ -53,11 +53,11 @@
5353
<nil key="highlightedColor"/>
5454
</label>
5555
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3ro-4x-vR6">
56-
<rect key="frame" x="24" y="225.5" width="240" height="22"/>
56+
<rect key="frame" x="24" y="209.5" width="240" height="6"/>
5757
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
5858
</view>
59-
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="BZq-ME-rzB">
60-
<rect key="frame" x="129" y="257.5" width="30" height="106"/>
59+
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="BZq-ME-rzB">
60+
<rect key="frame" x="129" y="225.5" width="30" height="120"/>
6161
<subviews>
6262
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fmr-wM-gJf">
6363
<rect key="frame" x="0.0" y="0.0" width="30" height="30"/>
@@ -67,14 +67,14 @@
6767
</connections>
6868
</button>
6969
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="boG-Bi-Djt">
70-
<rect key="frame" x="0.0" y="38" width="30" height="30"/>
70+
<rect key="frame" x="0.0" y="45" width="30" height="30"/>
7171
<state key="normal" title="🍺"/>
7272
<connections>
7373
<action selector="mediumMoneyButtonPressed:" destination="gpY-7F-1nv" eventType="touchUpInside" id="tbX-rd-nIN"/>
7474
</connections>
7575
</button>
7676
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="647-wq-NMP">
77-
<rect key="frame" x="0.0" y="76" width="30" height="30"/>
77+
<rect key="frame" x="0.0" y="90" width="30" height="30"/>
7878
<fontDescription key="fontDescription" type="system" pointSize="15"/>
7979
<state key="normal" title="🎁"/>
8080
<connections>
@@ -84,11 +84,11 @@
8484
</subviews>
8585
</stackView>
8686
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Wps-1P-SXH">
87-
<rect key="frame" x="24" y="373.5" width="240" height="22.5"/>
87+
<rect key="frame" x="24" y="355.5" width="240" height="6.5"/>
8888
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
8989
</view>
9090
<stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="cgw-yR-akB">
91-
<rect key="frame" x="0.0" y="406" width="288" height="30"/>
91+
<rect key="frame" x="0.0" y="372" width="288" height="30"/>
9292
<subviews>
9393
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="NHC-BV-VjX">
9494
<rect key="frame" x="0.0" y="0.0" width="53" height="30"/>
@@ -111,12 +111,33 @@
111111
</subviews>
112112
</stackView>
113113
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YXH-bA-7Xi">
114-
<rect key="frame" x="0.0" y="446" width="288" height="86"/>
115-
<mutableString key="text">Payment will be charged to iTunes Account at confirmation of purchase. Subscription automatically renews unless auto-renew is turned off at least 24-hours before the end of the current period. Account will be charged for renewal within 24-hours prior to the end of the current period, and identify the cost of the renewal. Subscriptions may be managed by the user and auto-renewal may be turned off by going to the user's Account Settings after purchase. Any unused portion of a free trial period, if offered, will be forfeited when the user purchases a subscription to that publication, where applicable.</mutableString>
114+
<rect key="frame" x="0.0" y="412" width="288" height="86"/>
115+
<string key="text">Payment will be charged to iTunes Account at confirmation of purchase. Subscription automatically renews unless auto-renew is turned off at least 24-hours before the end of the current period. Account will be charged for renewal within 24-hours prior to the end of the current period, and identify the cost of the renewal. Subscriptions may be managed by the user and auto-renewal may be turned off by going to the user's Account Settings after purchase. Any unused portion of a free trial period, if offered, will be forfeited when the user purchases a subscription to that publication, where applicable.</string>
116116
<fontDescription key="fontDescription" type="system" pointSize="8"/>
117117
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
118118
<nil key="highlightedColor"/>
119119
</label>
120+
<stackView opaque="NO" contentMode="scaleToFill" spacing="30" translatesAutoresizingMaskIntoConstraints="NO" id="HqQ-Wd-ThL">
121+
<rect key="frame" x="96" y="508" width="96" height="24"/>
122+
<subviews>
123+
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9NL-2h-WYG">
124+
<rect key="frame" x="0.0" y="0.0" width="30" height="24"/>
125+
<fontDescription key="fontDescription" type="system" pointSize="10"/>
126+
<state key="normal" title="Terms"/>
127+
<connections>
128+
<action selector="termsButtonPressed:" destination="gpY-7F-1nv" eventType="touchUpInside" id="qtP-qH-GLM"/>
129+
</connections>
130+
</button>
131+
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="6aV-QD-co0">
132+
<rect key="frame" x="60" y="0.0" width="36" height="24"/>
133+
<fontDescription key="fontDescription" type="system" pointSize="10"/>
134+
<state key="normal" title="Privacy"/>
135+
<connections>
136+
<action selector="privacyButtonPressed:" destination="gpY-7F-1nv" eventType="touchUpInside" id="gu3-FP-ltr"/>
137+
</connections>
138+
</button>
139+
</subviews>
140+
</stackView>
120141
</subviews>
121142
<constraints>
122143
<constraint firstItem="cgw-yR-akB" firstAttribute="leading" secondItem="T1P-9j-rmZ" secondAttribute="leading" id="Cpq-R0-qe1"/>

‎ChatSecure/Classes/View Controllers/PurchaseViewController.swift‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,15 @@ public class PurchaseViewController: UIViewController {
168168

169169
}
170170

171+
@IBAction func privacyButtonPressed(_ sender: Any) {
172+
let url = OTRBranding.projectURL.appendingPathComponent("/privacy")
173+
prompt(toShow: url, sender: sender)
174+
}
175+
176+
@IBAction func termsButtonPressed(_ sender: Any) {
177+
let url = OTRBranding.projectURL.appendingPathComponent("/terms")
178+
prompt(toShow: url, sender: sender)
179+
}
171180
}
172181

173182
extension PurchaseViewController: SKProductsRequestDelegate {

‎ChatSecure/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
</dict>
3636
</array>
3737
<key>CFBundleVersion</key>
38-
<string>133</string>
38+
<string>134</string>
3939
<key>FacebookAppID</key>
4040
<string>447241325394334</string>
4141
<key>FacebookDisplayName</key>

‎fastlane/Deliverfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ screenshots_path "./Submodules/ChatSecure-Metadata/screenshots"
2929

3030
release_notes({
3131
'default' => "v4.3.4:
32-
* Same code as v4.3.3 except built with Xcode 9.2 instead of Xcode 9.4 to fix regression in Swift runtime (reabstraction thunk helper swift_getObjectType crash).
32+
* Attempting to fix source of crash regression in Swift 4.1.2 runtime (reabstraction thunk helper swift_getObjectType crash).
33+
* Other crash fixes
3334
v4.3.3:
3435
* Actually fix crash on launch by disabling download resumption
3536
v4.3.2:

0 commit comments

Comments
 (0)