From db2d7230cc19ca18f5ecb8214ff31501fa2b7153 Mon Sep 17 00:00:00 2001 From: Joerg Platte Date: Fri, 14 Dec 2012 18:16:50 +0100 Subject: [PATCH 1/4] remove ring! --- Classes/BuschJaegerMainView.m | 4 ++-- Classes/LinphoneManager.m | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Classes/BuschJaegerMainView.m b/Classes/BuschJaegerMainView.m index 56cad40f2..85629a97d 100644 --- a/Classes/BuschJaegerMainView.m +++ b/Classes/BuschJaegerMainView.m @@ -318,8 +318,8 @@ static BuschJaegerMainView* mainViewInstance=nil; - (void)displayMessage:(id)message { if (![[UIDevice currentDevice] respondsToSelector:@selector(isMultitaskingSupported)] || [UIApplication sharedApplication].applicationState == UIApplicationStateActive) { - UIAlertView* error = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Dring !",nil) - message: [NSString stringWithFormat:NSLocalizedString(@"%@ ring!",nil), [LinphoneManager instance].configuration.levelPushButton.name] + UIAlertView* error = [[UIAlertView alloc] initWithTitle:@"Welcome" + message: [NSString stringWithFormat:@"%@", [LinphoneManager instance].configuration.levelPushButton.name] delegate:nil cancelButtonTitle:NSLocalizedString(@"Continue",nil) otherButtonTitles:nil,nil]; diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index a3f5d1d86..b2b23229b 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -474,7 +474,7 @@ static void linphone_iphone_display_status(struct _LinphoneCore * lc, const char data->notification = [[UILocalNotification alloc] init]; if (data->notification) { data->notification.repeatInterval = 0; - data->notification.alertBody = [NSString stringWithFormat:NSLocalizedString(@"%@ ring!",nil), address]; + data->notification.alertBody = [NSString stringWithFormat:@"%@", address]; data->notification.alertAction = NSLocalizedString(@"Answer", nil); data->notification.soundName = ringtone; data->notification.userInfo = [NSDictionary dictionaryWithObject:callId forKey:@"callId"]; @@ -601,7 +601,7 @@ static void linphone_iphone_registration_state(LinphoneCore *lc, LinphoneProxyCo UILocalNotification* notif = [[[UILocalNotification alloc] init] autorelease]; if (notif) { notif.repeatInterval = 0; - notif.alertBody = [NSString stringWithFormat:NSLocalizedString(@"%@ ring!",nil), configuration.levelPushButton.name]; + notif.alertBody = [NSString stringWithFormat:@"%@", configuration.levelPushButton.name]; notif.alertAction = NSLocalizedString(@"Show", nil); notif.soundName = ringtone; From 5a60af0a4cbd847abf6b8caa51ad6a2cf84009a0 Mon Sep 17 00:00:00 2001 From: Joerg Platte Date: Thu, 10 Jan 2013 08:29:38 +0100 Subject: [PATCH 2/4] version bump --- buschjaeger-Info.plist | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buschjaeger-Info.plist b/buschjaeger-Info.plist index 6b3c985f3..99a3b467b 100644 --- a/buschjaeger-Info.plist +++ b/buschjaeger-Info.plist @@ -45,11 +45,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.4.0 + 0.5.0 CFBundleSignature ???? CFBundleVersion - 0.4.0 + 0.5.0 NSMainNibFile BuschJaegerApp NSMainNibFile~ipad From 2d3aa9f0fd6543564c7550bca74c3a1d9a9e0bc8 Mon Sep 17 00:00:00 2001 From: Joerg Platte Date: Thu, 10 Jan 2013 08:35:34 +0100 Subject: [PATCH 3/4] exchange QR image --- Resources/bj_barcode.png | Bin 886 -> 497 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/bj_barcode.png b/Resources/bj_barcode.png index 312efd841a4e538a21940ed4b8a88e66791d6c59..7ecd4442b8989a4c715bcdd3eaad3b64bccad138 100644 GIT binary patch literal 497 zcmVbSPH?eujh7UQJh2}8)$aVC%L*%MPONaoL) zs^p&GmSjUhw@&WAaLen+J;bH2DV~u268Y|kzV0k>;UBUi^MW)cjF>1+N6zDKT%8(!#-a5GCN)P1u# z6SOP2I&RrlYSeS0$ARTmBUi?SbDfeYrjtmfL9UMT?rSB^rNp4*hrZ-$IJxMy-R$kB z;cMh-IONQizF5!xNA7mczsZp=Mgp+~;*qQ4JcU-Yyn)oXSLwSyAXma^l$c%e(I!Vn z=DtR*h8v;Q6^54TnMSUN+uc$( z>bSgZ+!IT_+!Z;RPC|kisHYm;00000NkvXXu0mjfklN|| literal 886 zcmeAS@N?(olHy`uVBq!ia0vp^Q$U!52}u5mo8HX8z-;U3;uumf=k45seYXvGSZ62w z|3CfmYJH{?c1Eim)B0N1mKrN?Tw3&}YXANEmXr7I*D?I8pTh1|nSh_D+hx8dZvDsh zihaQ~>*{}fKV{{=>wHY*@tuFILkvD0(BSX+bYM&Iy~!#6y;ajye!lnoe(&=AwQKIH zo}B9@C-Jl~P;Q3Cb6d|>8&-N_>oG@qKkel{o&!o4-p<16S zr@o#Xv-RV<3s9>!7xA6`cIS54-05rHuW6bR01AXi`{Z5G#;WgcPcjZ$_G{za=RPnG zteImt_esD1xozd?jFbQD4P=*wy6Rf>Z1rX5&a7Fp(=dMGlM|XSPsrchZh7^&&%B2& z+ud(HEm^;rE4~XHk~eDNT9-_(h)U1ee==nK*U8U|rJzO~J0~~$m3iKG-Q~Y}rT5PU z>SzJ$I8{0Oq~*ony+_^}FJ8Xy_Pm5Az}N!0_I#!2q+e^ImGjQOD&4sK=TdMa$9#`% z?VXqY{nyHTiO_#}O%ow$C#_a(?;+m%=`X%%<^Q-h0VbNNw%6&?xtv!vXP(4;-{1kY z(C1fY@0=-n&U Date: Thu, 10 Jan 2013 09:08:03 +0100 Subject: [PATCH 4/4] enable locking of light switch remove domain settings adjust proxy setting --- Classes/BuschJaegerCallView.m | 2 +- Classes/BuschJaegerConfiguration.m | 2 ++ Classes/LinphoneAppDelegate.m | 1 + Classes/LinphoneManager.m | 4 ++-- Settings.bundle/Root.plist | 34 ++++++++++++------------------ 5 files changed, 19 insertions(+), 24 deletions(-) diff --git a/Classes/BuschJaegerCallView.m b/Classes/BuschJaegerCallView.m index 5f58060ff..afa52ca54 100644 --- a/Classes/BuschJaegerCallView.m +++ b/Classes/BuschJaegerCallView.m @@ -177,7 +177,7 @@ /* init gradients for lightsButton */ { - bool enabled = (usr != nil && usr.switchlight); + bool enabled = (usr != nil && usr.switchlight && ![[NSUserDefaults standardUserDefaults] boolForKey:@"switchlight_preference"]); UIColor* col1 = (enabled)?BUSCHJAEGER_NORMAL_COLOR:BUSCHJAEGER_GRAY_COLOR; UIColor* col2 = (enabled)?BUSCHJAEGER_NORMAL_COLOR2:BUSCHJAEGER_GRAY_COLOR2; diff --git a/Classes/BuschJaegerConfiguration.m b/Classes/BuschJaegerConfiguration.m index e14a5e1ff..fba971e52 100644 --- a/Classes/BuschJaegerConfiguration.m +++ b/Classes/BuschJaegerConfiguration.m @@ -424,6 +424,8 @@ static NSString *const CONFIGURATION_HOME_AP_KEY = @"CONFIGURATION_HOME_AP_KEY"; } } [[NSUserDefaults standardUserDefaults] synchronize]; + [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"ipgateway_preference"]; + [[NSUserDefaults standardUserDefaults] setObject:[[NSURL URLWithString:urlString] host] forKey:@"ipgateway_preference"]; } else { dispatch_async(dispatch_get_main_queue(), ^{ [delegate buschJaegerConfigurationError:[NSString stringWithFormat:@"Request not succeed (Status code:%d)", urlResponse.statusCode]]; diff --git a/Classes/LinphoneAppDelegate.m b/Classes/LinphoneAppDelegate.m index c5e387af2..ba6a992e8 100644 --- a/Classes/LinphoneAppDelegate.m +++ b/Classes/LinphoneAppDelegate.m @@ -145,6 +145,7 @@ @"ringtone_01_1600", @"ringtone_preference", @"ringtone_01_1600", @"level_ringtone_preference", @"NO", @"lockdoors_preference", + @"NO", @"switchlight_preference", majorVersion, @"version_preference", nil]; diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index b2b23229b..f19330621 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -1463,7 +1463,6 @@ static void audioRouteChangeListenerCallback ( //madatory parameters NSString* username = [[NSUserDefaults standardUserDefaults] stringForKey:@"username_preference"]; - NSString* domain = [[NSUserDefaults standardUserDefaults] stringForKey:@"domain_preference"]; NSString* accountPassword = [[NSUserDefaults standardUserDefaults] stringForKey:@"password_preference"]; //bool configCheckDisable = [[NSUserDefaults standardUserDefaults] boolForKey:@"check_config_disable_preference"]; /* MODIFICATION always enable outbound*/ @@ -1474,7 +1473,8 @@ static void audioRouteChangeListenerCallback ( linphone_core_clear_all_auth_info(theLinphoneCore); //clear existing proxy config linphone_core_clear_proxy_config(theLinphoneCore); - if (username && [username length] >0 && domain && [domain length]>0) { + if (username && [username length] >0) { + NSString* domain = configuration.network.domain; const char* identity = [[NSString stringWithFormat:@"sip:%@@%@",username,domain] cStringUsingEncoding:[NSString defaultCStringEncoding]]; const char* password = [accountPassword cStringUsingEncoding:[NSString defaultCStringEncoding]]; diff --git a/Settings.bundle/Root.plist b/Settings.bundle/Root.plist index 79ca6462e..ef33453b4 100644 --- a/Settings.bundle/Root.plist +++ b/Settings.bundle/Root.plist @@ -64,29 +64,11 @@ IsSecure Key - domain_preference + ipgateway_preference KeyboardType URL Title - Domain - Type - PSTextFieldSpecifier - - - AutocapitalizationType - None - AutocorrectionType - No - DefaultValue - - IsSecure - - Key - proxy_preference - KeyboardType - URL - Title - Proxy + IP-Gateway Type PSTextFieldSpecifier @@ -162,10 +144,20 @@ Key lockdoors_preference Title - Lock doors + Hide Lock door Type PSToggleSwitchSpecifier + + Type + PSToggleSwitchSpecifier + Title + Hide Switch Light + Key + switchlight_preference + DefaultValue + + DefaultValue