Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-28 23:32:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3543 from vector-im/config_fixes

Browse source 
Config Fixes
This commit is contained in:
ismailgulek 2020-08-14 14:48:38 +03:00 committed by GitHub
commit 9851a771b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 43 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Config/BuildSettings.swift
View file

@ -186,6 +186,7 @@ final class BuildSettings: NSObject {
static let messageDetailsAllowShare: Bool = true
static let messageDetailsAllowPermalink: Bool = true
static let messageDetailsAllowViewSource: Bool = true
static let messageDetailsAllowSaving: Bool = true
// MARK: - Authentication Screen

5
Config/CommonConfiguration.swift
View file

@ -40,6 +40,11 @@ class CommonConfiguration: NSObject, Configurable {
// Enable lazy loading
settings.syncWithLazyLoadOfRoomMembers = true
settings.messageDetailsAllowSharing = BuildSettings.messageDetailsAllowShare
settings.messageDetailsAllowSaving = BuildSettings.messageDetailsAllowSaving
MXKContactManager.shared().allowLocalContactsAccess = BuildSettings.allowLocalContactsAccess
}
private func setupMatrixSDKSettings() {

2
Podfile
View file

@ -11,7 +11,7 @@ use_frameworks!
# - `{ {kit spec hash} => {sdk spec hash}` to depend on specific pod options (:git => …, :podspec => …) for each repo. Used by Fastfile during CI
#
# Warning: our internal tooling depends on the name of this variable name, so be sure not to change it
$matrixKitVersion = '= 0.12.12'
$matrixKitVersion = '= 0.12.13'
# $matrixKitVersion = :local
# $matrixKitVersion = {'develop' => 'develop'}

3
Riot/Modules/Room/RoomViewController.m
View file

@ -2608,6 +2608,8 @@
}
}
else // Add action for attachment
{
if (BuildSettings.messageDetailsAllowSaving)
{
if (attachment.type == MXKAttachmentTypeImage || attachment.type == MXKAttachmentTypeVideo)
{
@ -2644,6 +2646,7 @@
}]];
}
}
// Check status of the selected event
if (selectedEvent.sentState == MXEventSentStatePreparing ||