witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

UI: fix some minor icons

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2015-12-22 14:09:15 +01:00
parent 5f72da9c93
commit 4a1f6ddacc
28 changed files with 1522 additions and 1541 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Classes/AssistantView.m
View file

@ -134,9 +134,9 @@ static UICompositeViewDescription *compositeDescription = nil;
}
[[LinphoneManager instance] resetLinphoneCore];
account_creator = linphone_account_creator_new(
[LinphoneManager getLc],
[LinphoneManager.instance lpConfigStringForKey:@"xmlrpc_url" forSection:@"assistant" withDefault:@""]
.UTF8String);
[LinphoneManager getLc],
[LinphoneManager.instance lpConfigStringForKey:@"xmlrpc_url" inSection:@"assistant" withDefault:@""]
.UTF8String);
linphone_account_creator_set_user_data(account_creator, (__bridge void *)(self));
linphone_account_creator_cbs_set_existence_tested(linphone_account_creator_get_callbacks(account_creator),
assistant_existence_tested);
@ -148,7 +148,7 @@ static UICompositeViewDescription *compositeDescription = nil;
- (void)loadAssistantConfig:(NSString *)rcFilename {
NSString *fullPath = [@"file://" stringByAppendingString:[LinphoneManager bundleFile:rcFilename]];
linphone_core_set_provisioning_uri([LinphoneManager getLc], fullPath.UTF8String);
[[LinphoneManager instance] lpConfigSetInt:1 forKey:@"transient_provisioning" forSection:@"misc"];
[[LinphoneManager instance] lpConfigSetInt:1 forKey:@"transient_provisioning" inSection:@"misc"];
[self resetLiblinphone];
}
@ -179,7 +179,7 @@ static UICompositeViewDescription *compositeDescription = nil;
}
+ (NSString *)errorForStatus:(LinphoneAccountCreatorStatus)status {
BOOL usePhoneNumber = [[LinphoneManager instance] lpConfigBoolForKey:@"use_phone_number" forSection:@"assistant"];
BOOL usePhoneNumber = [[LinphoneManager instance] lpConfigBoolForKey:@"use_phone_number" inSection:@"assistant"];
switch (status) {
case LinphoneAccountCreatorEmailInvalid:
return NSLocalizedString(@"Invalid email.", nil);
@ -685,7 +685,7 @@ void assistant_validation_tested(LinphoneAccountCreator *creator, LinphoneAccoun
nextView = _remoteProvisioningView;
[self loadAssistantConfig:@"assistant_remote.rc"];
[self findTextField:ViewElement_URL].text =
[[LinphoneManager instance] lpConfigStringForKey:@"config-uri" forSection:@"misc"];
[[LinphoneManager instance] lpConfigStringForKey:@"config-uri" inSection:@"misc"];
}
- (IBAction)onCreateAccountClick:(id)sender {
@ -710,7 +710,7 @@ void assistant_validation_tested(LinphoneAccountCreator *creator, LinphoneAccoun
- (IBAction)onRemoteProvisioningLoginClick:(id)sender {
_waitView.hidden = NO;
[[LinphoneManager instance] lpConfigSetInt:1 forKey:@"transient_provisioning" forSection:@"misc"];
[[LinphoneManager instance] lpConfigSetInt:1 forKey:@"transient_provisioning" inSection:@"misc"];
[self configureProxyConfig];
}

4
Classes/Base.lproj/CallView.xib
View file

@ -635,7 +635,7 @@
</connections>
</button>
<view hidden="YES" autoresizesSubviews="NO" userInteractionEnabled="NO" tag="70" contentMode="scaleToFill" id="d9Y-2a-CDI" userLabel="chatNotificationView" customClass="UIBouncingView">
<rect key="frame" x="330" y="8" width="21" height="22"/>
<rect key="frame" x="337" y="8" width="22" height="22"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" tag="71" contentMode="scaleAspectFit" image="history_chat_indicator.png" id="nPO-PM-4zJ" userLabel="chatNotificationImage">
@ -1228,7 +1228,7 @@
</connections>
</button>
<view hidden="YES" autoresizesSubviews="NO" userInteractionEnabled="NO" tag="70" contentMode="scaleToFill" id="1pd-et-5dy" userLabel="chatNotificationView" customClass="UIBouncingView">
<rect key="frame" x="295" y="8" width="21" height="22"/>
<rect key="frame" x="302" y="8" width="22" height="22"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" tag="71" contentMode="scaleAspectFit" image="history_chat_indicator.png" id="7ZF-Ch-AL1" userLabel="chatNotificationImage">

2
Classes/Base.lproj/DialerView.xib
View file

@ -298,7 +298,7 @@
<outlet property="addressField" destination="4" id="237"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="184" userLabel="addCallButton" customClass="UICallButton">
<button hidden="YES" opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="184" userLabel="addCallButton" customClass="UICallButton">
<rect key="frame" x="180" y="0.0" width="360" height="66"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
<accessibility key="accessibilityConfiguration" label="Add call"/>

10
Classes/Base.lproj/DialerView~ipad.xib
View file

@ -45,8 +45,8 @@
<rect key="frame" x="0.0" y="0.0" width="800" height="1130"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
</imageView>
<imageView userInteractionEnabled="NO" tag="2" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="linphone_logo.png" id="tsy-aZ-cHg" userLabel="logoImage">
<rect key="frame" x="280" y="267" width="240" height="128"/>
<imageView userInteractionEnabled="NO" tag="2" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="dialer_background.png" id="tsy-aZ-cHg" userLabel="logoImage">
<rect key="frame" x="245" y="267" width="310" height="177"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
</imageView>
<view tag="3" contentMode="scaleAspectFill" id="30b-JN-Ibj" userLabel="preview">
@ -357,7 +357,7 @@
</subviews>
<color key="backgroundColor" red="1" green="1" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<point key="canvasLocation" x="-68" y="222.5"/>
<point key="canvasLocation" x="-68" y="222"/>
</view>
<view contentMode="scaleToFill" id="bb3-7f-P2J" userLabel="iphone6MetricsView">
<rect key="frame" x="0.0" y="0.0" width="1290" height="800"/>
@ -371,7 +371,7 @@
<rect key="frame" x="0.0" y="0.0" width="1240" height="770"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
</imageView>
<imageView userInteractionEnabled="NO" tag="2" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="linphone_logo.png" id="bV0-6N-YFL" userLabel="logoImage">
<imageView userInteractionEnabled="NO" tag="2" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="dialer_background.png" id="bV0-6N-YFL" userLabel="logoImage">
<rect key="frame" x="143" y="265" width="240" height="240"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
</imageView>
@ -709,7 +709,7 @@
<image name="color_L.png" width="2" height="2"/>
<image name="contact_add_default.png" width="34" height="29"/>
<image name="contact_add_disabled.png" width="34" height="29"/>
<image name="linphone_logo.png" width="26" height="22"/>
<image name="dialer_background.png" width="85" height="77"/>
<image name="numpad_0_default.png" width="52" height="48"/>
<image name="numpad_0_over.png" width="52" height="48"/>
<image name="numpad_1_default.png" width="52" height="48"/>

2
Classes/CallSideMenuView.m
View file

@ -94,8 +94,6 @@
[result appendString:@"\n"];
[result appendString:name];
[result appendString:@"\n"];
[result appendString:NSLocalizedString(@"Not enabled yet", nil)];
[result appendString:@"\n"];
[result appendString:[NSString stringWithFormat:@"Codec: %s/%iHz", payload->mime_type, payload->clock_rate]];
if (stream == LinphoneStreamTypeAudio) {

1
Classes/CallView.m
View file

@ -380,7 +380,6 @@ static UICompositeViewDescription *compositeDescription = nil;
[PhoneMainView.instance fullScreen:true];
[PhoneMainView.instance showTabBar:false];
[self showStatusBar:false];
#ifdef TEST_VIDEO_VIEW_CHANGE
[NSTimer scheduledTimerWithTimeInterval:5.0

1
Classes/ChatConversationCreateTableView.m
View file

@ -20,6 +20,7 @@
@implementation ChatConversationCreateTableView
- (void)viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated];
self.allContacts =
[[NSDictionary alloc] initWithDictionary:LinphoneManager.instance.fastAddressBook.addressBookMap];
self.contacts = [[NSMutableDictionary alloc] initWithCapacity:_allContacts.count];

1
Classes/ChatConversationCreateView.m
View file

@ -33,6 +33,7 @@ static UICompositeViewDescription *compositeDescription = nil;
}
- (void)viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated];
[_tableController.tableView reloadData];
}

36
Classes/ContactDetailsTableView.m
View file

@ -501,27 +501,18 @@
Entry *entry = [sectionDict objectAtIndex:[indexPath row]];
NSString *value = @"";
// default label is our app name
NSString *label = [FastAddressBook localizedLabel:[labelArray objectAtIndex:0]];
[cell hideDeleteButton:NO];
if (indexPath.section == ContactSections_First_Name) {
value =
(__bridge NSString *)(ABRecordCopyValue(contact, [self propertyIDForSection:ContactSections_First_Name]));
label = nil;
value = (NSString *)CFBridgingRelease(
ABRecordCopyValue(contact, [self propertyIDForSection:ContactSections_First_Name]));
[cell hideDeleteButton:YES];
} else if (indexPath.section == ContactSections_Last_Name) {
value =
(__bridge NSString *)(ABRecordCopyValue(contact, [self propertyIDForSection:ContactSections_Last_Name]));
label = nil;
value = (NSString *)CFBridgingRelease(
ABRecordCopyValue(contact, [self propertyIDForSection:ContactSections_Last_Name]));
[cell hideDeleteButton:YES];
} else if ([indexPath section] == ContactSections_Number) {
ABMultiValueRef lMap = ABRecordCopyValue(contact, kABPersonPhoneProperty);
NSInteger index = ABMultiValueGetIndexForIdentifier(lMap, [entry identifier]);
NSString *labelRef = CFBridgingRelease(ABMultiValueCopyLabelAtIndex(lMap, index));
if (labelRef != NULL) {
label = [FastAddressBook localizedLabel:labelRef];
}
NSString *valueRef = CFBridgingRelease(ABMultiValueCopyValueAtIndex(lMap, index));
if (valueRef != NULL) {
value = [FastAddressBook localizedLabel:valueRef];
@ -530,13 +521,8 @@
} else if ([indexPath section] == ContactSections_Sip) {
ABMultiValueRef lMap = ABRecordCopyValue(contact, kABPersonInstantMessageProperty);
NSInteger index = ABMultiValueGetIndexForIdentifier(lMap, [entry identifier]);
NSString *labelRef = CFBridgingRelease(ABMultiValueCopyLabelAtIndex(lMap, index));
if (labelRef != NULL) {
label = [FastAddressBook localizedLabel:labelRef];
}
CFDictionaryRef lDict = ABMultiValueCopyValueAtIndex(lMap, index);
value = (__bridge NSString *)(CFDictionaryGetValue(lDict, kABPersonInstantMessageUsernameKey));
value = (NSString *)(CFDictionaryGetValue(lDict, kABPersonInstantMessageUsernameKey));
if (value != NULL) {
LinphoneAddress *addr = NULL;
if ([[LinphoneManager instance] lpConfigBoolForKey:@"contact_display_username_only"] &&
@ -554,10 +540,6 @@
} else if ([indexPath section] == ContactSections_Email) {
ABMultiValueRef lMap = ABRecordCopyValue(contact, kABPersonEmailProperty);
NSInteger index = ABMultiValueGetIndexForIdentifier(lMap, [entry identifier]);
NSString *labelRef = CFBridgingRelease(ABMultiValueCopyLabelAtIndex(lMap, index));
if (labelRef != NULL) {
label = [FastAddressBook localizedLabel:labelRef];
}
NSString *valueRef = CFBridgingRelease(ABMultiValueCopyValueAtIndex(lMap, index));
if (valueRef != NULL) {
value = [FastAddressBook localizedLabel:valueRef];
@ -822,10 +804,10 @@
return TRUE;
}
- (BOOL)isValid {
NSString *firstName =
(__bridge NSString *)(ABRecordCopyValue(contact, [self propertyIDForSection:ContactSections_First_Name]));
NSString *lastName =
(__bridge NSString *)(ABRecordCopyValue(contact, [self propertyIDForSection:ContactSections_Last_Name]));
NSString *firstName = (NSString *)CFBridgingRelease(
ABRecordCopyValue(contact, [self propertyIDForSection:ContactSections_First_Name]));
NSString *lastName = (NSString *)CFBridgingRelease(
ABRecordCopyValue(contact, [self propertyIDForSection:ContactSections_Last_Name]));
return firstName.length > 0 || lastName.length > 0;
}

12
Classes/InAppProductsManager.m
View file

@ -44,7 +44,7 @@
- (instancetype)init {
if ((self = [super init]) != nil) {
_enabled = (([SKPaymentQueue canMakePayments]) &&
([[LinphoneManager instance] lpConfigBoolForKey:@"enabled" forSection:@"in_app_purchase"]));
([[LinphoneManager instance] lpConfigBoolForKey:@"enabled" inSection:@"in_app_purchase"]));
_initialized = false;
_available = false;
_accountActivationInProgress = false;
@ -108,7 +108,7 @@
if (phoneNumber) {
NSString *productID =
[[LinphoneManager instance] lpConfigStringForKey:(monthly ? @"paid_account_id_monthly" : @"paid_account_id")
forSection:@"in_app_purchase"];
inSection:@"in_app_purchase"];
self.accountCreationData = @{ @"phoneNumber" : phoneNumber, @"password" : password, @"email" : email };
if (![self purchaseWitID:productID]) {
@ -124,7 +124,7 @@
NSString *receiptBase64 = [self getReceipt];
if (receiptBase64) {
NSURL *URL = [NSURL URLWithString:[[LinphoneManager instance] lpConfigStringForKey:@"receipt_validation_url"
forSection:@"in_app_purchase"]];
inSection:@"in_app_purchase"]];
XMLRPCRequest *request = [[XMLRPCRequest alloc] initWithURL:URL];
// buying for the first time: need to create the account
// if ([transaction.transactionIdentifier
@ -175,7 +175,7 @@
#pragma mark ProductListLoading
- (void)loadProducts {
NSArray *list = [[[[LinphoneManager instance] lpConfigStringForKey:@"products_list" forSection:@"in_app_purchase"]
NSArray *list = [[[[LinphoneManager instance] lpConfigStringForKey:@"products_list" inSection:@"in_app_purchase"]
stringByReplacingOccurrencesOfString:@" "
withString:@""] componentsSeparatedByString:@","];
@ -263,7 +263,7 @@
// transaction is null when restoring user purchases at application start or if user clicks the "restore" button
// We must validate the receipt on our server
NSURL *URL = [NSURL URLWithString:[[LinphoneManager instance] lpConfigStringForKey:@"receipt_validation_url"
forSection:@"in_app_purchase"]];
inSection:@"in_app_purchase"]];
XMLRPCRequest *request = [[XMLRPCRequest alloc] initWithURL:URL];
// buying for the first time: need to create the account
// if ([transaction.transactionIdentifier
@ -387,7 +387,7 @@
LOGI(@"XMLRPC response %@: %@", [request method], [response body]);
NSString *productID =
[[LinphoneManager instance] lpConfigStringForKey:@"paid_account_id" forSection:@"in_app_purchase"];
[[LinphoneManager instance] lpConfigStringForKey:@"paid_account_id" inSection:@"in_app_purchase"];
// validation succeeded
if (![response isFault] && [response object] != nil) {

10
Classes/LinphoneCoreSettingsStore.m
View file

@ -250,11 +250,11 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
[self setFloat:linphone_core_get_playback_gain_db(lc) forKey:@"playback_gain_preference"];
[self setFloat:linphone_core_get_mic_gain_db(lc) forKey:@"microphone_gain_preference"];
[self setInteger:[lm lpConfigIntForKey:@"codec_bitrate_limit"
forSection:@"audio"
inSection:@"audio"
withDefault:kLinphoneAudioVbrCodecDefaultBitrate]
forKey:@"audio_codec_bitrate_limit_preference"];
[self setInteger:[lm lpConfigIntForKey:@"voiceproc_preference" withDefault:1] forKey:@"voiceproc_preference"];
[self setInteger:[lm lpConfigIntForKey:@"eq_active" forSection:@"sound" withDefault:0] forKey:@"eq_active"];
[self setInteger:[lm lpConfigIntForKey:@"eq_active" inSection:@"sound" withDefault:0] forKey:@"eq_active"];
}
// video section
@ -429,7 +429,7 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
[self setInteger:port_preference forKey:@"port_preference"]; // Update back preference
BOOL enable_ipv6 = [self boolForKey:@"use_ipv6"];
[lm lpConfigSetBool:enable_ipv6 forKey:@"use_ipv6" forSection:@"sip"];
[lm lpConfigSetBool:enable_ipv6 forKey:@"use_ipv6" inSection:@"sip"];
if (linphone_core_ipv6_enabled(lc) != enable_ipv6) {
LOGD(@"%@ IPV6", enable_ipv6 ? @"ENABLING" : @"DISABLING");
linphone_core_enable_ipv6(lc, enable_ipv6);
@ -634,13 +634,13 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
[lm lpConfigSetInt:[self integerForKey:@"audio_codec_bitrate_limit_preference"]
forKey:@"codec_bitrate_limit"
forSection:@"audio"];
inSection:@"audio"];
BOOL voice_processing = [self boolForKey:@"voiceproc_preference"];
[lm lpConfigSetInt:voice_processing forKey:@"voiceproc_preference"];
BOOL equalizer = [self boolForKey:@"eq_active"];
[lm lpConfigSetBool:equalizer forKey:@"eq_active" forSection:@"sound"];
[lm lpConfigSetBool:equalizer forKey:@"eq_active" inSection:@"sound"];
[[LinphoneManager instance] configureVbrCodecs];

18
Classes/LinphoneManager.h
View file

@ -169,25 +169,25 @@ typedef struct _LinphoneManagerSounds {
+(void)setValueInMessageAppData:(id)value forKey:(NSString*)key inMessage:(LinphoneChatMessage*)msg;
- (void)lpConfigSetString:(NSString*)value forKey:(NSString*)key;
- (void)lpConfigSetString:(NSString*)value forKey:(NSString*)key forSection:(NSString*)section;
- (void)lpConfigSetString:(NSString *)value forKey:(NSString *)key inSection:(NSString *)section;
- (NSString *)lpConfigStringForKey:(NSString *)key;
- (NSString*)lpConfigStringForKey:(NSString*)key forSection:(NSString*)section;
- (NSString *)lpConfigStringForKey:(NSString *)key inSection:(NSString *)section;
- (NSString *)lpConfigStringForKey:(NSString *)key withDefault:(NSString *)value;
- (NSString *)lpConfigStringForKey:(NSString *)key forSection:(NSString *)section withDefault:(NSString *)value;
- (NSString *)lpConfigStringForKey:(NSString *)key inSection:(NSString *)section withDefault:(NSString *)value;
- (void)lpConfigSetInt:(int)value forKey:(NSString *)key;
- (void)lpConfigSetInt:(int)value forKey:(NSString *)key forSection:(NSString *)section;
- (void)lpConfigSetInt:(int)value forKey:(NSString *)key inSection:(NSString *)section;
- (int)lpConfigIntForKey:(NSString *)key;
- (int)lpConfigIntForKey:(NSString *)key forSection:(NSString *)section;
- (int)lpConfigIntForKey:(NSString *)key inSection:(NSString *)section;
- (int)lpConfigIntForKey:(NSString *)key withDefault:(int)value;
- (int)lpConfigIntForKey:(NSString *)key forSection:(NSString *)section withDefault:(int)value;
- (int)lpConfigIntForKey:(NSString *)key inSection:(NSString *)section withDefault:(int)value;
- (void)lpConfigSetBool:(BOOL)value forKey:(NSString*)key;
- (void)lpConfigSetBool:(BOOL)value forKey:(NSString*)key forSection:(NSString*)section;
- (void)lpConfigSetBool:(BOOL)value forKey:(NSString *)key inSection:(NSString *)section;
- (BOOL)lpConfigBoolForKey:(NSString *)key;
- (BOOL)lpConfigBoolForKey:(NSString*)key forSection:(NSString*)section;
- (BOOL)lpConfigBoolForKey:(NSString *)key inSection:(NSString *)section;
- (BOOL)lpConfigBoolForKey:(NSString *)key withDefault:(BOOL)value;
- (BOOL)lpConfigBoolForKey:(NSString *)key forSection:(NSString *)section withDefault:(BOOL)value;
- (BOOL)lpConfigBoolForKey:(NSString *)key inSection:(NSString *)section withDefault:(BOOL)value;
- (void)silentPushFailed:(NSTimer*)timer;

42
Classes/LinphoneManager.m
View file

@ -1951,7 +1951,7 @@ static void audioRouteChangeListenerCallback(void *inUserData, // 1
}
if ([[LinphoneManager instance] lpConfigBoolForKey:@"override_domain_with_default_one"]) {
linphone_address_set_domain(
addr, [[[LinphoneManager instance] lpConfigStringForKey:@"domain" forSection:@"assistant"] UTF8String]);
addr, [[[LinphoneManager instance] lpConfigStringForKey:@"domain" inSection:@"assistant"] UTF8String]);
}
if (transfer) {
@ -2169,9 +2169,9 @@ static void audioRouteChangeListenerCallback(void *inUserData, // 1
#pragma mark - LPConfig Functions
- (void)lpConfigSetString:(NSString *)value forKey:(NSString *)key {
[self lpConfigSetString:value forKey:key forSection:LINPHONERC_APPLICATION_KEY];
[self lpConfigSetString:value forKey:key inSection:LINPHONERC_APPLICATION_KEY];
}
- (void)lpConfigSetString:(NSString *)value forKey:(NSString *)key forSection:(NSString *)section {
- (void)lpConfigSetString:(NSString *)value forKey:(NSString *)key inSection:(NSString *)section {
if (!key)
return;
lp_config_set_string(configDb, [section UTF8String], [key UTF8String], value ? [value UTF8String] : NULL);
@ -2180,12 +2180,12 @@ static void audioRouteChangeListenerCallback(void *inUserData, // 1
return [self lpConfigStringForKey:key withDefault:nil];
}
- (NSString *)lpConfigStringForKey:(NSString *)key withDefault:(NSString *)defaultValue {
return [self lpConfigStringForKey:key forSection:LINPHONERC_APPLICATION_KEY withDefault:defaultValue];
return [self lpConfigStringForKey:key inSection:LINPHONERC_APPLICATION_KEY withDefault:defaultValue];
}
- (NSString *)lpConfigStringForKey:(NSString *)key forSection:(NSString *)section {
return [self lpConfigStringForKey:key forSection:section withDefault:nil];
- (NSString *)lpConfigStringForKey:(NSString *)key inSection:(NSString *)section {
return [self lpConfigStringForKey:key inSection:section withDefault:nil];
}
- (NSString *)lpConfigStringForKey:(NSString *)key forSection:(NSString *)section withDefault:(NSString *)defaultValue {
- (NSString *)lpConfigStringForKey:(NSString *)key inSection:(NSString *)section withDefault:(NSString *)defaultValue {
if (!key)
return defaultValue;
const char *value = lp_config_get_string(configDb, [section UTF8String], [key UTF8String], NULL);
@ -2193,9 +2193,9 @@ static void audioRouteChangeListenerCallback(void *inUserData, // 1
}
- (void)lpConfigSetInt:(int)value forKey:(NSString *)key {
[self lpConfigSetInt:value forKey:key forSection:LINPHONERC_APPLICATION_KEY];
[self lpConfigSetInt:value forKey:key inSection:LINPHONERC_APPLICATION_KEY];
}
- (void)lpConfigSetInt:(int)value forKey:(NSString *)key forSection:(NSString *)section {
- (void)lpConfigSetInt:(int)value forKey:(NSString *)key inSection:(NSString *)section {
if (!key)
return;
lp_config_set_int(configDb, [section UTF8String], [key UTF8String], (int)value);
@ -2204,36 +2204,36 @@ static void audioRouteChangeListenerCallback(void *inUserData, // 1
return [self lpConfigIntForKey:key withDefault:-1];
}
- (int)lpConfigIntForKey:(NSString *)key withDefault:(int)defaultValue {
return [self lpConfigIntForKey:key forSection:LINPHONERC_APPLICATION_KEY withDefault:defaultValue];
return [self lpConfigIntForKey:key inSection:LINPHONERC_APPLICATION_KEY withDefault:defaultValue];
}
- (int)lpConfigIntForKey:(NSString *)key forSection:(NSString *)section {
return [self lpConfigIntForKey:key forSection:section withDefault:-1];
- (int)lpConfigIntForKey:(NSString *)key inSection:(NSString *)section {
return [self lpConfigIntForKey:key inSection:section withDefault:-1];
}
- (int)lpConfigIntForKey:(NSString *)key forSection:(NSString *)section withDefault:(int)defaultValue {
- (int)lpConfigIntForKey:(NSString *)key inSection:(NSString *)section withDefault:(int)defaultValue {
if (!key)
return defaultValue;
return lp_config_get_int(configDb, [section UTF8String], [key UTF8String], (int)defaultValue);
}
- (void)lpConfigSetBool:(BOOL)value forKey:(NSString *)key {
[self lpConfigSetBool:value forKey:key forSection:LINPHONERC_APPLICATION_KEY];
[self lpConfigSetBool:value forKey:key inSection:LINPHONERC_APPLICATION_KEY];
}
- (void)lpConfigSetBool:(BOOL)value forKey:(NSString *)key forSection:(NSString *)section {
[self lpConfigSetInt:(int)(value == TRUE)forKey:key forSection:section];
- (void)lpConfigSetBool:(BOOL)value forKey:(NSString *)key inSection:(NSString *)section {
[self lpConfigSetInt:(int)(value == TRUE) forKey:key inSection:section];
}
- (BOOL)lpConfigBoolForKey:(NSString *)key {
return [self lpConfigBoolForKey:key withDefault:FALSE];
}
- (BOOL)lpConfigBoolForKey:(NSString *)key withDefault:(BOOL)defaultValue {
return [self lpConfigBoolForKey:key forSection:LINPHONERC_APPLICATION_KEY withDefault:defaultValue];
return [self lpConfigBoolForKey:key inSection:LINPHONERC_APPLICATION_KEY withDefault:defaultValue];
}
- (BOOL)lpConfigBoolForKey:(NSString *)key forSection:(NSString *)section {
return [self lpConfigBoolForKey:key forSection:section withDefault:FALSE];
- (BOOL)lpConfigBoolForKey:(NSString *)key inSection:(NSString *)section {
return [self lpConfigBoolForKey:key inSection:section withDefault:FALSE];
}
- (BOOL)lpConfigBoolForKey:(NSString *)key forSection:(NSString *)section withDefault:(BOOL)defaultValue {
- (BOOL)lpConfigBoolForKey:(NSString *)key inSection:(NSString *)section withDefault:(BOOL)defaultValue {
if (!key)
return defaultValue;
int val = [self lpConfigIntForKey:key forSection:section withDefault:-1];
int val = [self lpConfigIntForKey:key inSection:section withDefault:-1];
return (val != -1) ? (val == 1) : defaultValue;
}

4
Classes/LinphoneUI/Base.lproj/TabBarView.xib
View file

@ -84,7 +84,7 @@
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
</imageView>
<view hidden="YES" autoresizesSubviews="NO" userInteractionEnabled="NO" tag="7" contentMode="scaleToFill" id="37" userLabel="chatNotificationView" customClass="UIBouncingView">
<rect key="frame" x="338" y="0.0" width="21" height="22"/>
<rect key="frame" x="338" y="0.0" width="22" height="22"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" tag="8" contentMode="scaleAspectFit" image="history_chat_indicator.png" id="39" userLabel="chatNotificationImage">
@ -105,7 +105,7 @@
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</view>
<view hidden="YES" autoresizesSubviews="NO" userInteractionEnabled="NO" tag="10" contentMode="scaleToFill" id="32" userLabel="historyNotificationView" customClass="UIBouncingView">
<rect key="frame" x="68" y="0.0" width="21" height="22"/>
<rect key="frame" x="68" y="0.0" width="22" height="22"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" tag="11" contentMode="scaleAspectFit" image="history_chat_indicator.png" id="33" userLabel="historyNotificationImage">

1
Classes/LinphoneUI/UIChatBubbleTextCell.m
View file

@ -56,6 +56,7 @@
if (_message) {
linphone_chat_message_unref(_message);
CFBridgingRelease(linphone_chat_message_get_user_data(_message));
linphone_chat_message_set_user_data(_message, NULL);
linphone_chat_message_cbs_set_msg_state_changed(linphone_chat_message_get_callbacks(_message), NULL);
}

6
Classes/LinphoneUI/UIChatCell.m
View file

@ -116,9 +116,9 @@
[UIView setAnimationDuration:0.3];
}
if (editing) {
[_unreadCountView setAlpha:0.0f];
} else {
[_unreadCountView setAlpha:1.0f];
[_unreadCountView stopAnimating:animated];
} else if (linphone_chat_room_get_unread_messages_count(chatRoom) > 0) {
[_unreadCountView startAnimating:animated];
}
if (animated) {
[UIView commitAnimations];

2
Classes/LinphoneUI/UICompositeView.m
View file

@ -510,8 +510,6 @@
[self.sideMenuViewController didRotateFromInterfaceOrientation:oldOrientation];
}
}
} else {
oldViewDescription = (currentViewDescription != nil) ? [currentViewDescription copy] : nil;
}
if (currentViewDescription == nil) {

1
Classes/LinphoneUI/UIRoundedImageView.m
View file

@ -66,6 +66,7 @@ INIT_WITH_COMMON {
CGPathRef path = CGPathCreateWithEllipseInRect(box, NULL);
UIBezierPath *maskPath = [UIBezierPath bezierPathWithCGPath:path];
CGPathRelease(path);
CAShapeLayer *maskLayer = [CAShapeLayer layer];
maskLayer.frame = self.bounds;
maskLayer.path = maskPath.CGPath;

4
Classes/PhoneMainView.m
View file

@ -296,7 +296,7 @@ static RootViewManager *rootViewManagerInstance = nil;
static BOOL already_shown = FALSE;
if (state == LinphoneGlobalOn && !already_shown && [LinphoneManager instance].wasRemoteProvisioned) {
LinphoneProxyConfig *conf = linphone_core_get_default_proxy_config([LinphoneManager getLc]);
if ([[LinphoneManager instance] lpConfigBoolForKey:@"show_login_view" forSection:@"app"] && conf == NULL) {
if ([[LinphoneManager instance] lpConfigBoolForKey:@"show_login_view" inSection:@"app"] && conf == NULL) {
already_shown = TRUE;
AssistantView *view = VIEW(AssistantView);
[PhoneMainView.instance changeCurrentView:view.compositeViewDescription];
@ -556,7 +556,7 @@ static RootViewManager *rootViewManagerInstance = nil;
- (void)changeCurrentView:(UICompositeViewDescription *)view push:(BOOL)push animated:(BOOL)animated {
NSMutableArray *viewStack = [RootViewManager instance].viewDescriptionStack;
if (push) {
if (push && view) {
[viewStack addObject:view];
}
[self _changeCurrentView:view transition:nil animated:animated];

5
Classes/SideMenuTableView.m
View file

@ -27,6 +27,8 @@
@implementation SideMenuTableView
- (void)viewDidLoad {
[super viewDidLoad];
// remove separators between empty items, cf
// http://stackoverflow.com/questions/1633966/can-i-force-a-uitableview-to-hide-the-separator-between-empty-cells
self.tableView.tableFooterView = [[UIView alloc] initWithFrame:CGRectZero];
@ -107,8 +109,9 @@
LOGI(@"Entry %@ has been tapped", entry->title);
if (entry->onTapBlock == nil) {
LOGF(@"Entry %@ has no onTapBlock!", entry->title);
} else {
entry->onTapBlock();
}
entry->onTapBlock();
}
[PhoneMainView.instance.mainViewController hideSideMenu:YES];
}

3
Classes/Utils/InAppSettingsKit/Controllers/IASKAppSettingsWebViewController.m
View file

@ -52,7 +52,8 @@
}
- (void)viewWillAppear:(BOOL)animated {
- (void)viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated];
[webView loadRequest:[NSURLRequest requestWithURL:self.url]];
}

4
Classes/Utils/XMLRPCHelper.m
View file

@ -53,7 +53,7 @@ static XMLRPCHelper *xmlManager = nil;
onError:(BOOL (^)(XMLRPCRequest *req))errorBlock {
LOGI(@"XMLRPC %@ - %@", method, params);
NSURL *URL =
[NSURL URLWithString:[LinphoneManager.instance lpConfigStringForKey:@"xmlrpc_url" forSection:@"assistant"]];
[NSURL URLWithString:[LinphoneManager.instance lpConfigStringForKey:@"xmlrpc_url" inSection:@"assistant"]];
BlockXMLRPCRequest *request = [[BlockXMLRPCRequest alloc] initWithURL:URL];
[request setMethod:method withParameters:params];
if (successBlock) {
@ -148,7 +148,7 @@ static XMLRPCHelper *xmlManager = nil;
NSString *url =
[NSString stringWithFormat:@"%@/%@.xml",
[LinphoneManager.instance lpConfigStringForKey:@"remote_prosivioning_root"
forSection:@"assistant"],
inSection:@"assistant"],
response.object];
onSuccess(url);
} else {

BIN
Resources/images/chat_list_indicator.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 333 B

BIN
Resources/images/chat_list_indicator@2x.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 599 B

BIN
Resources/images/color_B.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 260 B

BIN
Resources/images/dialer_background.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
Resources/images/dialer_background@2x.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.3 KiB

2880
linphone.xcodeproj/project.pbxproj
View file

File diff suppressed because it is too large Load diff