Skip to content

Commit f58fc05

Browse files
author
Joey Lorich
committed
Small bugfixes, add slack notifications
1 parent 40b19b4 commit f58fc05

6 files changed

Lines changed: 25 additions & 9 deletions

File tree

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ before_install:
88
script:
99
- xctool -workspace EasyReader.xcworkspace -scheme Development -sdk iphonesimulator7.1 ONLY_ACTIVE_ARCH=NO
1010
- xctool test -workspace EasyReader.xcworkspace -scheme Development -sdk iphonesimulator7.1 ONLY_ACTIVE_ARCH=NO
11-
11+
notifications:
12+
slack: cloudspace:euw2TezwiQfK9ebqBtGa1Rjz

EasyReader.xcodeproj/project.pbxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1805,7 +1805,7 @@
18051805
UIKit,
18061806
);
18071807
PRODUCT_NAME = Staging;
1808-
PROVISIONING_PROFILE = "AE75F2A8-B0F9-486D-8DE0-CFEA22EC508C";
1808+
PROVISIONING_PROFILE = "90CA03DB-35B0-4E9E-BEA6-36B6897E6984";
18091809
TARGETED_DEVICE_FAMILY = 1;
18101810
VALID_ARCHS = "armv7 arm64 armv7s";
18111811
WRAPPER_EXTENSION = app;

EasyReader/Application/Controllers/Menu/MenuCells/EZRSearchFeedCell.m

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@ @implementation EZRSearchFeedCell
2020
- (void)setFeedData:(NSDictionary *)feedData
2121
{
2222
_feedData = feedData;
23-
//self.imageView_icon.image = [UIImage imageNamed:@"icon_plus"];
24-
self.label_name.text = [feedData objectForKey:@"name"];
23+
24+
if (feedData) {
25+
self.label_name.text = [feedData objectForKey:@"name"];
26+
}
2527
}
2628

2729
@end

EasyReader/Application/Controllers/Menu/MenuDataSources/EZRMenuSearchFeedDataSource.m

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,13 @@ - (void) setLastSearchTerm:(NSString *)lastSearchTerm {
3939

4040
- (void)setFeedData:(NSDictionary *)feedData
4141
{
42-
NSSet *feedSet = [NSSet setWithArray:feedData[@"feeds"]];
43-
44-
self.source = [feedSet sortedArrayByAttributes:@[@"name"] ascending:YES];
42+
if (feedData) {
43+
NSSet *feedSet = [NSSet setWithArray:feedData[@"feeds"]];
44+
45+
self.source = [feedSet sortedArrayByAttributes:@[@"name"] ascending:YES];
46+
} else {
47+
self.source = nil;
48+
}
4549
}
4650

4751
-(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {

EasyReader/Library/CLDSocialShareToolbar/CLDSocialShareToolbar.m

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,11 @@ - (void) setBackgroundTransparent:(BOOL)backgroundTransparent {
157157
* Triggers the didSelectShareWithMailFromToolbar on the delegate if it responds
158158
*/
159159
- (void)shareWithMail {
160+
if (![MFMailComposeViewController canSendMail]) {
161+
[[[UIAlertView alloc] initWithTitle:@"Error" message:@"This device is not set up to send email. Please add an account from the iOS settings application." delegate:nil cancelButtonTitle:@"Okay" otherButtonTitles:nil] show];
162+
return;
163+
}
164+
160165
UIViewController *presentingController = [self.dataSource containingViewControllerForDialogFromSocialToolbar:self];
161166

162167
self.mailComposeViewContoller = [[MFMailComposeViewController alloc] init];
@@ -185,7 +190,11 @@ - (void)shareWithMail {
185190

186191
[self.mailComposeViewContoller setMessageBody:messageBody isHTML:YES];
187192

188-
[presentingController presentViewController:self.mailComposeViewContoller animated:YES completion:nil];
193+
if (self.mailComposeViewContoller && presentingController) {
194+
[presentingController presentViewController:self.mailComposeViewContoller animated:YES completion:nil];
195+
} else {
196+
NSLog(@"cant present");
197+
}
189198
}
190199

191200
/**

EasyReader/Supporting Files/Staging-Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
</dict>
3737
</array>
3838
<key>CFBundleVersion</key>
39-
<string>2.0.43</string>
39+
<string>2.0.46</string>
4040
<key>LSApplicationCategoryType</key>
4141
<string></string>
4242
<key>LSRequiresIPhoneOS</key>

0 commit comments

Comments
 (0)