mirror of
https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git
synced 2026-04-26 11:30:50 +02:00
MESSENGER-3861 better url management && use our poll german texts
This commit is contained in:
@@ -4292,7 +4292,7 @@ static CGSize kThreadListBarButtonItemImageSize;
|
||||
EventMenuItemType itemType;
|
||||
if (selectedEvent.eventType == MXEventTypePollStart)
|
||||
{
|
||||
title = [VectorL10n roomEventActionRemovePoll];
|
||||
title = [BWIL10n roomEventActionRemovePoll];
|
||||
itemType = EventMenuItemTypeRemovePoll;
|
||||
}
|
||||
else
|
||||
@@ -4331,7 +4331,7 @@ static CGSize kThreadListBarButtonItemImageSize;
|
||||
if ([self.delegate roomViewController:self canEndPollWithEventIdentifier:selectedEvent.eventId])
|
||||
{
|
||||
[self.eventMenuBuilder addItemWithType:EventMenuItemTypeEndPoll
|
||||
action:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionEndPoll]
|
||||
action:[UIAlertAction actionWithTitle:[BWIL10n roomEventActionEndPoll]
|
||||
style:UIAlertActionStyleDefault
|
||||
handler:^(UIAlertAction * action) {
|
||||
MXStrongifyAndReturnIfNil(self);
|
||||
@@ -7625,6 +7625,10 @@ static CGSize kThreadListBarButtonItemImageSize;
|
||||
MXKUTI *fileUTI = [[MXKUTI alloc] initWithLocalFileURL:url];
|
||||
NSString *mimeType = fileUTI.mimeType;
|
||||
|
||||
if (mimeType == nil) {
|
||||
mimeType = @"";
|
||||
}
|
||||
|
||||
if (fileUTI.isImage)
|
||||
{
|
||||
NSData *imageData = [[NSData alloc] initWithContentsOfURL:url];
|
||||
|
||||
Reference in New Issue
Block a user