diff --git a/Classes/ChatRoomViewController.m b/Classes/ChatRoomViewController.m index 4b7702131..7e113f581 100644 --- a/Classes/ChatRoomViewController.m +++ b/Classes/ChatRoomViewController.m @@ -156,8 +156,8 @@ static UICompositeViewDescription *compositeDescription = nil; [transferBackgroundImage setImage:[TUNinePatchCache imageOfSize:[transferBackgroundImage bounds].size forNinePatchNamed:@"chat_background"]]; - BOOL fileSharingEnabled = [[LinphoneManager instance] lpConfigStringForKey:@"file_upload_url_preference"] != NULL - && [[[LinphoneManager instance] lpConfigStringForKey:@"file_upload_url_preference"] length]>0; + BOOL fileSharingEnabled = [[LinphoneManager instance] lpConfigStringForKey:@"sharing_server_preference"] != NULL + && [[[LinphoneManager instance] lpConfigStringForKey:@"sharing_server_preference"] length]>0; CGRect pictureFrame = pictureButton.frame; CGRect messageframe = messageView.frame; @@ -457,7 +457,7 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta - (BOOL)chatRoomStartImageUpload:(UIImage*)image url:(NSURL*)url{ if(imageSharing == nil) { - NSString *urlString = [[LinphoneManager instance] lpConfigStringForKey:@"file_upload_url_preference"]; + NSString *urlString = [[LinphoneManager instance] lpConfigStringForKey:@"sharing_server_preference"]; imageSharing = [ImageSharing imageSharingUpload:[NSURL URLWithString:urlString] image:image delegate:self userInfo:url]; [footerView setHidden:TRUE]; [transferView setHidden:FALSE]; @@ -615,6 +615,8 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta // Always stay at bottom CGPoint contentPt = [tableController.tableView contentOffset]; contentPt.y -= diff; + if(contentPt.y + tableFrame.size.height > tableController.tableView.contentSize.height) + contentPt.y += diff; [tableController.tableView setContentOffset:contentPt animated:FALSE]; } diff --git a/Classes/LinphoneCoreSettingsStore.m b/Classes/LinphoneCoreSettingsStore.m index b3e21bddd..853dd5d19 100644 --- a/Classes/LinphoneCoreSettingsStore.m +++ b/Classes/LinphoneCoreSettingsStore.m @@ -194,7 +194,7 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args); [self setBool: lp_config_get_int(linphone_core_get_config(lc), LINPHONERC_APPLICATION_KEY, "debugenable_preference", 0) forKey:@"debugenable_preference"]; [self setBool: lp_config_get_int(linphone_core_get_config(lc), LINPHONERC_APPLICATION_KEY, "animations_preference", 1) forKey:@"animations_preference"]; [self setBool: lp_config_get_int(linphone_core_get_config(lc), LINPHONERC_APPLICATION_KEY, "wifi_only_preference", 0) forKey:@"wifi_only_preference"]; - [self setString: lp_config_get_string(linphone_core_get_config(lc), LINPHONERC_APPLICATION_KEY, "file_upload_url_preference", NULL) forKey:@"file_upload_url_preference"]; + [self setString: lp_config_get_string(linphone_core_get_config(lc), LINPHONERC_APPLICATION_KEY, "sharing_server_preference", NULL) forKey:@"sharing_server_preference"]; /*keep this one also in the standardUserDefaults so that it can be read before starting liblinphone*/ BOOL start_at_boot = TRUE; @@ -448,7 +448,7 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args); NSString* stun_server = [self stringForKey:@"stun_preference"]; if ([stun_server length] > 0){ - linphone_core_set_stun_server(lc,[stun_server cStringUsingEncoding:[NSString defaultCStringEncoding]]); + linphone_core_set_stun_server(lc, [stun_server UTF8String]); BOOL ice_preference = [self boolForKey:@"ice_preference"]; if(ice_preference) { linphone_core_set_firewall_policy(lc, LinphonePolicyUseIce); @@ -512,8 +512,8 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args); BOOL animations = [self boolForKey:@"animations_preference"]; lp_config_set_int(linphone_core_get_config(lc), LINPHONERC_APPLICATION_KEY, "animations_preference", animations); - NSString* file_upload_url= [self stringForKey:@"file_upload_url_preference"]; - [[LinphoneManager instance] lpConfigSetString:file_upload_url forKey:@"file_upload_url_preference"]; + NSString* sharing_server = [self stringForKey:@"sharing_server_preference"]; + [[LinphoneManager instance] lpConfigSetString:sharing_server forKey:@"sharing_server_preference"]; diff --git a/Classes/LinphoneUI/UIChatRoomCell.m b/Classes/LinphoneUI/UIChatRoomCell.m index 22862ed2e..8b9ac0d82 100644 --- a/Classes/LinphoneUI/UIChatRoomCell.m +++ b/Classes/LinphoneUI/UIChatRoomCell.m @@ -47,8 +47,8 @@ static const CGFloat CELL_MAX_WIDTH = 320.0f; static const CGFloat CELL_MESSAGE_X_MARGIN = 26.0f; static const CGFloat CELL_MESSAGE_Y_MARGIN = 36.0f; static const CGFloat CELL_FONT_SIZE = 17.0f; -static const CGFloat CELL_IMAGE_HEIGHT = 50.0f; -static const CGFloat CELL_IMAGE_WIDTH = 50.0f; +static const CGFloat CELL_IMAGE_HEIGHT = 100.0f; +static const CGFloat CELL_IMAGE_WIDTH = 100.0f; static UIFont *CELL_FONT = nil; #pragma mark - Lifecycle Functions diff --git a/Classes/SettingsViewController.m b/Classes/SettingsViewController.m index ec63fea7e..a2629cdd5 100644 --- a/Classes/SettingsViewController.m +++ b/Classes/SettingsViewController.m @@ -394,7 +394,6 @@ static UICompositeViewDescription *compositeDescription = nil; settingsController.showDoneButton = FALSE; settingsController.delegate = self; settingsController.showCreditsFooter = FALSE; - settingsController.hiddenKeys = [self findHiddenKeys]; settingsController.settingsStore = settingsStore; [navigationController.view setBackgroundColor:[UIColor clearColor]]; @@ -417,6 +416,7 @@ static UICompositeViewDescription *compositeDescription = nil; [super viewWillAppear:animated]; [settingsStore transformLinphoneCoreToKeys]; // Sync settings with linphone core settings + settingsController.hiddenKeys = [self findHiddenKeys]; [settingsController.tableView reloadData]; // Set observer diff --git a/Classes/WizardViewController.m b/Classes/WizardViewController.m index ba97c98a1..f68b5de17 100644 --- a/Classes/WizardViewController.m +++ b/Classes/WizardViewController.m @@ -283,6 +283,27 @@ static UICompositeViewDescription *compositeDescription = nil; [LinphoneLogger logc:LinphoneLoggerError format:"cannot set transport"]; } } + + NSString* sharing_server = [[LinphoneManager instance] lpConfigStringForKey:@"sharing_server" forSection:@"wizard"]; + [[LinphoneManager instance] lpConfigSetString:sharing_server forKey:@"sharing_server_preference"]; + + BOOL ice = [[LinphoneManager instance] lpConfigBoolForKey:@"ice" forSection:@"wizard"]; + [[LinphoneManager instance] lpConfigSetBool:ice forKey:@"ice_preference"]; + + NSString* stun = [[LinphoneManager instance] lpConfigStringForKey:@"stun" forSection:@"wizard"]; + [[LinphoneManager instance] lpConfigSetString:stun forKey:@"stun_preference"]; + + if ([stun length] > 0){ + linphone_core_set_stun_server(lc, [stun UTF8String]); + if(ice) { + linphone_core_set_firewall_policy(lc, LinphonePolicyUseIce); + } else { + linphone_core_set_firewall_policy(lc, LinphonePolicyUseStun); + } + } else { + linphone_core_set_stun_server(lc, NULL); + linphone_core_set_firewall_policy(lc, LinphonePolicyNoFirewall); + } } - (void)addProxyConfig:(NSString*)username password:(NSString*)password domain:(NSString*)domain server:(NSString*)server { diff --git a/Classes/en.lproj/ImageViewController.xib b/Classes/en.lproj/ImageViewController.xib index 7e003d3c6..6db298265 100644 --- a/Classes/en.lproj/ImageViewController.xib +++ b/Classes/en.lproj/ImageViewController.xib @@ -42,12 +42,13 @@ {{0, 44}, {320, 416}} + _NS:9 3 MCAwAA - 4 + 1 NO IBCocoaTouchFramework @@ -73,7 +74,7 @@ 292 - {80, 44} + {160, 44} @@ -85,6 +86,8 @@ IBCocoaTouchFramework 0 0 + NO + NO 3 MQA @@ -97,13 +100,13 @@ 3 MC41AA - + NSImage - chat_back_default.png + image_back_over.png NSImage - chat_back_over.png + image_back_default.png 2 @@ -218,11 +221,13 @@ 7 + backButton 6 + background @@ -236,6 +241,7 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + @@ -289,8 +295,8 @@ YES 3 - {320, 88} - {320, 88} + {320, 88} + {320, 88} {5, 117} 1498 diff --git a/Classes/fr.lproj/ImageViewController.xib b/Classes/fr.lproj/ImageViewController.xib index 071b3cda5..ad5e29808 100644 --- a/Classes/fr.lproj/ImageViewController.xib +++ b/Classes/fr.lproj/ImageViewController.xib @@ -46,7 +46,7 @@ 3 MCAwAA - 4 + 1 NO IBCocoaTouchFramework @@ -71,7 +71,7 @@ 292 - {80, 44} + {160, 44} _NS:9 @@ -82,6 +82,8 @@ IBCocoaTouchFramework 0 0 + NO + NO 3 MQA @@ -94,13 +96,13 @@ 3 MC41AA - + NSImage - chat_back_default.png + image_back_over.png NSImage - chat_back_over.png + image_back_default.png 2 @@ -212,11 +214,13 @@ 7 + backButton 6 + background @@ -230,6 +234,7 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + @@ -283,8 +288,8 @@ YES 3 - {320, 88} - {320, 88} + {320, 88} + {320, 88} {5, 117} 933 diff --git a/Resources/image_back_default.png b/Resources/image_back_default.png new file mode 100644 index 000000000..60412bd95 Binary files /dev/null and b/Resources/image_back_default.png differ diff --git a/Resources/image_back_over.png b/Resources/image_back_over.png new file mode 100644 index 000000000..bbc3f4ee3 Binary files /dev/null and b/Resources/image_back_over.png differ diff --git a/Resources/linphonerc-factory b/Resources/linphonerc-factory index a38a81b51..3d7bde8c8 100644 --- a/Resources/linphonerc-factory +++ b/Resources/linphonerc-factory @@ -40,4 +40,7 @@ username_length=4 expires=600 push_notification=1 transport=tls +sharing_server=https://www.linphone.org:444/upload.php +ice=1 +stun=stun.linphone.org diff --git a/Resources/linphonerc-factory~ipad b/Resources/linphonerc-factory~ipad index 845a67bba..655493f65 100644 --- a/Resources/linphonerc-factory~ipad +++ b/Resources/linphonerc-factory~ipad @@ -40,3 +40,6 @@ username_length=4 expires=600 push_notification=1 transport=tls +sharing_server=https://www.linphone.org:444/upload.php +ice=1 +stun=stun.linphone.org diff --git a/Settings/InAppSettings.bundle/Advanced.plist b/Settings/InAppSettings.bundle/Advanced.plist index 9edd14072..1a87b88a5 100644 --- a/Settings/InAppSettings.bundle/Advanced.plist +++ b/Settings/InAppSettings.bundle/Advanced.plist @@ -174,7 +174,7 @@ Title Sharing server Key - file_upload_url_preference + sharing_server_preference IASKTextAlignment IASKUITextAlignmentRight diff --git a/Settings/InAppSettings.bundle/Network.plist b/Settings/InAppSettings.bundle/Network.plist index 8d8e1a082..1bc2d7cf5 100644 --- a/Settings/InAppSettings.bundle/Network.plist +++ b/Settings/InAppSettings.bundle/Network.plist @@ -18,7 +18,7 @@ Key stun_preference Title - Stun server + Stun Server Type PSTextFieldSpecifier AutocapitalizationType @@ -113,9 +113,9 @@ Transport Titles - udp - tcp - tls + UDP + TCP + TLS Type PSMultiValueSpecifier diff --git a/Settings/InAppSettings.bundle/en.lproj/Network.strings b/Settings/InAppSettings.bundle/en.lproj/Network.strings index 481b7d438..299b28fbd 100644 --- a/Settings/InAppSettings.bundle/en.lproj/Network.strings +++ b/Settings/InAppSettings.bundle/en.lproj/Network.strings @@ -1,8 +1,8 @@ /* Wifi only */ "Wifi only" = "Wifi only"; -/* Stun server */ -"Stun server" = "Stun server"; +/* Stun Server */ +"Stun Server" = "Stun Server"; /* ICE */ "ICE" = "ICE"; @@ -31,14 +31,14 @@ /* Transport */ "Transport" = "Transport"; -/* udp */ -"udp" = "udp"; +/* UDP */ +"UDP" = "UDP"; -/* tcp */ -"tcp" = "tcp"; +/* TCP */ +"TCP" = "TCP"; -/* tls */ -"tls" = "tls"; +/* TLS */ +"TLS" = "TLS"; /* None */ "None" = "None"; diff --git a/Settings/InAppSettings.bundle/fr.lproj/Network.strings b/Settings/InAppSettings.bundle/fr.lproj/Network.strings index 95cd15fb4..e8b26e761 100644 --- a/Settings/InAppSettings.bundle/fr.lproj/Network.strings +++ b/Settings/InAppSettings.bundle/fr.lproj/Network.strings @@ -1,8 +1,8 @@ /* Wifi only */ "Wifi only" = "Uniquement Wifi"; -/* Stun server */ -"Stun server" = "Serveur Stun"; +/* Stun Server */ +"Stun Server" = "Serveur Stun"; /* ICE */ "ICE" = "ICE"; @@ -31,14 +31,14 @@ /* Transport */ "Transport" = "Transport"; -/* udp */ -"udp" = "udp"; +/* UDP */ +"UDP" = "UDP"; -/* tcp */ -"tcp" = "tcp"; +/* TCP */ +"TCP" = "TCP"; -/* tls */ -"tls" = "tls"; +/* TLS */ +"TLS" = "TLS"; /* None */ "None" = "Aucun"; diff --git a/linphone.ldb/Contents.plist b/linphone.ldb/Contents.plist index 6a88a91eb..febee5e56 100644 --- a/linphone.ldb/Contents.plist +++ b/linphone.ldb/Contents.plist @@ -4281,17 +4281,17 @@ backup - 4 + 6 class BLWrapperHandle name - Classes/ImageViewController/4/ImageViewController.xib + Classes/ImageViewController/6/ImageViewController.xib change date - 2012-09-18T12:55:28Z + 2012-09-18T15:26:33Z changed values class @@ -4301,7 +4301,7 @@ flags 0 hash - cf8736251f03474edd9a8c46b942ae63 + b3e155c6a9c76213208e70d8dc9bd3df name ImageViewController.xib @@ -4340,9 +4340,9 @@ versions en - 4 + 6 fr - 4 + 6 @@ -11500,7 +11500,7 @@ Raison: %2$s change date - 2012-09-18T09:18:41Z + 2012-09-18T15:13:17Z changed values class @@ -11510,7 +11510,7 @@ Raison: %2$s flags 0 hash - 3c3bd8331f174699330a8cffb2875fa5 + f5919fdebddf11e613578ee7ff05f05e name Network.strings @@ -11549,17 +11549,17 @@ Raison: %2$s class BLStringKeyObject comment - Stun server + Stun Server errors flags 0 key - Stun server + Stun Server localizations en - Stun server + Stun Server fr Serveur Stun @@ -11774,17 +11774,17 @@ Raison: %2$s class BLStringKeyObject comment - udp + UDP errors flags 2 key - udp + UDP localizations en - udp + UDP snapshots @@ -11797,17 +11797,17 @@ Raison: %2$s class BLStringKeyObject comment - tcp + TCP errors flags 2 key - tcp + TCP localizations en - tcp + TCP snapshots @@ -11820,17 +11820,17 @@ Raison: %2$s class BLStringKeyObject comment - tls + TLS errors flags 2 key - tls + TLS localizations en - tls + TLS snapshots @@ -11908,7 +11908,102 @@ Raison: %2$s old objects - + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + udp + errors + + flags + 2 + key + udp + localizations + + en + udp + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + tcp + errors + + flags + 2 + key + tcp + localizations + + en + tcp + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + tls + errors + + flags + 2 + key + tls + localizations + + en + tls + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Stun server + errors + + flags + 0 + key + Stun server + localizations + + en + Stun server + fr + Serveur Stun + + snapshots + + + plist file snapshots diff --git a/linphone.ldb/Resources/Classes/ImageViewController/4/ImageViewController.xib b/linphone.ldb/Resources/Classes/ImageViewController/6/ImageViewController.xib similarity index 94% rename from linphone.ldb/Resources/Classes/ImageViewController/4/ImageViewController.xib rename to linphone.ldb/Resources/Classes/ImageViewController/6/ImageViewController.xib index 7e003d3c6..6db298265 100644 --- a/linphone.ldb/Resources/Classes/ImageViewController/4/ImageViewController.xib +++ b/linphone.ldb/Resources/Classes/ImageViewController/6/ImageViewController.xib @@ -42,12 +42,13 @@ {{0, 44}, {320, 416}} + _NS:9 3 MCAwAA - 4 + 1 NO IBCocoaTouchFramework @@ -73,7 +74,7 @@ 292 - {80, 44} + {160, 44} @@ -85,6 +86,8 @@ IBCocoaTouchFramework 0 0 + NO + NO 3 MQA @@ -97,13 +100,13 @@ 3 MC41AA - + NSImage - chat_back_default.png + image_back_over.png NSImage - chat_back_over.png + image_back_default.png 2 @@ -218,11 +221,13 @@ 7 + backButton 6 + background @@ -236,6 +241,7 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + @@ -289,8 +295,8 @@ YES 3 - {320, 88} - {320, 88} + {320, 88} + {320, 88} {5, 117} 1498 diff --git a/linphone.ldb/Resources/InAppSettings.bundle/Network/1/Network.strings b/linphone.ldb/Resources/InAppSettings.bundle/Network/1/Network.strings index 481b7d438..299b28fbd 100644 --- a/linphone.ldb/Resources/InAppSettings.bundle/Network/1/Network.strings +++ b/linphone.ldb/Resources/InAppSettings.bundle/Network/1/Network.strings @@ -1,8 +1,8 @@ /* Wifi only */ "Wifi only" = "Wifi only"; -/* Stun server */ -"Stun server" = "Stun server"; +/* Stun Server */ +"Stun Server" = "Stun Server"; /* ICE */ "ICE" = "ICE"; @@ -31,14 +31,14 @@ /* Transport */ "Transport" = "Transport"; -/* udp */ -"udp" = "udp"; +/* UDP */ +"UDP" = "UDP"; -/* tcp */ -"tcp" = "tcp"; +/* TCP */ +"TCP" = "TCP"; -/* tls */ -"tls" = "tls"; +/* TLS */ +"TLS" = "TLS"; /* None */ "None" = "None"; diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index c7a5532b8..46ef8db41 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -783,6 +783,10 @@ D3832801158100E400FA0D23 /* history_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D38327FD158100E400FA0D23 /* history_over.png */; }; D3832802158100E400FA0D23 /* settings_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D38327FE158100E400FA0D23 /* settings_over.png */; }; D3832803158100E400FA0D23 /* chat_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D38327FF158100E400FA0D23 /* chat_over.png */; }; + D3866C281608CA1600830F95 /* image_back_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3866C261608CA1600830F95 /* image_back_default.png */; }; + D3866C291608CA1600830F95 /* image_back_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3866C261608CA1600830F95 /* image_back_default.png */; }; + D3866C2A1608CA1600830F95 /* image_back_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D3866C271608CA1600830F95 /* image_back_over.png */; }; + D3866C2B1608CA1600830F95 /* image_back_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D3866C271608CA1600830F95 /* image_back_over.png */; }; D389363915A6D53200A3A3AA /* chat_bubble_incoming.9.png in Resources */ = {isa = PBXBuildFile; fileRef = D389363715A6D53200A3A3AA /* chat_bubble_incoming.9.png */; }; D389363B15A6D53200A3A3AA /* chat_bubble_outgoing.9.png in Resources */ = {isa = PBXBuildFile; fileRef = D389363815A6D53200A3A3AA /* chat_bubble_outgoing.9.png */; }; D38D14AF15A30B3D008497E8 /* cell_call_first_highlight.png in Resources */ = {isa = PBXBuildFile; fileRef = D38D14AD15A30B3D008497E8 /* cell_call_first_highlight.png */; }; @@ -1821,6 +1825,8 @@ D38327FD158100E400FA0D23 /* history_over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = history_over.png; path = Resources/history_over.png; sourceTree = ""; }; D38327FE158100E400FA0D23 /* settings_over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = settings_over.png; path = Resources/settings_over.png; sourceTree = ""; }; D38327FF158100E400FA0D23 /* chat_over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = chat_over.png; path = Resources/chat_over.png; sourceTree = ""; }; + D3866C261608CA1600830F95 /* image_back_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = image_back_default.png; path = Resources/image_back_default.png; sourceTree = ""; }; + D3866C271608CA1600830F95 /* image_back_over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = image_back_over.png; path = Resources/image_back_over.png; sourceTree = ""; }; D389363715A6D53200A3A3AA /* chat_bubble_incoming.9.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = chat_bubble_incoming.9.png; path = Resources/chat_bubble_incoming.9.png; sourceTree = ""; }; D389363815A6D53200A3A3AA /* chat_bubble_outgoing.9.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = chat_bubble_outgoing.9.png; path = Resources/chat_bubble_outgoing.9.png; sourceTree = ""; }; D38D14AD15A30B3D008497E8 /* cell_call_first_highlight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = cell_call_first_highlight.png; path = Resources/cell_call_first_highlight.png; sourceTree = ""; }; @@ -2929,6 +2935,8 @@ D3A74E8615C69392001500B9 /* history_selected_landscape~ipad.png */, D3A74E8715C69392001500B9 /* history_selected~ipad.png */, D3C714B2159DB84400705B8E /* hold.wav */, + D3866C261608CA1600830F95 /* image_back_default.png */, + D3866C271608CA1600830F95 /* image_back_over.png */, D3432A5C158A4446001C6B0B /* led_connected.png */, D3432A70158A45AF001C6B0B /* led_disconnected.png */, D3432A5D158A4446001C6B0B /* led_error.png */, @@ -3885,6 +3893,8 @@ D3ED40241602257400BF332B /* chat_background.9.png in Resources */, D3ED40261602257400BF332B /* chat_background.9@2x.png in Resources */, D3998D0416031937009DD22C /* background_alt.png in Resources */, + D3866C281608CA1600830F95 /* image_back_default.png in Resources */, + D3866C2A1608CA1600830F95 /* image_back_over.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -4337,6 +4347,8 @@ D3ED40251602257400BF332B /* chat_background.9.png in Resources */, D3ED40271602257400BF332B /* chat_background.9@2x.png in Resources */, D3998D0516031937009DD22C /* background_alt.png in Resources */, + D3866C291608CA1600830F95 /* image_back_default.png in Resources */, + D3866C2B1608CA1600830F95 /* image_back_over.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; };