diff --git a/Classes/BuschJaegerCallView.m b/Classes/BuschJaegerCallView.m
index 951e0315b..c5e0585d5 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/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/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 a3f5d1d86..f19330621 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;
@@ -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/Resources/bj_barcode.png b/Resources/bj_barcode.png
index 312efd841..7ecd4442b 100644
Binary files a/Resources/bj_barcode.png and b/Resources/bj_barcode.png differ
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
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