felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-04 15:07:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into doug/4484_contacts_access

Browse Source 
# Conflicts:
#	Riot/Modules/ServiceTerms/Modal/ServiceTermsModalCoordinatorBridgePresenter.swift
This commit is contained in:
Doug
2021-10-08 11:45:43 +01:00
parent 43751a852a 15b3f82faa
commit 4e0c76885d
107 changed files with 2783 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Settings/DeactivateAccount/DeactivateAccountViewController.m
+1 -1
View File
@@ -239,7 +239,7 @@ static CGFloat const kTextFontSize = 15.0;
__weak typeof(self) weakSelf = self;
[alert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
[alert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n submit]
style:UIAlertActionStyleDefault
handler:^(UIAlertAction * action) {
UITextField *textField = alert.textFields.firstObject;
Riot/Modules/Settings/IdentityServer/SettingsIdentityServerViewController.storyboard
+1 -1
View File
@@ -28,7 +28,7 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0W7-LW-UNr">
<rect key="frame" x="0.0" y="40" width="375" height="51"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Identity Server" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="g0a-45-iRa">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Identity server" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="g0a-45-iRa">
<rect key="frame" x="20" y="16" width="100" height="19"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<nil key="textColor"/>
Riot/Modules/Settings/SettingsViewController.m
+4 -4
View File
@@ -1160,7 +1160,7 @@ TableViewSectionsDelegate>
// Ask password again
self->currentAlert = [UIAlertController alertControllerWithTitle:nil
message:[VectorL10n settingsAdd3pidPasswordMessage]
message:[VectorL10n settingsAdd3pidInvalidPasswordMessage]
preferredStyle:UIAlertControllerStyleAlert];
[self->currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n retry] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
@@ -1384,7 +1384,7 @@ TableViewSectionsDelegate>
title = [VectorL10n settingsAdd3pidPasswordTitleEmail];
}
NSString *message = [VectorL10n settingsAdd3pidInvalidPasswordMessage];
NSString *message = [VectorL10n settingsAdd3pidPasswordMessage];
[session.matrixRestClient add3PIDOnlyWithSessionId:@"" clientSecret:[MXTools generateSecret] authParams:nil success:^{
@@ -4416,7 +4416,7 @@ TableViewSectionsDelegate>
}
#pragma mark - Identity Server updates
#pragma mark - Identity server updates
- (void)registerAccountDataDidChangeIdentityServerNotification
{
@@ -4532,7 +4532,7 @@ TableViewSectionsDelegate>
}];
}
#pragma mark - Identity Server
#pragma mark - Identity server
- (void)showIdentityServerSettingsScreen
{