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

Merge branch 'develop' into doug/4484_contacts_access

Browse Source 
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
#	Riot/Modules/Application/LegacyAppDelegate.m
#	Riot/Modules/Settings/SettingsViewController.m
This commit is contained in:
Doug
2021-09-30 11:14:02 +01:00
parent 5d3c3cf5d7 313e666017
commit 997ee54f20
414 changed files with 14789 additions and 4140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Integrations/Widgets/WidgetViewController.m
+15 -21
View File
@@ -143,14 +143,14 @@ NSString *const kJavascriptSendResponseToPostMessageAPI = @"riotIOS.sendResponse
}
else
{
title = [NSBundle mxk_localizedStringForKey:@"error"];
title = [MatrixKitL10n error];
}
}
__weak __typeof__(self) weakSelf = self;
UIAlertController *alert = [UIAlertController alertControllerWithTitle:title message:msg preferredStyle:UIAlertControllerStyleAlert];
[alert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"ok"]
[alert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
style:UIAlertActionStyleDefault
handler:^(UIAlertAction * action) {
@@ -213,7 +213,7 @@ NSString *const kJavascriptSendResponseToPostMessageAPI = @"riotIOS.sendResponse
- (void)askPermissionWithCompletion:(void (^)(BOOL granted))completion
{
NSString *widgetCreatorUserId = self.widget.widgetEvent.sender ?: NSLocalizedStringFromTable(@"room_participants_unknown", @"Vector", nil);
NSString *widgetCreatorUserId = self.widget.widgetEvent.sender ?: [VectorL10n roomParticipantsUnknown];
MXSession *session = widget.mxSession;
MXRoom *room = [session roomWithRoomId:self.widget.widgetEvent.roomId];
@@ -236,12 +236,12 @@ NSString *const kJavascriptSendResponseToPostMessageAPI = @"riotIOS.sendResponse
NSString *widgetCreatorAvatarURL = widgetCreatorRoomMember.avatarUrl;
NSArray<NSString*> *permissionStrings = @[
NSLocalizedStringFromTable(@"room_widget_permission_display_name_permission", @"Vector", nil),
NSLocalizedStringFromTable(@"room_widget_permission_avatar_url_permission", @"Vector", nil),
NSLocalizedStringFromTable(@"room_widget_permission_user_id_permission", @"Vector", nil),
NSLocalizedStringFromTable(@"room_widget_permission_theme_permission", @"Vector", nil),
NSLocalizedStringFromTable(@"room_widget_permission_widget_id_permission", @"Vector", nil),
NSLocalizedStringFromTable(@"room_widget_permission_room_id_permission", @"Vector", nil)
[VectorL10n roomWidgetPermissionDisplayNamePermission],
[VectorL10n roomWidgetPermissionAvatarUrlPermission],
[VectorL10n roomWidgetPermissionUserIdPermission],
[VectorL10n roomWidgetPermissionThemePermission],
[VectorL10n roomWidgetPermissionWidgetIdPermission],
[VectorL10n roomWidgetPermissionRoomIdPermission]
];
@@ -293,7 +293,7 @@ NSString *const kJavascriptSendResponseToPostMessageAPI = @"riotIOS.sendResponse
UIAlertController *menu = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet];
[menu addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"widget_menu_refresh", @"Vector", nil)
[menu addAction:[UIAlertAction actionWithTitle:[VectorL10n widgetMenuRefresh]
style:UIAlertActionStyleDefault
handler:^(UIAlertAction * action)
{
@@ -303,7 +303,7 @@ NSString *const kJavascriptSendResponseToPostMessageAPI = @"riotIOS.sendResponse
NSURL *url = [NSURL URLWithString:self.widgetUrl];
if (url && [[UIApplication sharedApplication] canOpenURL:url])
{
[menu addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"widget_menu_open_outside", @"Vector", nil)
[menu addAction:[UIAlertAction actionWithTitle:[VectorL10n widgetMenuOpenOutside]
style:UIAlertActionStyleDefault
handler:^(UIAlertAction * action)
{
@@ -314,7 +314,7 @@ NSString *const kJavascriptSendResponseToPostMessageAPI = @"riotIOS.sendResponse
if (![widget.widgetEvent.sender isEqualToString:session.myUser.userId])
{
[menu addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"widget_menu_revoke_permission", @"Vector", nil)
[menu addAction:[UIAlertAction actionWithTitle:[VectorL10n widgetMenuRevokePermission]
style:UIAlertActionStyleDefault
handler:^(UIAlertAction * action)
{
@@ -325,7 +325,7 @@ NSString *const kJavascriptSendResponseToPostMessageAPI = @"riotIOS.sendResponse
if ([self hasUserEnoughPowerToManageCurrentWidget])
{
[menu addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"widget_menu_remove", @"Vector", nil)
[menu addAction:[UIAlertAction actionWithTitle:[VectorL10n widgetMenuRemove]
style:UIAlertActionStyleDefault
handler:^(UIAlertAction * action)
{
@@ -334,7 +334,7 @@ NSString *const kJavascriptSendResponseToPostMessageAPI = @"riotIOS.sendResponse
}]];
}
[menu addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
[menu addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
style:UIAlertActionStyleCancel
handler:^(UIAlertAction * action) {
}]];
@@ -365,7 +365,7 @@ NSString *const kJavascriptSendResponseToPostMessageAPI = @"riotIOS.sendResponse
NSError *error = [NSError errorWithDomain:NSURLErrorDomain
code:NSURLErrorNotConnectedToInternet
userInfo:@{
NSLocalizedDescriptionKey : NSLocalizedStringFromTable(@"network_offline_prompt", @"Vector", nil)
NSLocalizedDescriptionKey : [VectorL10n networkOfflinePrompt]
}];
[self showErrorAsAlert:error];
}
@@ -582,12 +582,6 @@ NSString *const kJavascriptSendResponseToPostMessageAPI = @"riotIOS.sendResponse
toRequest:requestId];
}
- (void)sendLocalisedError:(NSString*)errorKey toRequest:(NSString*)requestId
{
[self sendError:NSLocalizedStringFromTable(errorKey, @"Vector", nil) toRequest:requestId];
}
#pragma mark - Private methods
- (NSString *)stringByReplacingScalarTokenInString:(NSString*)string byScalarToken:(NSString*)scalarToken