diff --git a/ipbc-Client/ipbc-Client.xcodeproj/project.xcworkspace/xcshareddata/ipbc-Client.xccheckout b/ipbc-Client/ipbc-Client.xcodeproj/project.xcworkspace/xcshareddata/ipbc-Client.xccheckout index 1fc089e..00171a8 100644 --- a/ipbc-Client/ipbc-Client.xcodeproj/project.xcworkspace/xcshareddata/ipbc-Client.xccheckout +++ b/ipbc-Client/ipbc-Client.xcodeproj/project.xcworkspace/xcshareddata/ipbc-Client.xccheckout @@ -10,29 +10,29 @@ ipbc-Client IDESourceControlProjectOriginsDictionary - 9E9A1E3F-FB76-4D7F-B5EB-64946445C72E + 41A46EC74341898613642098E6535621FD117950 ssh://web1.adatewithmusic.com/git/ipbc-statusbarapp.git IDESourceControlProjectPath - ipbc-Client/ipbc-Client.xcodeproj/project.xcworkspace + ipbc-Client/ipbc-Client.xcodeproj IDESourceControlProjectRelativeInstallPathDictionary - 9E9A1E3F-FB76-4D7F-B5EB-64946445C72E + 41A46EC74341898613642098E6535621FD117950 ../../.. IDESourceControlProjectURL ssh://web1.adatewithmusic.com/git/ipbc-statusbarapp.git IDESourceControlProjectVersion - 110 + 111 IDESourceControlProjectWCCIdentifier - 9E9A1E3F-FB76-4D7F-B5EB-64946445C72E + 41A46EC74341898613642098E6535621FD117950 IDESourceControlProjectWCConfigurations IDESourceControlRepositoryExtensionIdentifierKey public.vcs.git IDESourceControlWCCIdentifierKey - 9E9A1E3F-FB76-4D7F-B5EB-64946445C72E + 41A46EC74341898613642098E6535621FD117950 IDESourceControlWCCName ipbc-statusbarapp diff --git a/ipbc-Client/ipbc-Client.xcodeproj/project.xcworkspace/xcuserdata/gerrit.xcuserdatad/UserInterfaceState.xcuserstate b/ipbc-Client/ipbc-Client.xcodeproj/project.xcworkspace/xcuserdata/gerrit.xcuserdatad/UserInterfaceState.xcuserstate index 336eca3..c680910 100644 Binary files a/ipbc-Client/ipbc-Client.xcodeproj/project.xcworkspace/xcuserdata/gerrit.xcuserdatad/UserInterfaceState.xcuserstate and b/ipbc-Client/ipbc-Client.xcodeproj/project.xcworkspace/xcuserdata/gerrit.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/ipbc-Client/ipbc-Client/Base.lproj/MainMenu.xib b/ipbc-Client/ipbc-Client/Base.lproj/MainMenu.xib index 763ac02..adc6029 100644 --- a/ipbc-Client/ipbc-Client/Base.lproj/MainMenu.xib +++ b/ipbc-Client/ipbc-Client/Base.lproj/MainMenu.xib @@ -1,8 +1,8 @@ - + - - + + @@ -11,7 +11,7 @@ - + @@ -677,14 +677,13 @@ - + - @@ -693,7 +692,6 @@ - @@ -702,7 +700,6 @@ - @@ -711,7 +708,6 @@ - @@ -719,17 +715,16 @@ - - - + + + This is an application that updates your hostnames with the latest IP address of your computer assuring that you will always have an updated hostname allowing you to connect to your computer from everywhere. - - @@ -771,13 +763,22 @@ Gw - + @@ -785,6 +786,6 @@ Gw - + - \ No newline at end of file + diff --git a/ipbc-Client/ipbc-Client/WebServiceConstants.h b/ipbc-Client/ipbc-Client/WebServiceConstants.h index 637fe57..0679717 100644 --- a/ipbc-Client/ipbc-Client/WebServiceConstants.h +++ b/ipbc-Client/ipbc-Client/WebServiceConstants.h @@ -10,6 +10,8 @@ @interface WebServiceConstants : NSObject +extern NSString * const HOMEPAGE_REGISTER; + extern NSString * const WS_BASE; extern NSString * const WS_RESOURCE; extern NSString * const WS_GET_USERS_IP_SERVICE; diff --git a/ipbc-Client/ipbc-Client/WebServiceConstants.m b/ipbc-Client/ipbc-Client/WebServiceConstants.m index af8e4b5..89b2643 100644 --- a/ipbc-Client/ipbc-Client/WebServiceConstants.m +++ b/ipbc-Client/ipbc-Client/WebServiceConstants.m @@ -10,6 +10,14 @@ @implementation WebServiceConstants +NSString * const HOMEPAGE_REGISTER = @"https://www.ip-bc.org/login.xhtml"; + +/* +NSString * const WS_BASE = @"localhost:8080/ip-bc.org"; +NSString * const WS_RESOURCE = @"http://localhost:8080/ip-bc.org/ws/update/ip"; +NSString * const WS_GET_USERS_IP_SERVICE = @"http://localhost:8080/ip-bc.org/ws/info/ip"; +*/ + NSString * const WS_BASE = @"www.ip-bc.org"; NSString * const WS_RESOURCE = @"https://www.ip-bc.org/ws/update/ip"; NSString * const WS_GET_USERS_IP_SERVICE = @"https://www.ip-bc.org/ws/info/ip"; diff --git a/ipbc-Client/ipbc-Client/WebserviceClient.m b/ipbc-Client/ipbc-Client/WebserviceClient.m index b454291..6099276 100644 --- a/ipbc-Client/ipbc-Client/WebserviceClient.m +++ b/ipbc-Client/ipbc-Client/WebserviceClient.m @@ -83,7 +83,7 @@ -(BOOL)checkUpdateNeeded { NSString *storedIPv4 = [[NSUserDefaults standardUserDefaults] stringForKey:@"value.ip.ipv4"]; NSString *fetchedIPv4 = usersIPv4; - + //return YES; if(storedIPv4 == nil) { NSLog(@"stored IPv4 NULL"); return YES; diff --git a/ipbc-Client/ipbc-Client/ipbcAppDelegate.h b/ipbc-Client/ipbc-Client/ipbcAppDelegate.h index 113e8a1..ce85be4 100644 --- a/ipbc-Client/ipbc-Client/ipbcAppDelegate.h +++ b/ipbc-Client/ipbc-Client/ipbcAppDelegate.h @@ -27,4 +27,6 @@ -(IBAction)fromSettingsCancel:(id)sender; -(IBAction)fromSettingsSave:(id)sender; +-(IBAction)gotoHomepage:(id)sender; + @end diff --git a/ipbc-Client/ipbc-Client/ipbcAppDelegate.m b/ipbc-Client/ipbc-Client/ipbcAppDelegate.m index 18c9406..ae4ca6d 100644 --- a/ipbc-Client/ipbc-Client/ipbcAppDelegate.m +++ b/ipbc-Client/ipbc-Client/ipbcAppDelegate.m @@ -8,6 +8,7 @@ #import "ipbcAppDelegate.h" #import "ImageHelper.h" +#import "WebServiceConstants.h" @implementation ipbcAppDelegate @@ -56,4 +57,8 @@ [settings orderOut:self]; } +-(IBAction)gotoHomepage:(id)sender { + [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:HOMEPAGE_REGISTER]]; +} + @end