Skip to content

Commit 08cfe46

Browse files
agiletortoiseagiletortoise
committed
Merge pull request agiletortoise#2 from gcaprio/master
Several bug fixes, updates & modern improvements
2 parents 87e8794 + 214f73b commit 08cfe46

8 files changed

Lines changed: 214 additions & 184 deletions

File tree

‎Classes/ReceiveViewController.m‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,13 @@ @implementation ReceiveViewController
1212

1313
- (id)init
1414
{
15-
[super initWithNibName:nil bundle:nil];
15+
if (!(self = [super initWithNibName:nil bundle:nil])) return nil;
1616

1717
UITabBarItem *tbi = [self tabBarItem];
1818
[tbi setTitle:@"Receive URL"];
1919

2020
UIImage *image = [UIImage imageNamed:@"receive.png"];
2121
[tbi setImage:image];
22-
[image release];
2322

2423
return self;
2524
}
@@ -66,9 +65,6 @@ - (void)viewDidUnload {
6665
}
6766

6867

69-
- (void)dealloc {
70-
[super dealloc];
71-
}
7268

7369

7470
@end

‎Classes/SendViewController.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
IBOutlet UITextField *parametersField;
1717
IBOutlet UITextField *callbackField;
1818
IBOutlet UITextField *errorCallbackField;
19+
IBOutlet UITextField *cancelCallbackField;
1920
IBOutlet UITextField *sourceField;
2021
}
2122

‎Classes/SendViewController.m‎

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,13 @@
1212
@implementation SendViewController
1313

1414
- (id)init {
15-
[super initWithNibName:nil bundle:nil];
15+
if (!(self = [super initWithNibName:nil bundle:nil])) return nil;
1616

1717
UITabBarItem *tbi = [self tabBarItem];
1818
[tbi setTitle:@"Send URL"];
1919

2020
UIImage *image = [UIImage imageNamed:@"send.png"];
2121
[tbi setImage:image];
22-
[image release];
2322

2423
return self;
2524
}
@@ -36,12 +35,12 @@ - (void)viewDidLoad {
3635

3736
- (NSString *)encodeString:(NSString *)str
3837
{
39-
return (NSString *)CFURLCreateStringByAddingPercentEscapes(
38+
return (NSString *)CFBridgingRelease(CFURLCreateStringByAddingPercentEscapes(
4039
NULL,
4140
(CFStringRef)str,
4241
NULL,
4342
(CFStringRef)@"!*'();:@&=+$,/?%#[]",
44-
kCFStringEncodingUTF8 );
43+
kCFStringEncodingUTF8 ));
4544
}
4645

4746
- (BOOL)canOpenURL
@@ -65,7 +64,6 @@ -(void)openURL
6564
cancelButtonTitle:@"OK"
6665
otherButtonTitles:nil];
6766
[alertView show];
68-
[alertView release];
6967
return;
7068
}
7169

@@ -90,12 +88,18 @@ -(void)openURL
9088
urlString = [urlString stringByAppendingString:@"x-error="];
9189
urlString = [urlString stringByAppendingString:[self encodeString:[errorCallbackField text]]];
9290
urlString = [urlString stringByAppendingString:@"&"];
93-
}
91+
}
92+
if ([[cancelCallbackField text] length] > 0) {
93+
urlString = [urlString stringByAppendingString:@"x-cancel="];
94+
urlString = [urlString stringByAppendingString:[self encodeString:[cancelCallbackField text]]];
95+
urlString = [urlString stringByAppendingString:@"&"];
96+
}
9497
if ([[sourceField text] length] > 0) {
9598
urlString = [urlString stringByAppendingString:@"x-source="];
9699
urlString = [urlString stringByAppendingString:[self encodeString:[sourceField text]]];
97100
urlString = [urlString stringByAppendingString:@"&"];
98101
}
102+
99103
urlString = [urlString stringByAppendingString:[parametersField text]];
100104

101105

@@ -108,8 +112,6 @@ -(void)openURL
108112
NSLog(@"Unable to open url");
109113
}
110114

111-
[url release];
112-
[urlString release];
113115
}
114116

115117
- (BOOL)textFieldShouldReturn:(UITextField *)textField
@@ -140,19 +142,9 @@ - (void)didReceiveMemoryWarning {
140142

141143
- (void)viewDidUnload {
142144
[super viewDidUnload];
143-
[schemeField release];
144-
[hostField release];
145-
[actionField release];
146-
[parametersField release];
147-
[callbackField release];
148-
[errorCallbackField release];
149-
[sourceField release];
150145
}
151146

152147

153-
- (void)dealloc {
154-
[super dealloc];
155-
}
156148

157149

158150
@end

0 commit comments

Comments
 (0)