Skip to content

Commit 8771c90

Browse files
frankusfrankus
committed
Merge branch 'develop'
2 parents 729fab1 + aab18f1 commit 8771c90

File tree

9 files changed

+142
-39
lines changed

9 files changed

+142
-39
lines changed

‎Apptentive/Apptentive/Apptentive.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ FOUNDATION_EXPORT double ApptentiveVersionNumber;
2020
FOUNDATION_EXPORT const unsigned char ApptentiveVersionString[];
2121

2222
/** The version number of the Apptentive SDK. */
23-
#define kApptentiveVersionString @"4.1.0"
23+
#define kApptentiveVersionString @"4.1.1"
2424

2525
/** The version number of the Apptentive API platform. */
2626
#define kApptentiveAPIVersionString @"9"

‎Apptentive/Apptentive/Apptentive.storyboard

+22-30
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13526" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useSafeAreas="YES" colorMatched="YES">
33
<device id="retina4_7" orientation="portrait">
44
<adaptation id="fullscreen"/>
55
</device>
66
<dependencies>
77
<deployment identifier="iOS"/>
8-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13524"/>
8+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
99
<capability name="Alignment constraints with different attributes" minToolsVersion="5.1"/>
1010
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
1111
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
1212
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
13+
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
1314
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
1415
</dependencies>
1516
<scenes>
@@ -818,6 +819,7 @@
818819
<rect key="frame" x="0.0" y="0.0" width="320" height="140"/>
819820
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
820821
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
822+
<viewLayoutGuide key="safeArea" id="NUY-af-zCW"/>
821823
<collectionViewFlowLayout key="collectionViewLayout" scrollDirection="horizontal" minimumLineSpacing="0.0" minimumInteritemSpacing="0.0" id="pPU-dU-ggo">
822824
<size key="itemSize" width="76" height="123"/>
823825
<size key="headerReferenceSize" width="0.0" height="0.0"/>
@@ -906,10 +908,6 @@
906908
<scene sceneID="G8v-Qy-vVc">
907909
<objects>
908910
<viewController id="98M-gg-3nj" userLabel="Message Center Error View" customClass="ApptentiveMessageCenterErrorViewController" sceneMemberID="viewController">
909-
<layoutGuides>
910-
<viewControllerLayoutGuide type="top" id="YsJ-93-sdE"/>
911-
<viewControllerLayoutGuide type="bottom" id="PBq-M4-PKi"/>
912-
</layoutGuides>
913911
<view key="view" contentMode="center" id="yHY-Np-JOn">
914912
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
915913
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -933,12 +931,13 @@
933931
</subviews>
934932
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
935933
<constraints>
936-
<constraint firstAttribute="centerX" secondItem="GVd-IK-yfR" secondAttribute="centerX" id="36k-QD-PQI"/>
934+
<constraint firstItem="87v-qZ-06b" firstAttribute="centerX" secondItem="GVd-IK-yfR" secondAttribute="centerX" id="36k-QD-PQI"/>
937935
<constraint firstAttribute="centerY" secondItem="GVd-IK-yfR" secondAttribute="centerY" id="8QX-wA-uqg"/>
938-
<constraint firstAttribute="centerX" secondItem="MWx-dJ-sZ0" secondAttribute="centerX" id="BO5-wU-k2W"/>
936+
<constraint firstItem="87v-qZ-06b" firstAttribute="centerX" secondItem="MWx-dJ-sZ0" secondAttribute="centerX" id="BO5-wU-k2W"/>
939937
<constraint firstItem="MWx-dJ-sZ0" firstAttribute="top" secondItem="GVd-IK-yfR" secondAttribute="bottom" constant="16" id="JNK-Th-fzD"/>
940938
<constraint firstAttribute="centerY" secondItem="GVd-IK-yfR" secondAttribute="centerY" id="cFk-Xy-VPj"/>
941939
</constraints>
940+
<viewLayoutGuide key="safeArea" id="87v-qZ-06b"/>
942941
</view>
943942
<navigationItem key="navigationItem" title="Message Center" id="SBs-rU-p7L">
944943
<barButtonItem key="rightBarButtonItem" systemItem="cancel" id="ebc-H0-O6o">
@@ -960,10 +959,6 @@
960959
<scene sceneID="pcU-LA-MMv">
961960
<objects>
962961
<viewController storyboardIdentifier="Banner" id="dl0-K5-Mv3" customClass="ApptentiveBannerViewController" sceneMemberID="viewController">
963-
<layoutGuides>
964-
<viewControllerLayoutGuide type="top" id="5SP-sQ-HE0"/>
965-
<viewControllerLayoutGuide type="bottom" id="2nO-7a-cCZ"/>
966-
</layoutGuides>
967962
<view key="view" contentMode="scaleToFill" id="OZg-SV-V5r">
968963
<rect key="frame" x="0.0" y="0.0" width="320" height="68"/>
969964
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -1018,9 +1013,10 @@
10181013
<gestureRecognizers/>
10191014
<constraints>
10201015
<constraint firstItem="Y7l-8U-XGR" firstAttribute="top" secondItem="OZg-SV-V5r" secondAttribute="top" id="IMt-IL-sk1"/>
1021-
<constraint firstAttribute="trailing" secondItem="Y7l-8U-XGR" secondAttribute="trailing" id="KEh-ps-GN1"/>
1022-
<constraint firstItem="Y7l-8U-XGR" firstAttribute="leading" secondItem="OZg-SV-V5r" secondAttribute="leading" id="yOz-KY-Dkh"/>
1016+
<constraint firstItem="ubG-2S-J1b" firstAttribute="trailing" secondItem="Y7l-8U-XGR" secondAttribute="trailing" id="KEh-ps-GN1"/>
1017+
<constraint firstItem="Y7l-8U-XGR" firstAttribute="leading" secondItem="ubG-2S-J1b" secondAttribute="leading" id="yOz-KY-Dkh"/>
10231018
</constraints>
1019+
<viewLayoutGuide key="safeArea" id="ubG-2S-J1b"/>
10241020
</view>
10251021
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
10261022
<size key="freeformSize" width="320" height="68"/>
@@ -1051,10 +1047,6 @@
10511047
<scene sceneID="zxj-fk-0sF">
10521048
<objects>
10531049
<viewController storyboardIdentifier="About" hidesBottomBarWhenPushed="YES" id="Vhy-th-mTJ" customClass="ApptentiveAboutViewController" sceneMemberID="viewController">
1054-
<layoutGuides>
1055-
<viewControllerLayoutGuide type="top" id="Eyb-YH-mrA"/>
1056-
<viewControllerLayoutGuide type="bottom" id="S8h-gc-fXf"/>
1057-
</layoutGuides>
10581050
<view key="view" contentMode="scaleToFill" id="RoE-zy-OMj">
10591051
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
10601052
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -1103,14 +1095,15 @@ Your feedback is hosted by Apptentive and is subject to both Apptentive’s priv
11031095
<constraint firstItem="1rw-GH-jIp" firstAttribute="top" secondItem="agg-cE-9mQ" secondAttribute="bottom" constant="16" id="9LH-ZT-D8Y"/>
11041096
<constraint firstItem="agg-cE-9mQ" firstAttribute="leading" secondItem="RoE-zy-OMj" secondAttribute="leading" id="CcI-t8-YhZ"/>
11051097
<constraint firstItem="q23-yH-i1B" firstAttribute="leading" secondItem="Nvk-9F-cXD" secondAttribute="leading" id="G8C-9g-FTH"/>
1106-
<constraint firstItem="1rw-GH-jIp" firstAttribute="leading" secondItem="RoE-zy-OMj" secondAttribute="leadingMargin" id="GMq-5X-m0w"/>
1098+
<constraint firstItem="1rw-GH-jIp" firstAttribute="leading" secondItem="8dJ-MO-Uf3" secondAttribute="leading" constant="16" id="GMq-5X-m0w"/>
11071099
<constraint firstItem="q23-yH-i1B" firstAttribute="trailing" secondItem="Nvk-9F-cXD" secondAttribute="trailing" id="GcY-9v-1JM"/>
1108-
<constraint firstItem="agg-cE-9mQ" firstAttribute="top" secondItem="Eyb-YH-mrA" secondAttribute="bottom" id="e3P-Jk-WOq"/>
1100+
<constraint firstItem="agg-cE-9mQ" firstAttribute="top" secondItem="8dJ-MO-Uf3" secondAttribute="top" id="e3P-Jk-WOq"/>
11091101
<constraint firstAttribute="trailing" secondItem="agg-cE-9mQ" secondAttribute="trailing" id="iX8-TZ-rAa"/>
1110-
<constraint firstAttribute="trailingMargin" secondItem="1rw-GH-jIp" secondAttribute="trailing" id="o5R-Iq-53P"/>
1102+
<constraint firstItem="8dJ-MO-Uf3" firstAttribute="trailing" secondItem="1rw-GH-jIp" secondAttribute="trailing" constant="16" id="o5R-Iq-53P"/>
11111103
<constraint firstItem="q23-yH-i1B" firstAttribute="top" secondItem="1rw-GH-jIp" secondAttribute="bottom" constant="16" id="sHi-hO-iAc"/>
11121104
<constraint firstItem="q23-yH-i1B" firstAttribute="leading" secondItem="1rw-GH-jIp" secondAttribute="leading" id="yCd-Wo-JTe"/>
11131105
</constraints>
1106+
<viewLayoutGuide key="safeArea" id="8dJ-MO-Uf3"/>
11141107
</view>
11151108
<navigationItem key="navigationItem" title="About" id="e9j-6Q-izr"/>
11161109
<simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/>
@@ -1166,10 +1159,6 @@ Your feedback is hosted by Apptentive and is subject to both Apptentive’s priv
11661159
<scene sceneID="ZBg-KV-iHb">
11671160
<objects>
11681161
<viewController storyboardIdentifier="UpgradeMessage" id="WnK-TF-euS" customClass="ApptentiveInteractionUpgradeMessageViewController" sceneMemberID="viewController">
1169-
<layoutGuides>
1170-
<viewControllerLayoutGuide type="top" id="0Ue-5m-Q56"/>
1171-
<viewControllerLayoutGuide type="bottom" id="NG4-sw-fgI"/>
1172-
</layoutGuides>
11731162
<view key="view" opaque="NO" contentMode="scaleToFill" id="b8z-vy-rbq">
11741163
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
11751164
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
@@ -1247,21 +1236,22 @@ Your feedback is hosted by Apptentive and is subject to both Apptentive’s priv
12471236
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
12481237
<constraints>
12491238
<constraint firstItem="vx8-CS-yG8" firstAttribute="top" secondItem="MnL-J4-fWD" secondAttribute="bottom" id="3ny-FL-Obk"/>
1250-
<constraint firstAttribute="bottom" secondItem="C1y-qz-EY6" secondAttribute="bottom" id="FYd-XW-HAf"/>
1239+
<constraint firstItem="hp0-Nz-dcE" firstAttribute="bottom" secondItem="C1y-qz-EY6" secondAttribute="bottom" id="FYd-XW-HAf"/>
12511240
<constraint firstItem="MnL-J4-fWD" firstAttribute="top" secondItem="yxR-nt-lVu" secondAttribute="bottom" id="Fxl-10-DJP"/>
1252-
<constraint firstAttribute="trailing" secondItem="MnL-J4-fWD" secondAttribute="trailing" constant="44" id="HWQ-Pe-8zk"/>
1241+
<constraint firstItem="hp0-Nz-dcE" firstAttribute="trailing" secondItem="MnL-J4-fWD" secondAttribute="trailing" constant="44" id="HWQ-Pe-8zk"/>
12531242
<constraint firstItem="oVM-16-SXc" firstAttribute="top" secondItem="yxR-nt-lVu" secondAttribute="bottom" constant="-40" id="K1P-fS-udB"/>
1254-
<constraint firstAttribute="bottom" secondItem="vx8-CS-yG8" secondAttribute="bottom" constant="33" id="Kff-Wn-7H3"/>
1243+
<constraint firstItem="hp0-Nz-dcE" firstAttribute="bottom" secondItem="vx8-CS-yG8" secondAttribute="bottom" constant="33" id="Kff-Wn-7H3"/>
12551244
<constraint firstItem="yxR-nt-lVu" firstAttribute="top" secondItem="b8z-vy-rbq" secondAttribute="top" id="UZP-PE-5Se"/>
12561245
<constraint firstItem="C1y-qz-EY6" firstAttribute="leading" secondItem="b8z-vy-rbq" secondAttribute="leading" id="WjY-YU-oaC"/>
12571246
<constraint firstItem="yxR-nt-lVu" firstAttribute="leading" secondItem="b8z-vy-rbq" secondAttribute="leading" id="ij6-wr-LL5"/>
12581247
<constraint firstAttribute="trailing" secondItem="C1y-qz-EY6" secondAttribute="trailing" id="kkm-WJ-jro"/>
1259-
<constraint firstItem="MnL-J4-fWD" firstAttribute="leading" secondItem="b8z-vy-rbq" secondAttribute="leading" constant="44" id="ks6-dF-FhJ"/>
1248+
<constraint firstItem="MnL-J4-fWD" firstAttribute="leading" secondItem="hp0-Nz-dcE" secondAttribute="leading" constant="44" id="ks6-dF-FhJ"/>
12601249
<constraint firstItem="vx8-CS-yG8" firstAttribute="leading" secondItem="b8z-vy-rbq" secondAttribute="leading" id="m0P-Ho-EWM"/>
12611250
<constraint firstAttribute="trailing" secondItem="vx8-CS-yG8" secondAttribute="trailing" id="mo5-RZ-xdU"/>
1262-
<constraint firstAttribute="centerX" secondItem="oVM-16-SXc" secondAttribute="centerX" id="qXJ-xh-8Gf"/>
1251+
<constraint firstItem="hp0-Nz-dcE" firstAttribute="centerX" secondItem="oVM-16-SXc" secondAttribute="centerX" id="qXJ-xh-8Gf"/>
12631252
<constraint firstAttribute="trailing" secondItem="yxR-nt-lVu" secondAttribute="trailing" id="xrT-Nm-Hwh"/>
12641253
</constraints>
1254+
<viewLayoutGuide key="safeArea" id="hp0-Nz-dcE"/>
12651255
</view>
12661256
<navigationItem key="navigationItem" id="GRj-Kr-Eah"/>
12671257
<connections>
@@ -1832,6 +1822,7 @@ Lines</string>
18321822
<constraint firstItem="QJU-jb-fK0" firstAttribute="top" secondItem="5MM-w9-NsG" secondAttribute="top" constant="19" id="j86-Xc-x2p"/>
18331823
<constraint firstAttribute="bottom" secondItem="hym-vX-x0x" secondAttribute="bottom" id="o7f-uU-vfB"/>
18341824
</constraints>
1825+
<viewLayoutGuide key="safeArea" id="H9x-X5-ni1"/>
18351826
<connections>
18361827
<outlet property="borderView" destination="kjO-RC-C9t" id="gjK-IH-cQv"/>
18371828
<outlet property="borderViewHeight" destination="BYb-xi-ZnV" id="RTk-wS-BmV"/>
@@ -1866,6 +1857,7 @@ Lines</string>
18661857
<constraint firstItem="W2C-ze-Odt" firstAttribute="centerX" secondItem="bBK-pb-4Z7" secondAttribute="centerX" id="W5Y-vq-irv"/>
18671858
<constraint firstItem="j6Y-7N-uj9" firstAttribute="top" secondItem="bBK-pb-4Z7" secondAttribute="top" id="sOs-gn-9Hl"/>
18681859
</constraints>
1860+
<viewLayoutGuide key="safeArea" id="SNv-iB-3hH"/>
18691861
</view>
18701862
</objects>
18711863
<point key="canvasLocation" x="303" y="2832"/>

‎Apptentive/Apptentive/Misc/ApptentiveLogMonitor.m

+10
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,12 @@ + (NSDictionary *)loadJsonFromURL:(NSURL *)URL body:(NSData *)body headers:(NSDi
306306

307307
NSURLResponse *response;
308308
NSError *requestError;
309+
310+
#pragma clang diagnostic push
311+
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
309312
NSData *data = [NSURLConnection sendSynchronousRequest:request returningResponse:&response error:&requestError];
313+
#pragma clang diagnostic pop
314+
310315
if (requestError != nil) {
311316
ApptentiveLogError(@"Unable to load json from URL: %@", requestError);
312317
return nil;
@@ -372,8 +377,13 @@ + (nullable ApptentiveLogMonitorConfigration *)readConfigurationFromToken:(NSStr
372377

373378
- (void)sendReportWithAttachedFiles:(NSArray<NSString *> *)files {
374379
if (![MFMailComposeViewController canSendMail]) {
380+
381+
#pragma clang diagnostic push
382+
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
375383
UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:@"Apptentive Log Monitor" message:@"Unable to send email" delegate:nil cancelButtonTitle:@"OK" otherButtonTitles:nil];
376384
[alertView show];
385+
#pragma clang diagnostic pop
386+
377387
return;
378388
}
379389

‎Apptentive/Apptentive/Network Queue/ApptentiveRequestOperation.m

+2-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ - (void)startTask {
108108

109109
[self willChangeValueForKey:@"isExecuting"];
110110
_task = [self.dataSource.URLSession dataTaskWithRequest:self.URLRequest completionHandler:^(NSData *_Nullable data, NSURLResponse *_Nullable response, NSError *_Nullable error) {
111-
if (self.isCancelled) {
111+
if (self.isCancelled || error.code == NSURLErrorCancelled) {
112112
return;
113113
} else if (!response) {
114114
[self processNetworkError:error];
@@ -156,6 +156,7 @@ - (void)cancel {
156156
BOOL shouldFinish = self.isExecuting;
157157

158158
[self willChangeValueForKey:@"isCancelled"];
159+
_wasCancelled = YES;
159160
[self.task cancel];
160161
[self didChangeValueForKey:@"isCancelled"];
161162

‎CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
2017-11-13 frankus, weeebox v4.1.1
2+
----------------------------------
3+
###Bugs Fixed
4+
5+
- Fix rare crash in ApptentivePayloadSender when a request is cancelled
6+
- Fix About Apptentive and Upgrade Message layout on iPhone X
7+
18
2017-11-06 frankus, weeebox v4.1.0
29
----------------------------------
310
###Improvements

0 commit comments

Comments
 (0)