mirror of
https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git
synced 2026-04-21 00:52:43 +02:00
MESSENGER-2762 Initial Merge
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
/*
|
||||
Copyright 2016 OpenMarket Ltd
|
||||
Copyright 2017 Vector Creations Ltd
|
||||
Copyright (c) 2021 BWI GmbH
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
@@ -112,7 +113,7 @@
|
||||
cancelBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel target:self action:@selector(onButtonPressed:)];
|
||||
self.navigationItem.leftBarButtonItem = cancelBarButtonItem;
|
||||
|
||||
createBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:[VectorL10n start] style:UIBarButtonItemStylePlain target:self action:@selector(onButtonPressed:)];
|
||||
createBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:[VectorL10n create] style:UIBarButtonItemStylePlain target:self action:@selector(onButtonPressed:)];
|
||||
self.navigationItem.rightBarButtonItem = createBarButtonItem;
|
||||
|
||||
_searchBarView.placeholder = [VectorL10n roomCreationInviteAnotherUser];
|
||||
@@ -145,6 +146,10 @@
|
||||
|
||||
- (void)showInviteFriendsHeaderView:(BOOL)show
|
||||
{
|
||||
if (!BuildSettings.directChatShowInviteFriends)
|
||||
{
|
||||
show = NO;
|
||||
}
|
||||
if (show)
|
||||
{
|
||||
if (!self.inviteFriendsHeaderView)
|
||||
|
||||
Reference in New Issue
Block a user