This commit is contained in:
Danmei Chen 2019-01-21 09:52:23 +01:00
parent e96684371d
commit 332cf26349
5 changed files with 16 additions and 10 deletions

View file

@ -69,7 +69,7 @@
<action selector="onAuthClick:" destination="-1" eventType="touchUpInside" id="9A4-ZX-cXA"/>
</connections>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Do not ask again" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="dQL-Sf-slc">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Do not show again" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="dQL-Sf-slc">
<rect key="frame" x="55" y="2" width="176" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>

View file

@ -100,24 +100,30 @@ static const CGFloat NOTIFIED_CELL_HEIGHT = 44;
switch (type) {
case LinphoneSecurityEventTypeSecurityLevelDowngraded:
if (!participant)
eventString = [NSString stringWithFormat:NSLocalizedString(@"Degradation of security level", nil)];
eventString = [NSString stringWithFormat:NSLocalizedString(@"Security level decreased", nil)];
else
eventString = [NSString stringWithFormat:NSLocalizedString(@"Degradation of security level from %@", nil),participant];
eventString = [NSString stringWithFormat:NSLocalizedString(@"Security level decreased because of %@", nil),participant];
eventColor = [UIColor grayColor];
break;
case LinphoneSecurityEventTypeParticipantMaxDeviceCountExceeded:
if (!participant)
eventString = [NSString stringWithFormat:NSLocalizedString(@"Multidevice detected", nil)];
eventString = [NSString stringWithFormat:NSLocalizedString(@"Max participant count exceeded", nil)];
else
eventString = [NSString stringWithFormat:NSLocalizedString(@"Multidevice detected from %@", nil),participant];
eventString = [NSString stringWithFormat:NSLocalizedString(@"Max participant count exceeded by %@", nil),participant];
eventColor = [UIColor redColor];
break;
case LinphoneSecurityEventTypeEncryptionIdentityKeyChanged:
if (!participant)
eventString = [NSString stringWithFormat:NSLocalizedString(@"LIME identity key changed", nil)];
else
eventString = [NSString stringWithFormat:NSLocalizedString(@"LIME identity key changed for %@", nil),participant];
eventColor = [UIColor redColor];
break;
case LinphoneSecurityEventTypeManInTheMiddleDetected:
if (!participant)
eventString = [NSString stringWithFormat:NSLocalizedString(@"Security alert", nil)];
eventString = [NSString stringWithFormat:NSLocalizedString(@"Man-in-the-middle attack detected", nil)];
else
eventString = [NSString stringWithFormat:NSLocalizedString(@"Security alert from %@", nil),participant];
eventString = [NSString stringWithFormat:NSLocalizedString(@"Man-in-the-middle attack detected for %@", nil),participant];
eventColor = [UIColor redColor];
break;

View file

@ -173,7 +173,7 @@
- (IBAction)onSMSInviteClick:(id)sender {
MFMessageComposeViewController *controller = [[MFMessageComposeViewController alloc] init];
if([MFMessageComposeViewController canSendText]) {
controller.body = NSLocalizedString(@"Hello! Join me on Linphone! You can download it at: http://www.linphone.org/technical-corner/linphone/downloads",nil);
controller.body = NSLocalizedString(@"Hello! Join me on Linphone! You can download it for free at: http://www.linphone.org/technical-corner/linphone/downloads",nil);
controller.recipients = [NSArray arrayWithObjects:[self.addressLabel text], nil];
controller.messageComposeDelegate = PhoneMainView.instance;

View file

@ -15,7 +15,7 @@
<array>
<string>Never</string>
<string>Always</string>
<string>If lighter than given size (see below setting)</string>
<string>If lighter than max size</string>
</array>
<key>Type</key>
<string>PSMultiValueSpecifier</string>
@ -30,7 +30,7 @@
<key>Key</key>
<string>auto_download_incoming_files_max_size</string>
<key>Title</key>
<string>Max size in bytes</string>
<string>Max size (in bytes)</string>
<key>DefaultValue</key>
<integer>-1</integer>
<key>Type</key>