Revised for x-callback-url spec revision 1, dropping the version field

wavejava · Mar 21, 2011 · 87e8794 · 87e8794
1 parent 13841df
commit 87e8794
Show file tree

Hide file tree

Showing 10 changed files with 6,345 additions and 325 deletions.
diff --git a/Classes/SendViewController.h b/Classes/SendViewController.h
@@ -12,7 +12,6 @@
 @interface SendViewController : UIViewController <UITextFieldDelegate> {
 	IBOutlet UITextField *schemeField;
 	IBOutlet UITextField *hostField;
-	IBOutlet UITextField *versionField;
 	IBOutlet UITextField *actionField;
 	IBOutlet UITextField *parametersField;
 	IBOutlet UITextField *callbackField;

diff --git a/Classes/SendViewController.m b/Classes/SendViewController.m
@@ -48,7 +48,6 @@ - (BOOL)canOpenURL
 {
 	if( [[schemeField text] length] == 0 ||
 	    [[hostField text] length] == 0 ||
-	    [[versionField text] length] == 0 ||
 	    [[actionField text] length] == 0 )
 	{
 		return NO;
@@ -75,9 +74,11 @@ -(void)openURL
 	urlString = [urlString stringByAppendingString:@"://"];
 	urlString = [urlString stringByAppendingString:[hostField text]];
 	urlString = [urlString stringByAppendingString:@"/"];
-	urlString = [urlString stringByAppendingString:[versionField text]];
+	// 2011.03.21 by GP - no longer requiring version
-	urlString = [urlString stringByAppendingString:@"/"];
+    //urlString = [urlString stringByAppendingString:[versionField text]];
-	urlString = [urlString stringByAppendingString:[actionField text]];
+	//urlString = [urlString stringByAppendingString:@"/"];
+	// END
+    urlString = [urlString stringByAppendingString:[actionField text]];
 	urlString = [urlString stringByAppendingString:@"?"];
 
 	if ([[callbackField text] length] > 0) {
@@ -141,7 +142,6 @@ - (void)viewDidUnload {
     [super viewDidUnload];
     [schemeField release];
 	[hostField release];
-	[versionField release];
 	[actionField release];
 	[parametersField release];
 	[callbackField release];