From 0304772eff72e6cf2e587b6bcc4a895e8fde2f75 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Wed, 30 Jan 2013 10:49:48 +0100 Subject: [PATCH 1/2] Update linphone --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 0a7832f19..3b722ada2 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 0a7832f19e1f875cc39deb3d7a684b754000b174 +Subproject commit 3b722ada225c8adfcb19a0784f05288f8abfcada From eec8c7bb6a37e63c4044cf3595f29739c54361bd Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Wed, 30 Jan 2013 11:02:40 +0100 Subject: [PATCH 2/2] Minor improvements --- Classes/BuschJaegerConfiguration.m | 6 +++++- Classes/BuschJaegerWelcomeView.m | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Classes/BuschJaegerConfiguration.m b/Classes/BuschJaegerConfiguration.m index 4a83e409d..f7a1417a2 100644 --- a/Classes/BuschJaegerConfiguration.m +++ b/Classes/BuschJaegerConfiguration.m @@ -167,7 +167,7 @@ static NSString *const CONFIGURATION_HOME_AP_KEY = @"CONFIGURATION_HOME_AP_KEY"; [levelPushButton release]; } levelPushButton = [obj retain]; - }else { + } else { [LinphoneLogger log:LinphoneLoggerWarning format:@"Unknown section: %@", section]; } } @@ -220,6 +220,7 @@ static NSString *const CONFIGURATION_HOME_AP_KEY = @"CONFIGURATION_HOME_AP_KEY"; NSData *data = nil; data = [NSURLConnection sendSynchronousRequest:pemRequest returningResponse:&response error:&error delegate:self]; if(data == nil) { + [self reset]; dispatch_async(dispatch_get_main_queue(), ^{ [delegate buschJaegerConfigurationError:[error localizedDescription]]; }); @@ -246,6 +247,7 @@ static NSString *const CONFIGURATION_HOME_AP_KEY = @"CONFIGURATION_HOME_AP_KEY"; data = nil; data = [NSURLConnection sendSynchronousRequest:derRequest returningResponse:&response error:&error delegate:self]; if(data == nil) { + [self reset]; dispatch_async(dispatch_get_main_queue(), ^{ [delegate buschJaegerConfigurationError:[error localizedDescription]]; }); @@ -395,6 +397,7 @@ static NSString *const CONFIGURATION_HOME_AP_KEY = @"CONFIGURATION_HOME_AP_KEY"; NSData *data = nil; data = [NSURLConnection sendSynchronousRequest:request returningResponse:&response error:&error delegate:self]; if(data == nil) { + [self reset]; dispatch_async(dispatch_get_main_queue(), ^{ [delegate buschJaegerConfigurationError:[error localizedDescription]]; }); @@ -426,6 +429,7 @@ static NSString *const CONFIGURATION_HOME_AP_KEY = @"CONFIGURATION_HOME_AP_KEY"; [[NSUserDefaults standardUserDefaults] setObject:[[NSURL URLWithString:urlString] host] forKey:@"ipgateway_preference"]; [[NSUserDefaults standardUserDefaults] synchronize]; } else { + [self reset]; dispatch_async(dispatch_get_main_queue(), ^{ [delegate buschJaegerConfigurationError:[NSString stringWithFormat:@"Request not succeed (Status code:%d)", urlResponse.statusCode]]; }); diff --git a/Classes/BuschJaegerWelcomeView.m b/Classes/BuschJaegerWelcomeView.m index bba30eae4..27eec2604 100644 --- a/Classes/BuschJaegerWelcomeView.m +++ b/Classes/BuschJaegerWelcomeView.m @@ -136,6 +136,9 @@ } else { [waitView setHidden:TRUE]; } + } else if(![LinphoneManager instance].configuration.valid) { + // Reset badge number in case of invalid configuration + [[UIApplication sharedApplication] setApplicationIconBadgeNumber:0]; } }