mirror of
https://gitlab.linphone.org/BC/public/linphone-iphone.git
synced 2026-01-17 11:08:06 +00:00
ZRTP in call UI
This commit is contained in:
Pierre-Eric Pelloux-Prayer
parent
341a37bdad
commit
929a5045e7
5 changed files with 157 additions and 78 deletions
|
|
@ -36,15 +36,15 @@
|
|||
<reference key="NSNextResponder"/>
|
||||
<int key="NSvFlags">274</int>
|
||||
<array class="NSMutableArray" key="NSSubviews">
|
||||
<object class="IBUITableView" id="243820757">
|
||||
<object class="IBUITableView" id="202949628">
|
||||
<reference key="NSNextResponder" ref="191373211"/>
|
||||
<int key="NSvFlags">274</int>
|
||||
<string key="NSFrameSize">{320, 328}</string>
|
||||
<reference key="NSSuperview" ref="191373211"/>
|
||||
<reference key="NSWindow"/>
|
||||
<reference key="NSNextKeyView" ref="959314961"/>
|
||||
<reference key="NSNextKeyView" ref="502975112"/>
|
||||
<string key="NSReuseIdentifierKey">_NS:418</string>
|
||||
<object class="NSColor" key="IBUIBackgroundColor" id="227779840">
|
||||
<object class="NSColor" key="IBUIBackgroundColor" id="508694975">
|
||||
<int key="NSColorSpace">3</int>
|
||||
<bytes key="NSWhite">MCAwAA</bytes>
|
||||
</object>
|
||||
|
|
@ -52,25 +52,26 @@
|
|||
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
|
||||
<bool key="IBUIAlwaysBounceVertical">YES</bool>
|
||||
<int key="IBUISectionIndexMinimumDisplayRowCount">0</int>
|
||||
<bool key="IBUIAllowsSelection">NO</bool>
|
||||
<bool key="IBUIShowsSelectionImmediatelyOnTouchBegin">YES</bool>
|
||||
<float key="IBUIRowHeight">44</float>
|
||||
<float key="IBUISectionHeaderHeight">22</float>
|
||||
<float key="IBUISectionFooterHeight">22</float>
|
||||
</object>
|
||||
<object class="IBUIButton" id="959314961">
|
||||
<object class="IBUIButton" id="502975112">
|
||||
<reference key="NSNextResponder" ref="191373211"/>
|
||||
<int key="NSvFlags">292</int>
|
||||
<string key="NSFrame">{{107, 328}, {106, 66}}</string>
|
||||
<reference key="NSSuperview" ref="191373211"/>
|
||||
<reference key="NSWindow"/>
|
||||
<reference key="NSNextKeyView"/>
|
||||
<reference key="IBUIBackgroundColor" ref="227779840"/>
|
||||
<reference key="IBUIBackgroundColor" ref="508694975"/>
|
||||
<bool key="IBUIOpaque">NO</bool>
|
||||
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
|
||||
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
|
||||
<int key="IBUIContentHorizontalAlignment">0</int>
|
||||
<int key="IBUIContentVerticalAlignment">0</int>
|
||||
<object class="NSColor" key="IBUIHighlightedTitleColor" id="59203301">
|
||||
<object class="NSColor" key="IBUIHighlightedTitleColor" id="715364517">
|
||||
<int key="NSColorSpace">3</int>
|
||||
<bytes key="NSWhite">MQA</bytes>
|
||||
</object>
|
||||
|
|
@ -78,7 +79,7 @@
|
|||
<int key="NSColorSpace">1</int>
|
||||
<bytes key="NSRGB">MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA</bytes>
|
||||
</object>
|
||||
<object class="NSColor" key="IBUINormalTitleShadowColor" id="38212340">
|
||||
<object class="NSColor" key="IBUINormalTitleShadowColor" id="129151944">
|
||||
<int key="NSColorSpace">3</int>
|
||||
<bytes key="NSWhite">MC41AA</bytes>
|
||||
</object>
|
||||
|
|
@ -94,35 +95,35 @@
|
|||
<string key="NSClassName">NSImage</string>
|
||||
<string key="NSResourceName">micro.png</string>
|
||||
</object>
|
||||
<object class="IBUIFontDescription" key="IBUIFontDescription" id="111697823">
|
||||
<object class="IBUIFontDescription" key="IBUIFontDescription" id="246923771">
|
||||
<int key="type">2</int>
|
||||
<int key="size">2</int>
|
||||
</object>
|
||||
<object class="NSFont" key="IBUIFont" id="726984184">
|
||||
<object class="NSFont" key="IBUIFont" id="213214630">
|
||||
<string key="NSName">Helvetica-Bold</string>
|
||||
<double key="NSSize">18</double>
|
||||
<int key="NSfFlags">16</int>
|
||||
</object>
|
||||
</object>
|
||||
<object class="IBUIButton" id="471002116">
|
||||
<object class="IBUIButton" id="305687417">
|
||||
<reference key="NSNextResponder" ref="191373211"/>
|
||||
<int key="NSvFlags">292</int>
|
||||
<string key="NSFrame">{{213, 328}, {107, 66}}</string>
|
||||
<reference key="NSSuperview" ref="191373211"/>
|
||||
<reference key="NSWindow"/>
|
||||
<reference key="NSNextKeyView" ref="182982505"/>
|
||||
<reference key="IBUIBackgroundColor" ref="227779840"/>
|
||||
<reference key="NSNextKeyView" ref="1019646602"/>
|
||||
<reference key="IBUIBackgroundColor" ref="508694975"/>
|
||||
<bool key="IBUIOpaque">NO</bool>
|
||||
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
|
||||
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
|
||||
<int key="IBUIContentHorizontalAlignment">0</int>
|
||||
<int key="IBUIContentVerticalAlignment">0</int>
|
||||
<reference key="IBUIHighlightedTitleColor" ref="59203301"/>
|
||||
<reference key="IBUIHighlightedTitleColor" ref="715364517"/>
|
||||
<object class="NSColor" key="IBUINormalTitleColor">
|
||||
<int key="NSColorSpace">1</int>
|
||||
<bytes key="NSRGB">MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA</bytes>
|
||||
</object>
|
||||
<reference key="IBUINormalTitleShadowColor" ref="38212340"/>
|
||||
<reference key="IBUINormalTitleShadowColor" ref="129151944"/>
|
||||
<object class="NSCustomResource" key="IBUISelectedImage">
|
||||
<string key="NSClassName">NSImage</string>
|
||||
<string key="NSResourceName">HP_inverse.png</string>
|
||||
|
|
@ -131,10 +132,10 @@
|
|||
<string key="NSClassName">NSImage</string>
|
||||
<string key="NSResourceName">HP.png</string>
|
||||
</object>
|
||||
<reference key="IBUIFontDescription" ref="111697823"/>
|
||||
<reference key="IBUIFont" ref="726984184"/>
|
||||
<reference key="IBUIFontDescription" ref="246923771"/>
|
||||
<reference key="IBUIFont" ref="213214630"/>
|
||||
</object>
|
||||
<object class="IBUIButton" id="885486353">
|
||||
<object class="IBUIButton" id="874802963">
|
||||
<reference key="NSNextResponder" ref="191373211"/>
|
||||
<int key="NSvFlags">292</int>
|
||||
<string key="NSFrame">{{0, 394}, {320, 66}}</string>
|
||||
|
|
@ -150,12 +151,12 @@
|
|||
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
|
||||
<int key="IBUIContentHorizontalAlignment">0</int>
|
||||
<int key="IBUIContentVerticalAlignment">0</int>
|
||||
<reference key="IBUIHighlightedTitleColor" ref="59203301"/>
|
||||
<reference key="IBUIHighlightedTitleColor" ref="715364517"/>
|
||||
<object class="NSColor" key="IBUINormalTitleColor">
|
||||
<int key="NSColorSpace">1</int>
|
||||
<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
|
||||
</object>
|
||||
<reference key="IBUINormalTitleShadowColor" ref="38212340"/>
|
||||
<reference key="IBUINormalTitleShadowColor" ref="129151944"/>
|
||||
<object class="NSCustomResource" key="IBUINormalImage">
|
||||
<string key="NSClassName">NSImage</string>
|
||||
<string key="NSResourceName">stopcall-red.png</string>
|
||||
|
|
@ -164,47 +165,47 @@
|
|||
<string key="NSClassName">NSImage</string>
|
||||
<string key="NSResourceName">clavier-01-106px.png</string>
|
||||
</object>
|
||||
<object class="IBUIFontDescription" key="IBUIFontDescription" id="699854371">
|
||||
<object class="IBUIFontDescription" key="IBUIFontDescription" id="645103076">
|
||||
<string key="name">Helvetica-Bold</string>
|
||||
<string key="family">Helvetica</string>
|
||||
<int key="traits">2</int>
|
||||
<double key="pointSize">15</double>
|
||||
</object>
|
||||
<object class="NSFont" key="IBUIFont" id="738610348">
|
||||
<object class="NSFont" key="IBUIFont" id="1042027645">
|
||||
<string key="NSName">Helvetica-Bold</string>
|
||||
<double key="NSSize">15</double>
|
||||
<int key="NSfFlags">16</int>
|
||||
</object>
|
||||
</object>
|
||||
<object class="IBUIButton" id="182982505">
|
||||
<object class="IBUIButton" id="1019646602">
|
||||
<reference key="NSNextResponder" ref="191373211"/>
|
||||
<int key="NSvFlags">292</int>
|
||||
<string key="NSFrame">{{0, 328}, {107, 66}}</string>
|
||||
<reference key="NSSuperview" ref="191373211"/>
|
||||
<reference key="NSWindow"/>
|
||||
<reference key="NSNextKeyView" ref="885486353"/>
|
||||
<reference key="NSNextKeyView" ref="874802963"/>
|
||||
<bool key="IBUIOpaque">NO</bool>
|
||||
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
|
||||
<int key="IBUIContentHorizontalAlignment">0</int>
|
||||
<int key="IBUIContentVerticalAlignment">0</int>
|
||||
<reference key="IBUIHighlightedTitleColor" ref="59203301"/>
|
||||
<reference key="IBUIHighlightedTitleColor" ref="715364517"/>
|
||||
<object class="NSColor" key="IBUINormalTitleColor">
|
||||
<int key="NSColorSpace">1</int>
|
||||
<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
|
||||
</object>
|
||||
<reference key="IBUINormalTitleShadowColor" ref="38212340"/>
|
||||
<reference key="IBUINormalTitleShadowColor" ref="129151944"/>
|
||||
<object class="NSCustomResource" key="IBUINormalBackgroundImage">
|
||||
<string key="NSClassName">NSImage</string>
|
||||
<string key="NSResourceName">effacer.png</string>
|
||||
</object>
|
||||
<reference key="IBUIFontDescription" ref="699854371"/>
|
||||
<reference key="IBUIFont" ref="738610348"/>
|
||||
<reference key="IBUIFontDescription" ref="645103076"/>
|
||||
<reference key="IBUIFont" ref="1042027645"/>
|
||||
</object>
|
||||
</array>
|
||||
<string key="NSFrame">{{0, 20}, {320, 460}}</string>
|
||||
<reference key="NSSuperview"/>
|
||||
<reference key="NSWindow"/>
|
||||
<reference key="NSNextKeyView" ref="243820757"/>
|
||||
<reference key="NSNextKeyView" ref="202949628"/>
|
||||
<object class="NSColor" key="IBUIBackgroundColor">
|
||||
<int key="NSColorSpace">3</int>
|
||||
<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
|
||||
|
|
@ -219,7 +220,7 @@
|
|||
<object class="IBCocoaTouchOutletConnection" key="connection">
|
||||
<string key="label">back</string>
|
||||
<reference key="source" ref="372490531"/>
|
||||
<reference key="destination" ref="182982505"/>
|
||||
<reference key="destination" ref="1019646602"/>
|
||||
</object>
|
||||
<int key="connectionID">16</int>
|
||||
</object>
|
||||
|
|
@ -227,7 +228,7 @@
|
|||
<object class="IBCocoaTouchOutletConnection" key="connection">
|
||||
<string key="label">hangup</string>
|
||||
<reference key="source" ref="372490531"/>
|
||||
<reference key="destination" ref="885486353"/>
|
||||
<reference key="destination" ref="874802963"/>
|
||||
</object>
|
||||
<int key="connectionID">17</int>
|
||||
</object>
|
||||
|
|
@ -235,7 +236,7 @@
|
|||
<object class="IBCocoaTouchOutletConnection" key="connection">
|
||||
<string key="label">mute</string>
|
||||
<reference key="source" ref="372490531"/>
|
||||
<reference key="destination" ref="959314961"/>
|
||||
<reference key="destination" ref="502975112"/>
|
||||
</object>
|
||||
<int key="connectionID">18</int>
|
||||
</object>
|
||||
|
|
@ -243,7 +244,7 @@
|
|||
<object class="IBCocoaTouchOutletConnection" key="connection">
|
||||
<string key="label">speaker</string>
|
||||
<reference key="source" ref="372490531"/>
|
||||
<reference key="destination" ref="471002116"/>
|
||||
<reference key="destination" ref="305687417"/>
|
||||
</object>
|
||||
<int key="connectionID">19</int>
|
||||
</object>
|
||||
|
|
@ -259,14 +260,14 @@
|
|||
<object class="IBCocoaTouchOutletConnection" key="connection">
|
||||
<string key="label">table</string>
|
||||
<reference key="source" ref="372490531"/>
|
||||
<reference key="destination" ref="243820757"/>
|
||||
<reference key="destination" ref="202949628"/>
|
||||
</object>
|
||||
<int key="connectionID">23</int>
|
||||
</object>
|
||||
<object class="IBConnectionRecord">
|
||||
<object class="IBCocoaTouchOutletConnection" key="connection">
|
||||
<string key="label">dataSource</string>
|
||||
<reference key="source" ref="243820757"/>
|
||||
<reference key="source" ref="202949628"/>
|
||||
<reference key="destination" ref="372490531"/>
|
||||
</object>
|
||||
<int key="connectionID">21</int>
|
||||
|
|
@ -274,7 +275,7 @@
|
|||
<object class="IBConnectionRecord">
|
||||
<object class="IBCocoaTouchOutletConnection" key="connection">
|
||||
<string key="label">delegate</string>
|
||||
<reference key="source" ref="243820757"/>
|
||||
<reference key="source" ref="202949628"/>
|
||||
<reference key="destination" ref="372490531"/>
|
||||
</object>
|
||||
<int key="connectionID">22</int>
|
||||
|
|
@ -292,11 +293,11 @@
|
|||
<int key="objectID">1</int>
|
||||
<reference key="object" ref="191373211"/>
|
||||
<array class="NSMutableArray" key="children">
|
||||
<reference ref="885486353"/>
|
||||
<reference ref="471002116"/>
|
||||
<reference ref="243820757"/>
|
||||
<reference ref="959314961"/>
|
||||
<reference ref="182982505"/>
|
||||
<reference ref="874802963"/>
|
||||
<reference ref="305687417"/>
|
||||
<reference ref="202949628"/>
|
||||
<reference ref="502975112"/>
|
||||
<reference ref="1019646602"/>
|
||||
</array>
|
||||
<reference key="parent" ref="0"/>
|
||||
</object>
|
||||
|
|
@ -313,31 +314,31 @@
|
|||
</object>
|
||||
<object class="IBObjectRecord">
|
||||
<int key="objectID">7</int>
|
||||
<reference key="object" ref="243820757"/>
|
||||
<reference key="object" ref="202949628"/>
|
||||
<array class="NSMutableArray" key="children"/>
|
||||
<reference key="parent" ref="191373211"/>
|
||||
</object>
|
||||
<object class="IBObjectRecord">
|
||||
<int key="objectID">10</int>
|
||||
<reference key="object" ref="959314961"/>
|
||||
<reference key="object" ref="502975112"/>
|
||||
<reference key="parent" ref="191373211"/>
|
||||
<string key="objectName">mute</string>
|
||||
</object>
|
||||
<object class="IBObjectRecord">
|
||||
<int key="objectID">11</int>
|
||||
<reference key="object" ref="885486353"/>
|
||||
<reference key="object" ref="874802963"/>
|
||||
<reference key="parent" ref="191373211"/>
|
||||
<string key="objectName">end</string>
|
||||
</object>
|
||||
<object class="IBObjectRecord">
|
||||
<int key="objectID">12</int>
|
||||
<reference key="object" ref="471002116"/>
|
||||
<reference key="object" ref="305687417"/>
|
||||
<reference key="parent" ref="191373211"/>
|
||||
<string key="objectName">speaker</string>
|
||||
</object>
|
||||
<object class="IBObjectRecord">
|
||||
<int key="objectID">14</int>
|
||||
<reference key="object" ref="182982505"/>
|
||||
<reference key="object" ref="1019646602"/>
|
||||
<reference key="parent" ref="191373211"/>
|
||||
<string key="objectName">Erase</string>
|
||||
</object>
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
#include "UILinphone.h"
|
||||
@class VideoViewController;
|
||||
|
||||
@interface IncallViewController : UIViewController <ABPeoplePickerNavigationControllerDelegate,LinphoneUICallDelegate, UITableViewDelegate, UITableViewDataSource> {
|
||||
@interface IncallViewController : UIViewController <ABPeoplePickerNavigationControllerDelegate,LinphoneUICallDelegate, UITableViewDelegate, UITableViewDataSource, UIActionSheetCustomDelegate> {
|
||||
|
||||
|
||||
UIView* controlSubView, *callControlSubView, *hangUpView;
|
||||
|
|
@ -74,6 +74,9 @@
|
|||
BOOL mVideoShown;
|
||||
BOOL mVideoIsPending;
|
||||
BOOL mIncallViewIsReady;
|
||||
|
||||
UIImage* verified, *unverified;
|
||||
UIActionSheet* zrtpVerificationSheet;
|
||||
}
|
||||
|
||||
-(void)displayStatus:(NSString*) message;
|
||||
|
|
@ -81,7 +84,7 @@
|
|||
- (IBAction)doAction:(id)sender;
|
||||
|
||||
+(LinphoneCall*) retrieveCallAtIndex: (NSInteger) index inConference:(bool) conf;
|
||||
+ (void) updateCellImageView:(UIImageView*)imageView Label:(UILabel*)label DetailLabel:(UILabel*)detailLabel AndAccessoryView:(UIImageView*)accessoryView withCall:(LinphoneCall*) call;
|
||||
+ (void) updateCellImageView:(UIImageView*)imageView Label:(UILabel*)label DetailLabel:(UILabel*)detailLabel AndAccessoryView:(UIButton*)accessoryView withCall:(LinphoneCall*) call;
|
||||
|
||||
@property (nonatomic, retain) IBOutlet UIView* controlSubView;
|
||||
@property (nonatomic, retain) IBOutlet UIView* callControlSubView;
|
||||
|
|
|
|||
|
|
@ -95,7 +95,9 @@ int callCount(LinphoneCore* lc) {
|
|||
//Controls
|
||||
[mute initWithOnImage:[UIImage imageNamed:@"micro_inverse.png"] offImage:[UIImage imageNamed:@"micro.png"] ];
|
||||
[speaker initWithOnImage:[UIImage imageNamed:@"HP_inverse.png"] offImage:[UIImage imageNamed:@"HP.png"] ];
|
||||
|
||||
|
||||
verified = [[UIImage imageNamed:@"secured.png"] retain];
|
||||
unverified = [[UIImage imageNamed:@"unverified.png"] retain];
|
||||
|
||||
//Dialer init
|
||||
[zero initWithNumber:'0'];
|
||||
|
|
@ -218,6 +220,12 @@ int callCount(LinphoneCore* lc) {
|
|||
} }
|
||||
}
|
||||
|
||||
-(void) viewWillDisappear:(BOOL)animated {
|
||||
if (zrtpVerificationSheet != nil) {
|
||||
[zrtpVerificationSheet dismissWithClickedButtonIndex:2 animated:NO];
|
||||
}
|
||||
}
|
||||
|
||||
- (void) viewDidDisappear:(BOOL)animated {
|
||||
if (durationRefreasher != nil) {
|
||||
[durationRefreasher invalidate];
|
||||
|
|
@ -230,8 +238,8 @@ int callCount(LinphoneCore* lc) {
|
|||
}
|
||||
|
||||
- (void)viewDidUnload {
|
||||
|
||||
|
||||
[verified release];
|
||||
[unverified release];
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -473,7 +481,7 @@ int callCount(LinphoneCore* lc) {
|
|||
[self updateActive:(cell == activeCallCell) cell:cell];
|
||||
}
|
||||
|
||||
+ (void) updateCellImageView:(UIImageView*)imageView Label:(UILabel*)label DetailLabel:(UILabel*)detailLabel AndAccessoryView:(UIImageView*)accessoryView withCall:(LinphoneCall*) call {
|
||||
+ (void) updateCellImageView:(UIImageView*)imageView Label:(UILabel*)label DetailLabel:(UILabel*)detailLabel AndAccessoryView:(UIButton*)accessoryView withCall:(LinphoneCall*) call {
|
||||
if (call == NULL) {
|
||||
ms_warning("UpdateCell called with null call");
|
||||
[label setText:@""];
|
||||
|
|
@ -524,13 +532,19 @@ int callCount(LinphoneCore* lc) {
|
|||
}
|
||||
|
||||
if (accessoryView != nil) {
|
||||
if (linphone_call_params_get_media_encryption(linphone_call_get_current_params(call)) !=
|
||||
LinphoneMediaEncryptionNone) {
|
||||
if (accessoryView.image == nil)
|
||||
accessoryView.image = [UIImage imageNamed:@"secured.png"];
|
||||
/*
|
||||
LinphoneMediaEncryption enc = linphone_call_params_get_media_encryption(linphone_call_get_current_params(call));
|
||||
if (enc != LinphoneMediaEncryptionNone) {
|
||||
if (accessoryView.imageView.image == nil) {
|
||||
if (enc == LinphoneMediaEncryptionSRTP || linphone_call_get_authentication_token_verified(call)) {
|
||||
[accessoryView setImage: verified forState:UIControlStateNormal];
|
||||
} else {
|
||||
[accessoryView setImage: unverified forState:UIControlStateNormal];
|
||||
}
|
||||
}
|
||||
} else {
|
||||
accessoryView.image = nil;
|
||||
}
|
||||
[accessoryView setImage: (UIImage*)nil forState:UIControlStateNormal];
|
||||
}*/
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -559,9 +573,7 @@ int callCount(LinphoneCore* lc) {
|
|||
else
|
||||
[ms appendFormat:(isFirst?@"%s":@", %s"), linphone_address_get_username(addr), nil];
|
||||
|
||||
//if (call == selectedCall)
|
||||
// [self updateActive:YES cell:cell];
|
||||
LinphoneCall* selectedCall = linphone_core_get_current_call([LinphoneManager getLc]);
|
||||
LinphoneCall* selectedCall = linphone_core_get_current_call([LinphoneManager getLc]);
|
||||
if (call == selectedCall) {
|
||||
[callTableView selectRowAtIndexPath:indexPath animated:NO scrollPosition:UITableViewScrollPositionNone];
|
||||
cell.selected = YES;
|
||||
|
|
@ -573,11 +585,6 @@ int callCount(LinphoneCore* lc) {
|
|||
}
|
||||
[cell.detailTextLabel setText:ms];
|
||||
cell.imageView.image = nil;
|
||||
|
||||
/*if (linphone_core_is_in_conference(lc))
|
||||
cell.backgroundColor = [UIColor colorWithRed:0 green:1 blue:0 alpha:1];
|
||||
else
|
||||
cell.backgroundColor = [UIColor colorWithRed:1 green:0 blue:0 alpha:1];*/
|
||||
}
|
||||
|
||||
-(void) tableView:(UITableView *)tableView accessoryButtonTappedForRowWithIndexPath:(NSIndexPath *)indexPath
|
||||
|
|
@ -597,8 +604,6 @@ int callCount(LinphoneCore* lc) {
|
|||
cell.textLabel.font = [UIFont systemFontOfSize:40];
|
||||
cell.textLabel.autoresizingMask = UIViewAutoresizingFlexibleHeight;
|
||||
}
|
||||
if (cell.accessoryView != nil)
|
||||
((UIImageView*)cell.accessoryView).image = nil;
|
||||
|
||||
LinphoneCore* lc = [LinphoneManager getLc];
|
||||
if (indexPath.row == 0 && linphone_core_get_conference_size(lc) > 0) {
|
||||
|
|
@ -611,27 +616,79 @@ int callCount(LinphoneCore* lc) {
|
|||
else
|
||||
cell.accessoryType = UITableViewCellAccessoryNone;
|
||||
} else {
|
||||
if (cell.accessoryView == nil) {
|
||||
UIButton* b = [UIButton buttonWithType:UIButtonTypeCustom];
|
||||
[b setFrame:CGRectMake(0, 0, 28, 28)];
|
||||
[b setImage:nil forState:UIControlStateNormal];
|
||||
b.backgroundColor = [UIColor clearColor];
|
||||
b.userInteractionEnabled = YES;
|
||||
cell.accessoryView = b;
|
||||
}
|
||||
LinphoneCall* call = [IncallViewController retrieveCallAtIndex:indexPath.row inConference:NO];
|
||||
[IncallViewController updateCellImageView:cell.imageView Label:cell.textLabel DetailLabel:cell.detailTextLabel AndAccessoryView:(UIImageView*)cell.accessoryView withCall:call];
|
||||
[IncallViewController updateCellImageView:cell.imageView Label:cell.textLabel DetailLabel:cell.detailTextLabel AndAccessoryView:(UIButton*)cell.accessoryView withCall:call];
|
||||
if (linphone_core_get_current_call(lc) == call)
|
||||
activeCallCell = cell;
|
||||
cell.accessoryType = UITableViewCellAccessoryNone;
|
||||
if (cell.accessoryView == nil)
|
||||
cell.accessoryView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 28, 28)];
|
||||
|
||||
LinphoneMediaEncryption enc = linphone_call_params_get_media_encryption(linphone_call_get_current_params(call));
|
||||
|
||||
UIButton* accessoryBtn = (UIButton*) cell.accessoryView;
|
||||
if (enc != LinphoneMediaEncryptionNone) {
|
||||
if (enc == LinphoneMediaEncryptionSRTP || linphone_call_get_authentication_token_verified(call)) {
|
||||
[accessoryBtn setImage: verified forState:UIControlStateNormal];
|
||||
} else {
|
||||
[accessoryBtn setImage: unverified forState:UIControlStateNormal];
|
||||
}
|
||||
} else {
|
||||
[accessoryBtn setImage: (UIImage*)nil forState:UIControlStateNormal];
|
||||
}
|
||||
|
||||
if (((UIButton*)cell.accessoryView).imageView.image != nil && linphone_call_params_get_media_encryption(linphone_call_get_current_params(call)) == LinphoneMediaEncryptionZRTP) {
|
||||
[((UIButton*)cell.accessoryView) addTarget:self action:@selector(secureIconPressed:withEvent:) forControlEvents:UIControlEventTouchUpInside];
|
||||
}
|
||||
}
|
||||
|
||||
cell.userInteractionEnabled = YES;
|
||||
cell.selectionStyle = UITableViewCellSelectionStyleNone;
|
||||
//cell.selectionStyle = UITableViewCellSelectionStyleBlue;
|
||||
|
||||
|
||||
|
||||
/*NSString *path = [[NSBundle mainBundle] pathForResource:[item objectForKey:@"imageKey"] ofType:@"png"];
|
||||
UIImage *theImage = [UIImage imageWithContentsOfFile:path];
|
||||
cell.imageView.image = theImage;*/
|
||||
return cell;
|
||||
}
|
||||
|
||||
-(void) secureIconPressed:(UIControl*) button withEvent: (UIEvent*) evt {
|
||||
NSSet* touches = [evt allTouches];
|
||||
UITouch* touch = [touches anyObject];
|
||||
CGPoint currentTouchPos = [touch locationInView:self.callTableView];
|
||||
NSIndexPath *path = [self.callTableView indexPathForRowAtPoint:currentTouchPos];
|
||||
if (path) {
|
||||
LinphoneCall* call = [IncallViewController retrieveCallAtIndex:path.row inConference:NO];
|
||||
// start action sheet to validate/unvalidate zrtp code
|
||||
CallDelegate* cd = [[CallDelegate alloc] init];
|
||||
cd.delegate = self;
|
||||
cd.call = call;
|
||||
|
||||
[(UIButton*)[callTableView cellForRowAtIndexPath:path].accessoryView setImage:nil forState:UIControlStateNormal];
|
||||
|
||||
zrtpVerificationSheet = [[UIActionSheet alloc] initWithTitle:[NSString stringWithFormat:NSLocalizedString(@" Mark auth token '%s' as:",nil),linphone_call_get_authentication_token(call)]
|
||||
delegate:cd
|
||||
cancelButtonTitle:NSLocalizedString(@"Unverified",nil)
|
||||
destructiveButtonTitle:NSLocalizedString(@"Verified",nil)
|
||||
otherButtonTitles:nil];
|
||||
|
||||
zrtpVerificationSheet.actionSheetStyle = UIActionSheetStyleDefault;
|
||||
[zrtpVerificationSheet showInView:self.view];
|
||||
[zrtpVerificationSheet release];
|
||||
}
|
||||
}
|
||||
|
||||
-(void) actionSheet:(UIActionSheet *)actionSheet clickedButtonAtIndex:(NSInteger)buttonIndex withUserDatas:(void *)datas {
|
||||
LinphoneCall* call = (LinphoneCall*)datas;
|
||||
// maybe we could verify call validity
|
||||
|
||||
if (buttonIndex == 0)
|
||||
linphone_call_set_authentication_token_verified(call, YES);
|
||||
else if (buttonIndex == 1)
|
||||
linphone_call_set_authentication_token_verified(call, NO);
|
||||
zrtpVerificationSheet = nil;
|
||||
}
|
||||
|
||||
// UITableViewDataSource (required)
|
||||
- (NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
|
||||
|
|
|
|||
BIN
Resources/unverified.png
Normal file
BIN
Resources/unverified.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 358 B |
|
|
@ -229,6 +229,11 @@
|
|||
344ABD78147FCB68007420B6 /* ConferenceCallDetailView.m in Sources */ = {isa = PBXBuildFile; fileRef = 344ABD76147FCB68007420B6 /* ConferenceCallDetailView.m */; };
|
||||
344ABD7A147FD32B007420B6 /* ConferenceCallDetailCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 344ABD79147FD32B007420B6 /* ConferenceCallDetailCell.xib */; };
|
||||
344ABD7B147FD32B007420B6 /* ConferenceCallDetailCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 344ABD79147FD32B007420B6 /* ConferenceCallDetailCell.xib */; };
|
||||
344ABDE51483E596007420B6 /* unverified.png in Resources */ = {isa = PBXBuildFile; fileRef = 344ABDE41483E596007420B6 /* unverified.png */; };
|
||||
344ABDE61483E596007420B6 /* unverified.png in Resources */ = {isa = PBXBuildFile; fileRef = 344ABDE41483E596007420B6 /* unverified.png */; };
|
||||
344ABDE81484E723007420B6 /* libzrtpcpp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 344ABDE71484E723007420B6 /* libzrtpcpp.a */; };
|
||||
344ABDF114850AE9007420B6 /* libc++.1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 344ABDEF14850AE9007420B6 /* libc++.1.dylib */; };
|
||||
344ABDF214850AE9007420B6 /* libstdc++.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 344ABDF014850AE9007420B6 /* libstdc++.6.dylib */; };
|
||||
34957F3F147D3FBF00DD7A09 /* secured.png in Resources */ = {isa = PBXBuildFile; fileRef = 34957F3E147D3FBF00DD7A09 /* secured.png */; };
|
||||
34F2F678147D2E1C00A2D5E3 /* contact_vide.png in Resources */ = {isa = PBXBuildFile; fileRef = 34F2F677147D2E1C00A2D5E3 /* contact_vide.png */; };
|
||||
70571E1A13FABCB000CDD3C2 /* rootca.pem in Resources */ = {isa = PBXBuildFile; fileRef = 70571E1913FABCB000CDD3C2 /* rootca.pem */; };
|
||||
|
|
@ -242,7 +247,7 @@
|
|||
/* Begin PBXCopyFilesBuildPhase section */
|
||||
2247673A129C3B9C002B94B4 /* CopyFiles */ = {
|
||||
isa = PBXCopyFilesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
buildActionMask = 12;
|
||||
dstPath = "";
|
||||
dstSubfolderSpec = 11;
|
||||
files = (
|
||||
|
|
@ -585,6 +590,10 @@
|
|||
344ABD75147FCB68007420B6 /* ConferenceCallDetailView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConferenceCallDetailView.h; sourceTree = "<group>"; };
|
||||
344ABD76147FCB68007420B6 /* ConferenceCallDetailView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ConferenceCallDetailView.m; sourceTree = "<group>"; };
|
||||
344ABD79147FD32B007420B6 /* ConferenceCallDetailCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ConferenceCallDetailCell.xib; sourceTree = "<group>"; };
|
||||
344ABDE41483E596007420B6 /* unverified.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = unverified.png; path = Resources/unverified.png; sourceTree = "<group>"; };
|
||||
344ABDE71484E723007420B6 /* libzrtpcpp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libzrtpcpp.a; path = "liblinphone-sdk/apple-darwin/lib/libzrtpcpp.a"; sourceTree = "<group>"; };
|
||||
344ABDEF14850AE9007420B6 /* libc++.1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libc++.1.dylib"; path = "usr/lib/libc++.1.dylib"; sourceTree = SDKROOT; };
|
||||
344ABDF014850AE9007420B6 /* libstdc++.6.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libstdc++.6.dylib"; path = "usr/lib/libstdc++.6.dylib"; sourceTree = SDKROOT; };
|
||||
34957F3E147D3FBF00DD7A09 /* secured.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = secured.png; path = Resources/secured.png; sourceTree = "<group>"; };
|
||||
34F2F677147D2E1C00A2D5E3 /* contact_vide.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = contact_vide.png; path = Resources/contact_vide.png; sourceTree = "<group>"; };
|
||||
70571E1913FABCB000CDD3C2 /* rootca.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = rootca.pem; path = Resources/rootca.pem; sourceTree = "<group>"; };
|
||||
|
|
@ -599,6 +608,9 @@
|
|||
isa = PBXFrameworksBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
344ABDF114850AE9007420B6 /* libc++.1.dylib in Frameworks */,
|
||||
344ABDF214850AE9007420B6 /* libstdc++.6.dylib in Frameworks */,
|
||||
344ABDE81484E723007420B6 /* libzrtpcpp.a in Frameworks */,
|
||||
F476004C147AAF4600FFF19B /* libmediastreamer.a in Frameworks */,
|
||||
F476004B147AAF2800FFF19B /* liblinphone.a in Frameworks */,
|
||||
7066FC0C13E830E400EFC6DC /* libvpx.a in Frameworks */,
|
||||
|
|
@ -1052,6 +1064,9 @@
|
|||
29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
344ABDEF14850AE9007420B6 /* libc++.1.dylib */,
|
||||
344ABDF014850AE9007420B6 /* libstdc++.6.dylib */,
|
||||
344ABDE71484E723007420B6 /* libzrtpcpp.a */,
|
||||
2211DB9614764F6B00DEE054 /* nogpl-thirdparties */,
|
||||
2211DB911475562600DEE054 /* liblinphone.a */,
|
||||
2211DB8F147555C800DEE054 /* libmediastreamer.a */,
|
||||
|
|
@ -1121,6 +1136,7 @@
|
|||
29B97317FDCFA39411CA2CEA /* Resources */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
344ABDE41483E596007420B6 /* unverified.png */,
|
||||
34957F3E147D3FBF00DD7A09 /* secured.png */,
|
||||
34F2F677147D2E1C00A2D5E3 /* contact_vide.png */,
|
||||
2211DBCA1476BE7300DEE054 /* ajouter.png */,
|
||||
|
|
@ -1294,6 +1310,7 @@
|
|||
34957F3F147D3FBF00DD7A09 /* secured.png in Resources */,
|
||||
344ABD72147FC438007420B6 /* ConferenceCallDetailView.xib in Resources */,
|
||||
344ABD7A147FD32B007420B6 /* ConferenceCallDetailCell.xib in Resources */,
|
||||
344ABDE51483E596007420B6 /* unverified.png in Resources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
|
|
@ -1350,6 +1367,7 @@
|
|||
2211DBEA1476BE7300DEE054 /* pause.png in Resources */,
|
||||
344ABD73147FC438007420B6 /* ConferenceCallDetailView.xib in Resources */,
|
||||
344ABD7B147FD32B007420B6 /* ConferenceCallDetailCell.xib in Resources */,
|
||||
344ABDE61483E596007420B6 /* unverified.png in Resources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue