diff --git a/.github/workflows/ci-ui-tests.yml b/.github/workflows/ci-ui-tests.yml index 322323739e..9ad97d46bb 100644 --- a/.github/workflows/ci-ui-tests.yml +++ b/.github/workflows/ci-ui-tests.yml @@ -57,7 +57,7 @@ jobs: run: bundle exec fastlane uitest - name: Upload coverage to Codecov - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: flags: uitests \ No newline at end of file diff --git a/Btchap/Config/BuildSettings.swift b/Btchap/Config/BuildSettings.swift index e75c3b93d2..d873f79d15 100644 --- a/Btchap/Config/BuildSettings.swift +++ b/Btchap/Config/BuildSettings.swift @@ -123,7 +123,8 @@ final class BuildSettings: NSObject { static let applicationHelpUrlString = "https://www.beta.tchap.gouv.fr/faq" static let applicationServicesStatusUrlString = "https://status.tchap.numerique.gouv.fr/" static let applicationAcceptableUsePolicyUrlString = "" - + static let proConnectInfoUrlString = "https://proconnect.gouv.fr/" + // MARK: - Matrix permalinks // Hosts/Paths for URLs that will considered as valid permalinks. Those permalinks are opened within the app. static let permalinkSupportedHosts: [String: [String]] = [ @@ -242,6 +243,9 @@ final class BuildSettings: NSObject { tchapFeatureAnyFeature: [ tchapFeatureAnyHomeServer ] ] + // Tchap: handle SSO feature flag. Presents SSO button on Onboarding screen and give priority to SSO on UIA. + static let tchapFeatureHandleSSO = false + // MARK: - Side Menu static let enableSideMenu: Bool = true && !newAppLayoutEnabled static let sideMenuShowInviteFriends: Bool = true diff --git a/Btchap/Generated/InfoPlist.swift b/Btchap/Generated/InfoPlist.swift index fd4913b7ce..b4c7e620a4 100644 --- a/Btchap/Generated/InfoPlist.swift +++ b/Btchap/Generated/InfoPlist.swift @@ -21,6 +21,7 @@ internal enum InfoPlist { internal static let cfBundlePackageType: String = _document["CFBundlePackageType"] internal static let cfBundleShortVersionString: String = _document["CFBundleShortVersionString"] internal static let cfBundleSignature: String = _document["CFBundleSignature"] + internal static let cfBundleURLTypes: [[String: Any]] = _document["CFBundleURLTypes"] internal static let cfBundleVersion: String = _document["CFBundleVersion"] internal static let itsAppUsesNonExemptEncryption: Bool = _document["ITSAppUsesNonExemptEncryption"] internal static let itsEncryptionExportComplianceCode: String = _document["ITSEncryptionExportComplianceCode"] diff --git a/Btchap/SupportingFiles/Btchap-App-Common.xcconfig b/Btchap/SupportingFiles/Btchap-App-Common.xcconfig index 36a5963707..0c9357856d 100644 --- a/Btchap/SupportingFiles/Btchap-App-Common.xcconfig +++ b/Btchap/SupportingFiles/Btchap-App-Common.xcconfig @@ -24,6 +24,7 @@ BUNDLE_DISPLAY_NAME = Btchap BASE_BUNDLE_IDENTIFIER = fr.gouv.btchap APPLICATION_GROUP_IDENTIFIER = group.$(BASE_BUNDLE_IDENTIFIER) PRODUCT_BUNDLE_IDENTIFIER = $(BASE_BUNDLE_IDENTIFIER) +APPLICATION_SCHEME = tchap INFOPLIST_FILE = Btchap/SupportingFiles/Info.plist ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon diff --git a/Btchap/SupportingFiles/Info.plist b/Btchap/SupportingFiles/Info.plist index 5e06e305b9..262b052c3d 100644 --- a/Btchap/SupportingFiles/Info.plist +++ b/Btchap/SupportingFiles/Info.plist @@ -35,6 +35,19 @@ $(MARKETING_VERSION) CFBundleSignature ???? + CFBundleURLTypes + + + CFBundleTypeRole + Editor + CFBundleURLName + $(BASE_BUNDLE_IDENTIFIER) + CFBundleURLSchemes + + $(APPLICATION_SCHEME) + + + CFBundleVersion $(CURRENT_PROJECT_VERSION) ITSAppUsesNonExemptEncryption diff --git a/CHANGES.md b/CHANGES.md index 907d69b54b..906148afd2 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,27 @@ +## Changes in 1.11.19 (2024-10-15) + +No significant changes. + + +## Changes in 1.11.18 (2024-09-17) + +🙌 Improvements + +- Replaced deprecated OlmKit APIs from ContentScanner with ones from the CryptoSDK. + + +## Changes in 1.11.17 (2024-08-20) + +🙌 Improvements + +- Check power level before starting live sharing location ([#7808](https://github.com/element-hq/element-ios/pull/7808)) + + +## Changes in 1.11.16 (2024-07-23) + +No significant changes. + + ## Changes in 1.11.15 (2024-06-18) No significant changes. diff --git a/CommonKit/CommonKit.h b/CommonKit/CommonKit.h index b057961e61..b9353d33a3 100644 --- a/CommonKit/CommonKit.h +++ b/CommonKit/CommonKit.h @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // #import diff --git a/CommonKit/Source/UserIndicators/Tests/UserIndicatorPresenterSpy.swift b/CommonKit/Source/UserIndicators/Tests/UserIndicatorPresenterSpy.swift index f595dfee98..8ba38ac667 100644 --- a/CommonKit/Source/UserIndicators/Tests/UserIndicatorPresenterSpy.swift +++ b/CommonKit/Source/UserIndicators/Tests/UserIndicatorPresenterSpy.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/CommonKit/Source/UserIndicators/Tests/UserIndicatorQueueTests.swift b/CommonKit/Source/UserIndicators/Tests/UserIndicatorQueueTests.swift index 50c2e458d4..b09d9c7c20 100644 --- a/CommonKit/Source/UserIndicators/Tests/UserIndicatorQueueTests.swift +++ b/CommonKit/Source/UserIndicators/Tests/UserIndicatorQueueTests.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/CommonKit/Source/UserIndicators/Tests/UserIndicatorTests.swift b/CommonKit/Source/UserIndicators/Tests/UserIndicatorTests.swift index e0722af8fa..b734b50ddc 100644 --- a/CommonKit/Source/UserIndicators/Tests/UserIndicatorTests.swift +++ b/CommonKit/Source/UserIndicators/Tests/UserIndicatorTests.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/CommonKit/Source/UserIndicators/UserIndicator.swift b/CommonKit/Source/UserIndicators/UserIndicator.swift index d2ad5ab2d3..e7daae853c 100644 --- a/CommonKit/Source/UserIndicators/UserIndicator.swift +++ b/CommonKit/Source/UserIndicators/UserIndicator.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/CommonKit/Source/UserIndicators/UserIndicatorDismissal.swift b/CommonKit/Source/UserIndicators/UserIndicatorDismissal.swift index 874a4f1ede..b63b4288a5 100644 --- a/CommonKit/Source/UserIndicators/UserIndicatorDismissal.swift +++ b/CommonKit/Source/UserIndicators/UserIndicatorDismissal.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/CommonKit/Source/UserIndicators/UserIndicatorPresentationContext.swift b/CommonKit/Source/UserIndicators/UserIndicatorPresentationContext.swift index 94656ad6b0..f4e4c0b23b 100644 --- a/CommonKit/Source/UserIndicators/UserIndicatorPresentationContext.swift +++ b/CommonKit/Source/UserIndicators/UserIndicatorPresentationContext.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/CommonKit/Source/UserIndicators/UserIndicatorQueue.swift b/CommonKit/Source/UserIndicators/UserIndicatorQueue.swift index a2ba49fcf2..7fb7a268fe 100644 --- a/CommonKit/Source/UserIndicators/UserIndicatorQueue.swift +++ b/CommonKit/Source/UserIndicators/UserIndicatorQueue.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/CommonKit/Source/UserIndicators/UserIndicatorRequest.swift b/CommonKit/Source/UserIndicators/UserIndicatorRequest.swift index 97611eeea3..f381f12873 100644 --- a/CommonKit/Source/UserIndicators/UserIndicatorRequest.swift +++ b/CommonKit/Source/UserIndicators/UserIndicatorRequest.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/CommonKit/Source/UserIndicators/UserIndicatorViewPresentable.swift b/CommonKit/Source/UserIndicators/UserIndicatorViewPresentable.swift index 3a4a663f0f..f94cec2bc5 100644 --- a/CommonKit/Source/UserIndicators/UserIndicatorViewPresentable.swift +++ b/CommonKit/Source/UserIndicators/UserIndicatorViewPresentable.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Config/AppConfiguration.swift b/Config/AppConfiguration.swift index e49e0535b6..e7a8ed8e1d 100644 --- a/Config/AppConfiguration.swift +++ b/Config/AppConfiguration.swift @@ -1,17 +1,9 @@ // +// Copyright 2024 New Vector Ltd. // Copyright 2020 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Config/AppVersion.xcconfig b/Config/AppVersion.xcconfig index eedff25728..be6ad511d3 100644 --- a/Config/AppVersion.xcconfig +++ b/Config/AppVersion.xcconfig @@ -15,5 +15,5 @@ // // Version -MARKETING_VERSION = 2.8.1 +MARKETING_VERSION = 2.8.4 CURRENT_PROJECT_VERSION = 1 diff --git a/Config/BuildSettings.swift b/Config/BuildSettings.swift index 9abdd1f5f4..b5766d74a8 100644 --- a/Config/BuildSettings.swift +++ b/Config/BuildSettings.swift @@ -1,17 +1,9 @@ // +// Copyright 2024 New Vector Ltd. // Copyright 2020 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Config/CommonConfiguration.swift b/Config/CommonConfiguration.swift index 0a58e18286..6405ff3716 100644 --- a/Config/CommonConfiguration.swift +++ b/Config/CommonConfiguration.swift @@ -1,17 +1,9 @@ // +// Copyright 2024 New Vector Ltd. // Copyright 2020 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Config/Configurable.swift b/Config/Configurable.swift index 2f1c46a037..0bad5b251c 100644 --- a/Config/Configurable.swift +++ b/Config/Configurable.swift @@ -1,17 +1,9 @@ // +// Copyright 2024 New Vector Ltd. // Copyright 2020 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Config/MDMSettings.swift b/Config/MDMSettings.swift index a6699a617d..83aa79b951 100644 --- a/Config/MDMSettings.swift +++ b/Config/MDMSettings.swift @@ -1,17 +1,8 @@ // -// Copyright 2023 New Vector Ltd +// Copyright 2023, 2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/DesignKit/DesignKit.h b/DesignKit/DesignKit.h index 4ff68e7228..657418678a 100644 --- a/DesignKit/DesignKit.h +++ b/DesignKit/DesignKit.h @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // #import diff --git a/DesignKit/Extensions/UIFont.swift b/DesignKit/Extensions/UIFont.swift index 7804c8066b..5a05302e66 100644 --- a/DesignKit/Extensions/UIFont.swift +++ b/DesignKit/Extensions/UIFont.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import UIKit diff --git a/DesignKit/Source/AvatarSize.swift b/DesignKit/Source/AvatarSize.swift index bac46e6f35..3783bd318a 100644 --- a/DesignKit/Source/AvatarSize.swift +++ b/DesignKit/Source/AvatarSize.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/DesignKit/Source/ColorValues.swift b/DesignKit/Source/ColorValues.swift index 4e967ab05e..9661047154 100644 --- a/DesignKit/Source/ColorValues.swift +++ b/DesignKit/Source/ColorValues.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/DesignKit/Source/Colors.swift b/DesignKit/Source/Colors.swift index bea9b07066..11569e44f0 100644 --- a/DesignKit/Source/Colors.swift +++ b/DesignKit/Source/Colors.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/DesignKit/Source/ColorsSwiftUI.swift b/DesignKit/Source/ColorsSwiftUI.swift index bb25d025f4..13ffda3ffe 100644 --- a/DesignKit/Source/ColorsSwiftUI.swift +++ b/DesignKit/Source/ColorsSwiftUI.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/DesignKit/Source/ColorsUIkit.swift b/DesignKit/Source/ColorsUIkit.swift index 5ca20ab0b6..5db1c4fbab 100644 --- a/DesignKit/Source/ColorsUIkit.swift +++ b/DesignKit/Source/ColorsUIkit.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/DesignKit/Source/Fonts.swift b/DesignKit/Source/Fonts.swift index 1203a28882..9c058f970b 100644 --- a/DesignKit/Source/Fonts.swift +++ b/DesignKit/Source/Fonts.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import UIKit diff --git a/DesignKit/Source/FontsSwiftUI.swift b/DesignKit/Source/FontsSwiftUI.swift index 83b4e820b8..2321f293a0 100644 --- a/DesignKit/Source/FontsSwiftUI.swift +++ b/DesignKit/Source/FontsSwiftUI.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/DesignKit/Source/FontsUIkit.swift b/DesignKit/Source/FontsUIkit.swift index ec65cdaa66..14deb81112 100644 --- a/DesignKit/Source/FontsUIkit.swift +++ b/DesignKit/Source/FontsUIkit.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/DesignKit/Source/ThemeV2.swift b/DesignKit/Source/ThemeV2.swift index dedc4d6df0..654e093144 100644 --- a/DesignKit/Source/ThemeV2.swift +++ b/DesignKit/Source/ThemeV2.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/DesignKit/Variants/Colors/Dark/DarkColors.swift b/DesignKit/Variants/Colors/Dark/DarkColors.swift index fff85f24f5..c0d128cbff 100644 --- a/DesignKit/Variants/Colors/Dark/DarkColors.swift +++ b/DesignKit/Variants/Colors/Dark/DarkColors.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/DesignKit/Variants/Colors/Light/LightColors.swift b/DesignKit/Variants/Colors/Light/LightColors.swift index 7102066c33..adfecd975e 100644 --- a/DesignKit/Variants/Colors/Light/LightColors.swift +++ b/DesignKit/Variants/Colors/Light/LightColors.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/DesignKit/Variants/Fonts/ElementFonts.swift b/DesignKit/Variants/Fonts/ElementFonts.swift index e0a612f855..20cd8de04d 100644 --- a/DesignKit/Variants/Fonts/ElementFonts.swift +++ b/DesignKit/Variants/Fonts/ElementFonts.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import SwiftUI diff --git a/DevTchap/Assets/DevTchapSharedImages.xcassets/TchapLogo.imageset/tchap_logo.png b/DevTchap/Assets/DevTchapSharedImages.xcassets/TchapLogo.imageset/tchap_logo.png index 258ce54114..bbe4ea952f 100644 Binary files a/DevTchap/Assets/DevTchapSharedImages.xcassets/TchapLogo.imageset/tchap_logo.png and b/DevTchap/Assets/DevTchapSharedImages.xcassets/TchapLogo.imageset/tchap_logo.png differ diff --git a/DevTchap/Assets/DevTchapSharedImages.xcassets/TchapLogo.imageset/tchap_logo@2x.png b/DevTchap/Assets/DevTchapSharedImages.xcassets/TchapLogo.imageset/tchap_logo@2x.png index 1d26c83d7c..1779a7ed21 100644 Binary files a/DevTchap/Assets/DevTchapSharedImages.xcassets/TchapLogo.imageset/tchap_logo@2x.png and b/DevTchap/Assets/DevTchapSharedImages.xcassets/TchapLogo.imageset/tchap_logo@2x.png differ diff --git a/DevTchap/Assets/DevTchapSharedImages.xcassets/TchapLogo.imageset/tchap_logo@3x.png b/DevTchap/Assets/DevTchapSharedImages.xcassets/TchapLogo.imageset/tchap_logo@3x.png index 0b01f38e68..11dc73da54 100644 Binary files a/DevTchap/Assets/DevTchapSharedImages.xcassets/TchapLogo.imageset/tchap_logo@3x.png and b/DevTchap/Assets/DevTchapSharedImages.xcassets/TchapLogo.imageset/tchap_logo@3x.png differ diff --git a/DevTchap/Config/BuildSettings.swift b/DevTchap/Config/BuildSettings.swift index 9798d09178..3b0e399246 100644 --- a/DevTchap/Config/BuildSettings.swift +++ b/DevTchap/Config/BuildSettings.swift @@ -97,7 +97,7 @@ final class BuildSettings: NSObject { static let serverUrlPrefix = "https://matrix." static let preferredIdentityServerNames = [ "dev01.tchap.incubateur.net", - "dev02.tchap.incubateur.net" +// "dev02.tchap.incubateur.net" ] static let otherIdentityServerNames: [String] = [ "ext01.tchap.incubateur.net" @@ -123,7 +123,7 @@ final class BuildSettings: NSObject { static let applicationHelpUrlString = "https://www.tchap.incubateur.net/faq" static let applicationServicesStatusUrlString = "https://status.tchap.numerique.gouv.fr/" static let applicationAcceptableUsePolicyUrlString = "" - + static let proConnectInfoUrlString = "https://proconnect.gouv.fr/" // MARK: - Matrix permalinks // Hosts/Paths for URLs that will considered as valid permalinks. Those permalinks are opened within the app. @@ -243,6 +243,9 @@ final class BuildSettings: NSObject { tchapFeatureAnyFeature: [ tchapFeatureAnyHomeServer ] ] + // Tchap: handle SSO feature flag. Presents SSO button on Onboarding screen and give priority to SSO on UIA. + static let tchapFeatureHandleSSO = true + // MARK: - Side Menu static let enableSideMenu: Bool = true && !newAppLayoutEnabled static let sideMenuShowInviteFriends: Bool = true diff --git a/DevTchap/Generated/InfoPlist.swift b/DevTchap/Generated/InfoPlist.swift index 2306b5b8c2..fbcea157f4 100644 --- a/DevTchap/Generated/InfoPlist.swift +++ b/DevTchap/Generated/InfoPlist.swift @@ -21,6 +21,7 @@ internal enum InfoPlist { internal static let cfBundlePackageType: String = _document["CFBundlePackageType"] internal static let cfBundleShortVersionString: String = _document["CFBundleShortVersionString"] internal static let cfBundleSignature: String = _document["CFBundleSignature"] + internal static let cfBundleURLTypes: [[String: Any]] = _document["CFBundleURLTypes"] internal static let cfBundleVersion: String = _document["CFBundleVersion"] internal static let itsAppUsesNonExemptEncryption: Bool = _document["ITSAppUsesNonExemptEncryption"] internal static let lsRequiresIPhoneOS: Bool = _document["LSRequiresIPhoneOS"] diff --git a/DevTchap/SupportingFiles/DevTchap-App-Common.xcconfig b/DevTchap/SupportingFiles/DevTchap-App-Common.xcconfig index 5fe20ec985..ae7b765ca3 100644 --- a/DevTchap/SupportingFiles/DevTchap-App-Common.xcconfig +++ b/DevTchap/SupportingFiles/DevTchap-App-Common.xcconfig @@ -24,6 +24,7 @@ BUNDLE_DISPLAY_NAME = DevTchap BASE_BUNDLE_IDENTIFIER = fr.gouv.tchap.dev APPLICATION_GROUP_IDENTIFIER = group.$(BASE_BUNDLE_IDENTIFIER) PRODUCT_BUNDLE_IDENTIFIER = $(BASE_BUNDLE_IDENTIFIER) +APPLICATION_SCHEME = tchap INFOPLIST_FILE = DevTchap/SupportingFiles/Info.plist ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon diff --git a/DevTchap/SupportingFiles/Info.plist b/DevTchap/SupportingFiles/Info.plist index 4303301c18..533722fc3c 100644 --- a/DevTchap/SupportingFiles/Info.plist +++ b/DevTchap/SupportingFiles/Info.plist @@ -35,6 +35,19 @@ $(MARKETING_VERSION) CFBundleSignature ???? + CFBundleURLTypes + + + CFBundleTypeRole + Editor + CFBundleURLName + $(BASE_BUNDLE_IDENTIFIER) + CFBundleURLSchemes + + $(APPLICATION_SCHEME) + + + CFBundleVersion $(CURRENT_PROJECT_VERSION) ITSAppUsesNonExemptEncryption diff --git a/IDETemplateMacros.plist b/IDETemplateMacros.plist index 13ab2cd611..bffbfdc999 100644 --- a/IDETemplateMacros.plist +++ b/IDETemplateMacros.plist @@ -6,17 +6,8 @@ // Copyright ___YEAR___ New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // \ No newline at end of file diff --git a/LICENSE b/LICENSE index 8f71f43fee..be3f7b28e5 100644 --- a/LICENSE +++ b/LICENSE @@ -1,202 +1,661 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright {yyyy} {name of copyright owner} - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. diff --git a/Podfile b/Podfile index be4ce6b1d4..742cc11791 100644 --- a/Podfile +++ b/Podfile @@ -51,7 +51,7 @@ abstract_target 'TchapPods' do # PostHog for analytics pod 'PostHog', '~> 2.0.0' - pod 'Sentry', '~> 7.15.0' + pod 'Sentry', '~> 8.40.1' pod 'RxSwift', '~> 5.1.1' @@ -59,8 +59,8 @@ abstract_target 'TchapPods' do pod 'zxcvbn-ios' # Tools - pod 'SwiftGen', '~> 6.3' - pod 'SwiftLint', '~> 0.49.1' + pod 'SwiftGen' + pod 'SwiftLint' pod 'SwiftFormat/CLI' target "Tchap" do diff --git a/Podfile.lock b/Podfile.lock index 3ea7cb1e53..f874dc4e1b 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -20,13 +20,13 @@ PODS: - Down (0.11.0) - DSBottomSheet (0.3.0) - DSWaveformImage (6.1.1) - - FLEX (4.5.0) + - FLEX (5.22.10) - FlowCommoniOS (1.12.2) - GBDeviceInfo (7.1.0): - GBDeviceInfo/Core (= 7.1.0) - GBDeviceInfo/Core (7.1.0) - GZIP (1.3.2) - - Introspect (0.11.0) + - Introspect (0.12.0) - JitsiMeetSDKLite (8.1.2-lite): - JitsiWebRTC (~> 111.0) - JitsiWebRTC (111.0.2) @@ -39,26 +39,25 @@ PODS: - LoggerAPI (1.9.200): - Logging (~> 1.1) - Logging (1.4.0) - - MatrixSDK (0.27.10): - - MatrixSDK/Core (= 0.27.10) - - MatrixSDK/Core (0.27.10): + - MatrixSDK (0.27.15): + - MatrixSDK/Core (= 0.27.15) + - MatrixSDK/Core (0.27.15): - AFNetworking (~> 4.0.0) - GZIP (~> 1.3.0) - libbase58 (~> 0.1.4) - - MatrixSDKCrypto (= 0.4.2) - - OLMKit (~> 3.2.5) + - MatrixSDKCrypto (= 0.4.3) - Realm (= 10.27.0) - SwiftyBeaver (= 1.9.5) - - MatrixSDK/JingleCallStack (0.27.10): + - MatrixSDK/JingleCallStack (0.27.15): - JitsiMeetSDKLite (= 8.1.2-lite) - MatrixSDK/Core - - MatrixSDKCrypto (0.4.2) + - MatrixSDKCrypto (0.4.3) - OLMKit (3.2.12): - OLMKit/olmc (= 3.2.12) - OLMKit/olmcpp (= 3.2.12) - OLMKit/olmc (3.2.12) - OLMKit/olmcpp (3.2.12) - - PostHog (2.0.0) + - PostHog (2.0.2) - ReadMoreTextView (3.0.1) - Realm (10.27.0): - Realm/Headers (= 10.27.0) @@ -74,7 +73,7 @@ PODS: - Sentry/Core (7.15.0) - SideMenu (6.5.0) - SwiftBase32 (0.9.0) - - SwiftFormat/CLI (0.54.0) + - SwiftFormat/CLI (0.54.5) - SwiftGen (6.6.2) - SwiftJWT (3.6.200): - BlueCryptor (~> 1.0) @@ -96,7 +95,7 @@ DEPENDENCIES: - Down (~> 0.11.0) - DSBottomSheet (~> 0.3) - DSWaveformImage (~> 6.1.1) - - FLEX (~> 4.5.0) + - FLEX (~> 5.22.10) - FlowCommoniOS (~> 1.12.0) - GBDeviceInfo (~> 7.1.0) - Introspect (~> 0.1) @@ -114,9 +113,9 @@ DEPENDENCIES: - SideMenu (~> 6.5) - SwiftBase32 (~> 0.9.0) - SwiftFormat/CLI - - SwiftGen (~> 6.3) + - SwiftGen - SwiftJWT (~> 3.6.200) - - SwiftLint (~> 0.49.1) + - SwiftLint - UICollectionViewLeftAlignedLayout (~> 1.0.2) - UICollectionViewRightAlignedLayout (~> 0.0.3) - WeakDictionary (~> 2.0) @@ -179,11 +178,11 @@ SPEC CHECKSUMS: Down: b6ba1bc985c9d2f4e15e3b293d2207766fa12612 DSBottomSheet: ca0ac37eb5af2dd54663f86b84382ed90a59be2a DSWaveformImage: 3c718a0cf99291887ee70d1d0c18d80101d3d9ce - FLEX: e51461dd6f0bfb00643c262acdfea5d5d12c596b + FLEX: f21ee4f498eed3f8a1eded66b21939fd3b7a22ce FlowCommoniOS: ca92071ab526dc89905495a37844fd7e78d1a7f2 GBDeviceInfo: 5d62fa85bdcce3ed288d83c28789adf1173e4376 GZIP: 3c0abf794bfce8c7cb34ea05a1837752416c8868 - Introspect: 4cc1e4c34dd016540c8d86a591c231c09dafbee3 + Introspect: b66b675de8a85d9ef832f3a710d8e3c7db186884 JitsiMeetSDKLite: 895213158cf62342069a10634a41d2f1c00057f7 JitsiWebRTC: 80f62908fcf2a1160e0d14b584323fb6e6be630b KeychainAccess: c0c4f7f38f6fc7bbe58f5702e25f7bd2f65abf51 @@ -193,10 +192,10 @@ SPEC CHECKSUMS: libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75 LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d Logging: beeb016c9c80cf77042d62e83495816847ef108b - MatrixSDK: c805f9306d60955215f4b15043ed0f96fd4867b3 - MatrixSDKCrypto: 736069ee0a5ec12852ab3498bf2242acecc443fc + MatrixSDK: 12b379749b84ab5b3662042acb1914b9f9bb692b + MatrixSDKCrypto: 27bee960e0e8b3a3039f3f3e93dd2ec88299c77e OLMKit: da115f16582e47626616874e20f7bb92222c7a51 - PostHog: 660ec6c9d80cec17b685e148f17f6785a88b597d + PostHog: f9e5c13ceea86bb5314218c85d16125b797eb332 ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d Realm: 9ca328bd7e700cc19703799785e37f77d1a130f2 Reusable: 6bae6a5e8aa793c9c441db0213c863a64bce9136 @@ -204,7 +203,7 @@ SPEC CHECKSUMS: Sentry: 63ca44f5e0c8cea0ee5a07686b02e56104f41ef7 SideMenu: f583187d21c5b1dd04c72002be544b555a2627a2 SwiftBase32: 9399c25a80666dc66b51e10076bf591e3bbb8f17 - SwiftFormat: 0e0b577434e6aa63bc82a8905b40d9597b8452d4 + SwiftFormat: 543a7b1ab4a6ce2d88bd5616a17903446ca3dc5c SwiftGen: 1366a7f71aeef49954ca5a63ba4bef6b0f24138c SwiftJWT: 88c412708f58c169d431d344c87bc79a87c830ae SwiftLint: 32ee33ded0636d0905ef6911b2b67bbaeeedafa5 @@ -215,6 +214,6 @@ SPEC CHECKSUMS: zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c ZXingObjC: 8898711ab495761b2dbbdec76d90164a6d7e14c5 -PODFILE CHECKSUM: 971cd7529e2d127b237469afa2c18e6dced151ec +PODFILE CHECKSUM: 71717d585bff57965402647a1ac31c47351d3cc7 -COCOAPODS: 1.14.3 +COCOAPODS: 1.15.2 diff --git a/README.md b/README.md index 9dfedfb17e..b8a1b37d6b 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,15 @@ ![GitHub release (latest by date)](https://img.shields.io/github/v/release/dinsic-pim/tchap-ios) ![badge-languages](https://img.shields.io/badge/languages-Swift%20%7C%20ObjC-orange.svg) [![Swift 5.x](https://img.shields.io/badge/Swift-5.x-orange)](https://developer.apple.com/swift) -![GitHub](https://img.shields.io/github/license/dinsic-pim/tchap-ios) +[![Build status](https://badge.buildkite.com/cc8f93e32da93fa7c1172398bd8af66254490567c7195a5f3f.svg?branch=develop)](https://buildkite.com/matrix-dot-org/element-ios/builds?branch=develop) +[![Weblate](https://translate.riot.im/widgets/riot-ios/-/svg-badge.svg)](https://translate.riot.im/engage/riot-ios/?utm_source=widget) +[![codecov](https://codecov.io/gh/element-hq/element-ios/branch/develop/graph/badge.svg?token=INNm5o6XWg)](https://codecov.io/gh/element-hq/element-ios) +[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=element-ios&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=element-ios) +[![Bugs](https://sonarcloud.io/api/project_badges/measure?project=element-ios&metric=bugs)](https://sonarcloud.io/summary/new_code?id=element-ios) +[![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=element-ios&metric=vulnerabilities)](https://sonarcloud.io/summary/new_code?id=element-ios) +[![Element iOS Matrix room #element-ios:matrix.org](https://img.shields.io/matrix/element-ios:matrix.org.svg?label=%23element-ios:matrix.org&logo=matrix&server_fqdn=matrix.org)](https://matrix.to/#/#element-ios:matrix.org) +![GitHub](https://img.shields.io/github/license/element-hq/element-ios) +[![Twitter URL](https://img.shields.io/twitter/url?label=Element&url=https%3A%2F%2Ftwitter.com%2Felement_hq)](https://twitter.com/element_hq) Tchap iOS is an iOS [Matrix](https://matrix.org/) client. It is based on [MatrixSDK](https://github.com/matrix-org/matrix-ios-sdk). @@ -41,10 +49,8 @@ When you are experiencing an issue on Tchap iOS, please first search in [GitHub Copyright (c) 2014-2017 OpenMarket Ltd Copyright (c) 2017 Vector Creations Ltd -Copyright (c) 2017-2021 New Vector Ltd +Copyright (c) 2017-2024 New Vector Ltd -Licensed under the Apache License, Version 2.0 (the "License"); you may not use this work except in compliance with the License. You may obtain a copy of the License in the [LICENSE](LICENSE) file, or at: - -[http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) +SPDX-License-Identifier: AGPL-3.0-only. Please see [LICENSE](LICENSE) in the repository root for full details. Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. diff --git a/Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved deleted file mode 100644 index c90d47d46f..0000000000 --- a/Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ /dev/null @@ -1,104 +0,0 @@ -{ - "pins" : [ - { - "identity" : "devicekit", - "kind" : "remoteSourceControl", - "location" : "https://github.com/devicekit/DeviceKit", - "state" : { - "revision" : "d37e70cb2646666dcf276d7d3d4a9760a41ff8a6", - "version" : "4.9.0" - } - }, - { - "identity" : "dtcoretext", - "kind" : "remoteSourceControl", - "location" : "https://github.com/Cocoanetics/DTCoreText", - "state" : { - "revision" : "b664664825da565b4c2b7a17dbe2369f68ae43d9", - "version" : "1.6.26" - } - }, - { - "identity" : "dtfoundation", - "kind" : "remoteSourceControl", - "location" : "https://github.com/Cocoanetics/DTFoundation.git", - "state" : { - "revision" : "76062513434421cb6c8a1ae1d4f8368a7ebc2da3", - "version" : "1.7.18" - } - }, - { - "identity" : "maplibre-gl-native-distribution", - "kind" : "remoteSourceControl", - "location" : "https://github.com/maplibre/maplibre-gl-native-distribution", - "state" : { - "revision" : "d761956e81e74d8bdbfba31e0ec3a75616190658", - "version" : "5.12.2" - } - }, - { - "identity" : "matrix-analytics-events", - "kind" : "remoteSourceControl", - "location" : "https://github.com/matrix-org/matrix-analytics-events", - "state" : { - "revision" : "de0cac487e5e7f607ee17045882204c91585461f", - "version" : "0.23.1" - } - }, - { - "identity" : "matrix-rich-text-editor-swift", - "kind" : "remoteSourceControl", - "location" : "https://github.com/matrix-org/matrix-rich-text-editor-swift", - "state" : { - "revision" : "21c0dd6e9c0b38d19d97af8e3e99fe01df56825d", - "version" : "2.37.3" - } - }, - { - "identity" : "ogg-swift", - "kind" : "remoteSourceControl", - "location" : "https://github.com/vector-im/ogg-swift.git", - "state" : { - "revision" : "9d82ed838404f10b607a1a1689f404563e9115c3", - "version" : "0.8.3" - } - }, - { - "identity" : "opus-swift", - "kind" : "remoteSourceControl", - "location" : "https://github.com/vector-im/opus-swift", - "state" : { - "revision" : "11f1887767cbc87c4b64b789ee830b779cc744cb", - "version" : "0.8.4" - } - }, - { - "identity" : "posthog-ios", - "kind" : "remoteSourceControl", - "location" : "https://github.com/PostHog/posthog-ios", - "state" : { - "revision" : "8b2508444962d67aa5f8770074f32d493383dafd", - "version" : "3.2.5" - } - }, - { - "identity" : "swift-collections", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-collections", - "state" : { - "revision" : "94cf62b3ba8d4bed62680a282d4c25f9c63c2efb", - "version" : "1.1.0" - } - }, - { - "identity" : "swift-ogg", - "kind" : "remoteSourceControl", - "location" : "https://github.com/element-hq/swift-ogg", - "state" : { - "branch" : "0.0.1", - "revision" : "e9a9e7601da662fd8b97d93781ff5c60b4becf88" - } - } - ], - "version" : 2 -} diff --git a/Riot/Assets/en.lproj/Vector.strings b/Riot/Assets/en.lproj/Vector.strings index 363d3bb6d1..b891f901c0 100644 --- a/Riot/Assets/en.lproj/Vector.strings +++ b/Riot/Assets/en.lproj/Vector.strings @@ -2792,7 +2792,7 @@ To enable access, tap Settings> Location and select Always"; // Tchap // Settings "settings" = "Settings"; -"settings_enable_inapp_notifications" = "Enable in-app notifications"; +"settings_enable_inapp_notifications" = "Enable in-app notifications for this account"; // Tchap "settings_enable_push_notifications" = "Enable push notifications"; "settings_enter_validation_token_for" = "Enter validation token for %@:"; diff --git a/Riot/Assets/et.lproj/Vector.strings b/Riot/Assets/et.lproj/Vector.strings index 22e9f34192..c21f0ba265 100644 --- a/Riot/Assets/et.lproj/Vector.strings +++ b/Riot/Assets/et.lproj/Vector.strings @@ -2719,3 +2719,10 @@ "settings_manage_account_description" = "Halda kasutajakontot koduserveris %@"; "manage_session_redirect" = "Järgmiseks suuname sind sinu serveriteenuse autentijale ning seal saad sa väljalogimise lõpuni viia."; "manage_session_redirect_error" = "See funktsionaalsus pole hetkel saadaval. Lisateavet saad oma koduserveri haldajalt"; +"room_action_report" = "Teata jututoast"; +"room_action_report_prompt_reason" = "Jututoast teatamise põhjus"; + + +// MARK: - WYSIWYG Composer +"wysiwyg_composer_action_minimise_action" = "Peida tekstitoimeti"; +"wysiwyg_composer_action_maximise_action" = "Ava tekstitoimeti"; diff --git a/Riot/Assets/fr.lproj/Vector.strings b/Riot/Assets/fr.lproj/Vector.strings index b7a06b448d..056297ce6f 100644 --- a/Riot/Assets/fr.lproj/Vector.strings +++ b/Riot/Assets/fr.lproj/Vector.strings @@ -1814,7 +1814,7 @@ "room_displayname_two_members" = "%@ et %@"; // Settings "settings" = "Paramètres"; -"settings_enable_inapp_notifications" = "Activer les notifications dans l’application"; +"settings_enable_inapp_notifications" = "Activer les notifications pour ce compte"; // Tchap "settings_enable_push_notifications" = "Activer les notifications push"; "settings_enter_validation_token_for" = "Saisir le jeton de validation pour %@ :"; "notification_settings_room_rule_title" = "Salon : « %@ »"; @@ -2299,7 +2299,7 @@ "authentication_verify_email_waiting_hint" = "Vous n’avez pas reçu l’e-mail ?"; /* The placeholder will show the email address that was entered. */ "authentication_verify_email_waiting_message" = "Suivez les instructions envoyées à %@"; -"authentication_verify_email_text_field_placeholder" = "Adresse mail"; // Tchap +"authentication_verify_email_text_field_placeholder" = "Adresse mail professionnelle"; // Tchap /* The placeholder will show the homeserver's domain */ "authentication_verify_email_input_message" = "%@ doit vérifier votre compte"; "authentication_verify_email_input_title" = "Entrez votre e-mail"; diff --git a/Riot/Assets/hu.lproj/Vector.strings b/Riot/Assets/hu.lproj/Vector.strings index 216ab88fdb..8e324169f0 100644 --- a/Riot/Assets/hu.lproj/Vector.strings +++ b/Riot/Assets/hu.lproj/Vector.strings @@ -2478,9 +2478,9 @@ "user_sessions_settings" = "Munkamenetek kezelése"; "invite_to" = "Meghívó ide: %@"; "device_name_unknown" = "Ismeretlen kliens"; -"device_name_mobile" = "%@ Mobil"; -"device_name_desktop" = "%@ Alkalmazás"; -"device_name_web" = "%@ Web"; +"device_name_mobile" = "Mobilos %@"; +"device_name_desktop" = "Asztali %@"; +"device_name_web" = "Webes %@"; "user_session_item_details" = "%1$@ · %2$@"; // First item is client name and second item is session display name @@ -2528,19 +2528,19 @@ "user_session_details_device_os" = "Operációs rendszer"; "user_session_details_device_browser" = "Böngésző"; "user_session_details_device_model" = "Modell"; -"user_session_details_device_ip_location" = "Tartózkodási helyem"; +"user_session_details_device_ip_location" = "Saját tartózkodási hely"; "user_session_details_device_ip_address" = "IP cím"; "user_session_details_last_activity" = "Utolsó tevékenység"; -"user_session_details_session_section_footer" = "A másoláshoz koppints és tartsd rajta az ujjad."; -"user_session_details_session_id" = "Kapcsolat azonosító"; +"user_session_details_session_section_footer" = "A másoláshoz koppintson és tartsa lenyomva."; +"user_session_details_session_id" = "Kapcsolatazonosító"; "user_session_details_session_name" = "Munkamenet neve"; "user_session_details_device_section_header" = "Eszköz"; "user_session_details_application_section_header" = "Alkalmazás"; "user_session_details_session_section_header" = "Munkamenet"; -"user_session_details_title" = "Munkamenet információk"; +"user_session_details_title" = "Munkamenet-információk"; "device_type_name_unknown" = "Ismeretlen"; -"device_type_name_mobile" = "Mobil"; -"device_type_name_web" = "Web"; +"device_type_name_mobile" = "Mobilos"; +"device_type_name_web" = "Webes"; "device_type_name_desktop" = "Asztali"; "user_inactive_session_item_with_date" = "90+ napja inaktív (%@)"; "user_inactive_session_item" = "90+ napja inaktív"; @@ -2763,3 +2763,14 @@ "settings_manage_account_action" = "Fiók kezelése"; "settings_manage_account_description" = "A fiókja kezelése itt: %@"; "room_command_change_room_topic_description" = "Beállítja a szoba témáját"; +"room_action_report" = "Szoba jelentése"; +"room_action_report_prompt_reason" = "A szoba jelentésének oka"; + + +// MARK: - WYSIWYG Composer +"wysiwyg_composer_action_minimise_action" = "Szerkesztő összecsukása"; +"wysiwyg_composer_action_maximise_action" = "Szerkesztő kibontása"; +"room_command_set_user_power_level_description" = "Meghatározza a felhasználó szintjét"; +"room_command_reset_user_power_level_description" = "Elveszi az adott azonosítójú felhasználó operátori jogosultságát"; +"room_command_error_unknown_command" = "Érvénytelen vagy nem kezelt parancs"; +"room_command_discard_session_description" = "Kényszeríti a titkosított szobában lévő aktuális kimenő csoportmunkamenet elvetését"; diff --git a/Riot/Assets/id.lproj/Vector.strings b/Riot/Assets/id.lproj/Vector.strings index 5e8e1c027e..a27d04098a 100644 --- a/Riot/Assets/id.lproj/Vector.strings +++ b/Riot/Assets/id.lproj/Vector.strings @@ -2974,3 +2974,10 @@ "settings_manage_account_description" = "Kelola akun Anda di %@"; "manage_session_redirect" = "Anda akan dialihkan ke penyedia autentikasi server Anda untuk menyelesaikan proses keluar."; "manage_session_redirect_error" = "Fungsi saat ini tidak tersedia. Silakan hubungi admin homeserver Anda"; +"room_action_report_prompt_reason" = "Alasan melaporkan ruangan ini"; + + +// MARK: - WYSIWYG Composer +"wysiwyg_composer_action_minimise_action" = "Kecilkan komposer"; +"wysiwyg_composer_action_maximise_action" = "Luaskan komposer"; +"room_action_report" = "Laporkan ruangan"; diff --git a/Riot/Assets/it.lproj/Vector.strings b/Riot/Assets/it.lproj/Vector.strings index 0e893b97cb..55551cc09e 100644 --- a/Riot/Assets/it.lproj/Vector.strings +++ b/Riot/Assets/it.lproj/Vector.strings @@ -2747,3 +2747,10 @@ "settings_manage_account_description" = "Gestisci il tuo account su %@"; "manage_session_redirect" = "Verrai reindirizzato al fornitore di autenticazione del tuo server per completare la disconnessione."; "manage_session_redirect_error" = "Funzionalità attualmente non disponibile. Contatta l'amministratore del tuo homeserver"; + + +// MARK: - WYSIWYG Composer +"wysiwyg_composer_action_minimise_action" = "Rimpicciolisci il compositore"; +"wysiwyg_composer_action_maximise_action" = "Espandi il compositore"; +"room_action_report" = "Segnala stanza"; +"room_action_report_prompt_reason" = "Motivo della segnalazione della stanza"; diff --git a/Riot/Assets/js/postMessageAPI.js b/Riot/Assets/js/postMessageAPI.js index 81b1fe9cbe..131eb8764f 100644 --- a/Riot/Assets/js/postMessageAPI.js +++ b/Riot/Assets/js/postMessageAPI.js @@ -1,17 +1,9 @@ /* - Copyright 2017 Vector Creations Ltd +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ window.riotIOS = {}; diff --git a/Riot/Assets/ko.lproj/InfoPlist.strings b/Riot/Assets/ko.lproj/InfoPlist.strings index 45ef46ab90..90c09e51ac 100644 --- a/Riot/Assets/ko.lproj/InfoPlist.strings +++ b/Riot/Assets/ko.lproj/InfoPlist.strings @@ -1,8 +1,9 @@ // Permissions usage explanations -"NSCameraUsageDescription" = "카메라는 사진과 영상 촬영, 영상 통화를 하는 데 쓰입니다."; -"NSPhotoLibraryUsageDescription" = "포토 라이브러리는 사진과 영상을 보내는데 쓰입니다."; +"NSCameraUsageDescription" = "카메라는 영상 통화를 하거나 사진과 비디오를 찍고 업로드하는 데 사용됩니다."; +"NSPhotoLibraryUsageDescription" = "사진 및 동영상을 라이브러리에서 업로드할 수 있도록 사진 접근을 허용하세요."; "NSMicrophoneUsageDescription" = "Element는 통화와 동영상 촬영 및 음성 메시지 녹음을 하기 위해 마이크에 액세스해야 합니다."; -"NSContactsUsageDescription" = "Element는 채팅에 초대할 수 있도록 연락처를 표시합니다."; +"NSContactsUsageDescription" = "다른사람이 매트릭스에서 당신의 연락처를 찾는 데 도움을 주기 위해 당신의 아이디 서버와 공유될 것입니다."; "NSCalendarsUsageDescription" = "앱에서 예정된 회의를 봅니다."; "NSLocationWhenInUseUsageDescription" = "사람들에게 위치 정보를 공유할때, Element에서 지도를 표시 하기 위한 권한이 필요합니다."; "NSFaceIDUsageDescription" = "Face ID 권한은 앱에 액세스하는 데 사용됩니다."; +"NSLocationAlwaysAndWhenInUseUsageDescription" = "당신의 위치를 사람들과 공유할 때, Element는 그들에게 지도를 보여주기 위해 접근이 필요합니다."; diff --git a/Riot/Assets/ko.lproj/Localizable.strings b/Riot/Assets/ko.lproj/Localizable.strings index f76cb7db09..b997fafea4 100644 --- a/Riot/Assets/ko.lproj/Localizable.strings +++ b/Riot/Assets/ko.lproj/Localizable.strings @@ -128,3 +128,6 @@ /** General **/ "Notification" = "알림"; + +/* New voice broadcast from a specific person, not referencing a room. */ +"VOICE_BROADCAST_FROM_USER" = "%@ 음성 방송을 시작했습니다"; diff --git a/Riot/Assets/ko.lproj/Vector.strings b/Riot/Assets/ko.lproj/Vector.strings index dc0ce0d07e..785b13ee3b 100644 --- a/Riot/Assets/ko.lproj/Vector.strings +++ b/Riot/Assets/ko.lproj/Vector.strings @@ -24,7 +24,7 @@ "camera" = "카메라"; // String for App Store "store_short_description" = "안전한 분산 대화/VoIP"; -"store_full_description" = "Element는 다음과 같은 기능을 제공하는 새로운 유형의 메신저입니다.\n\n1. 프라이버시를 관리할 수 있는 권한을 제공합니다.\n2. Matrix 네트워크의 사용자와 통신할 수 있을 뿐만 아니라 Slack 등의 \n앱을 연계하여 다른 네트워크와도 통신할 수 있습니다.\n3. 광고, 데이터마이닝, 백도어와 클로즈 플랫폼으로부터의 사용자를 보호합니다.\n4. 교차 검증과 강력한 종단간 암호화을 통해 사용자를 보호합니다.\n\nElement는 탈중앙화이며 오픈 소스이기 때문에 다른 메신저 앱과는 완전히 다릅니다.\n\nElement에서는 데이터 및 대화에 대한 소유권 및 제어 권한을 가질 수 있도록 자체 호스팅을 통해 \n직접 메신저 서버를 운영할 수 있고, 다른 사용자가 제공하고 있는 서버를 선택할 수 있습니다. 또한 개방형 네트워크에 액세스할 수 있으므로 Element 이외의 사용자와도 이야기할 수 있습니다. 그리고 매우 안전합니다.\n\nElement는 개방-분산형 통신의 표준인 Matrix에서 동작하기 때문에 이 모든 것을 수행할 수 있습니다.\n\nElement는 어떤 서버를 사용할지 사용자가 직접 Element 앱에서 결정할 수 있습니다.\n\n1. matrix.org의 공식 서버에서 무료 계정을 생성한다.\n2. 자체 호스팅을 통해 직접 서버를 운영하고 계정을 관리한다.\n3. Element Matrix Services의 호스팅 플랫폼에 가입하여 사용자 커스텀 서버에서 계정을 만든다.\n\n왜 Element를 선택해야합니까?\n\n내 데이터를 내가 소유함: 데이터나 메시지를 보관할 곳을 스스로 정할 수 있습니다. 데이터를 수집하거나 제 3자에게 데이터를 제공하는 거대 IT 기업이 아닌, 사용자가 스스로 데이터를 소유하고 제어할 수 있습니다.\n\n개방적인 메시징 및 협업: Element 또는 다른 Matrix 앱을 사용하든, 심지어 Slack, IRC, XMPP와 같은 다른 메시징 시스템을 사용하던 상관없이 Matrix 네트워크 상의 다른 사용자와 채팅할 수 있습니다.\n\n매우 안전함: 강력한 종단간 암호화(대화에 참여하고 있는 사람만 메시지를 복호화할 수 있습니다) 및 대화 참가자의 장치를 확인하기 위한 교차 검증을 실시할 수 있습니다.\n\n완벽한 커뮤니케이션: 메시징, 음성 및 화상 통화, 파일 공유, 화면 공유 및 다양한 통합, 봇, 위젯 등을 제공합니다. 방이나 커뮤니티를 만들어 서로 연락하고 일을 원활하게 해낼 수 있습니다.\n\n언제 어디서나: 모든 장치 및 웹(https://element.io/app)에서 메시지가 완전히 동기화되므로 언제 어디서나 연락을 취할 수 있습니다."; +"store_full_description" = "Element는 다음과 같은 기능을 제공하는 새로운 유형의 메신저입니다.\n\n1. 프라이버시를 관리할 수 있는 권한을 제공합니다.\n2. Matrix 네트워크의 사용자와 통신할 수 있을 뿐만 아니라 Slack 등의 \n앱을 연계하여 다른 네트워크와도 통신할 수 있습니다.\n3. 광고, 데이터마이닝, 백도어와 클로즈 플랫폼으로부터의 사용자를 보호합니다.\n4. 교차 검증과 강력한 종단간 암호화을 통해 사용자를 보호합니다.\n\nElement는 탈중앙화이며 오픈 소스이기 때문에 다른 메신저 앱과는 완전히 다릅니다.\n\nElement에서는 데이터 및 대화에 대한 소유권 및 제어 권한을 가질 수 있도록 자체 호스팅을 통해 \n직접 메신저 서버를 운영할 수 있고, 다른 사용자가 제공하고 있는 서버를 선택할 수 있습니다. 또한 개방형 네트워크에 액세스할 수 있으므로 Element 이외의 사용자와도 이야기할 수 있습니다. 그리고 매우 안전합니다.\n\nElement는 개방-분산형 통신의 표준인 Matrix에서 동작하기 때문에 이 모든 것을 수행할 수 있습니다.\n\nElement는 어떤 서버를 사용할지 사용자가 직접 Element 앱에서 결정할 수 있습니다.\n\n1. matrix.org의 공식 서버에서 무료 계정을 생성한다.\n2. 자체 호스팅을 통해 직접 서버를 운영하고 계정을 관리한다.\n3. Element Matrix Services의 호스팅 플랫폼에 가입하여 사용자 커스텀 서버에서 계정을 만든다.\n\n왜 Element를 선택해야합니까?\n\n내 데이터를 내가 소유함: 데이터나 메시지를 보관할 곳을 스스로 정할 수 있습니다. 데이터를 수집하거나 제 3자에게 데이터를 제공하는 거대 IT 기업이 아닌, 사용자가 스스로 데이터를 소유하고 제어할 수 있습니다.\n\n개방적인 메시징 및 협업: Element 또는 다른 Matrix 앱을 사용하든, 심지어 Slack, IRC, XMPP와 같은 다른 메시징 시스템을 사용하던 상관없이 Matrix 네트워크 상의 다른 사용자와 채팅할 수 있습니다.\n\n매우 안전함: 강력한 종단간 암호화(대화에 참여하고 있는 사람만 메시지를 복호화할 수 있습니다) 및 대화 참가자의 장치를 확인하기 위한 교차 검증을 실시할 수 있습니다.\n\n완벽한 커뮤니케이션: 메시징, 음성 및 화상 통화, 파일 공유, 화면 공유 및 다양한 통합, 봇, 위젯 등을 제공합니다. 방이나 커뮤니티를 만들어 서로 연락하고 일을 원활하게 해낼 수 있습니다.\n\n언제 어디서나: 모든 장치 및 웹(https://app.element.io/)에서 메시지가 완전히 동기화되므로 언제 어디서나 연락을 취할 수 있습니다."; "join" = "참가"; "decline" = "끊기"; "accept" = "수락"; @@ -340,7 +340,7 @@ "settings_add_email_address" = "이메일 주소 추가"; "settings_phone_number" = "휴대 전화"; "settings_add_phone_number" = "전화번호 추가"; -"settings_change_password" = "Matrix 계정 비밀번호 변경"; +"settings_change_password" = "비밀번호 변경"; "settings_night_mode" = "야간 모드"; "settings_fail_to_update_profile" = "프로필 업데이트에 실패함"; "settings_enable_push_notif" = "이 기기에서 알림"; @@ -388,7 +388,7 @@ "settings_crypto_device_key" = "\n세션 키:\n"; "settings_crypto_export" = "키 내보내기"; "settings_crypto_blacklist_unverified_devices" = "검증된 세션만 암호화"; -"settings_deactivate_my_account" = "내 계정 비활성화"; +"settings_deactivate_my_account" = "계정 영구 비활성화"; "settings_key_backup_info" = "암호화된 메시지는 종단간 암호화로 보호됩니다. 오직 당신과 참가자만 키를 갖고 있어서 이 메시지를 읽을 수 있습니다."; "settings_key_backup_info_checking" = "확인 중…"; "settings_key_backup_info_none" = "키가 이 세션에서 백업되지 않았습니다."; @@ -1525,14 +1525,14 @@ "settings_enable_room_message_bubbles" = "메시지 버블"; "settings_labs_use_only_latest_user_avatar_and_name" = "대화 기록에서 사용자의 최신 프로필 사진 및 이름 표시"; "settings_labs_enable_auto_report_decryption_errors" = "복호화 오류 자동 보고"; -"settings_labs_enable_threads" = "스레드 메시징"; +"settings_labs_enable_threads" = "스레드 메시지"; "room_participants_invite_prompt_to_msg" = "%@을(를) %@에 초대하시겠습니까?"; "rooms_empty_view_information" = "방은 비공개와 공개 모두 그룹채팅에 적합합니다. +를 눌러 기존에 개설된 방을 찾거나, 새로 개설할 수 있습니다."; "onboarding_celebration_button" = "출발"; -"onboarding_celebration_message" = "설정이 저장되었습니다."; -"onboarding_celebration_title" = "모두 설정했어요!"; +"onboarding_celebration_message" = "프로필을 업데이트하려면 설정으로 가세요"; +"onboarding_celebration_title" = "보기 좋네요!"; "onboarding_avatar_accessibility_label" = "프로필 사진"; -"onboarding_avatar_message" = "언제든지 수정할 수 있습니다."; +"onboarding_avatar_message" = "언제든지 수정할 수 있습니다"; "onboarding_avatar_title" = "프로필 사진 추가"; "onboarding_display_name_max_length" = "프로필 이름은 256자 미만이어야 합니다"; "onboarding_display_name_hint" = "나중에 수정할 수 있습니다"; @@ -1544,14 +1544,14 @@ "onboarding_congratulations_home_button" = "홈 화면으로 이동"; "onboarding_congratulations_personalize_button" = "프로필 설정"; /* The placeholder string contains the user's matrix ID */ -"onboarding_congratulations_message" = "계정 %@이(가) 새롭게 생성되었습니다."; +"onboarding_congratulations_message" = "계정 %@이(가) 새롭게 생성되었습니다"; "onboarding_congratulations_title" = "축하합니다!"; "onboarding_use_case_existing_server_message" = "기존 서버에 가입하려고 하시나요?"; "onboarding_use_case_skip_button" = "질문 넘기기"; /* The placeholder string contains onboarding_use_case_skip_button as a tappable action */ "onboarding_use_case_not_sure_yet" = "아직 확실하지 않으신가요? %@"; "onboarding_use_case_personal_messaging" = "친구와 가족"; -"onboarding_use_case_message" = "연결할 수 있도록 도와드릴게요."; +"onboarding_use_case_message" = "연결할 수 있도록 도와드릴게요"; "onboarding_use_case_title" = "누구와 가장 많이 대화하나요?"; "onboarding_splash_page_2_message" = "데이터 및 대화가 저장될 서버를 선택하여 내 정보에 대한 통제력과 독립성을 확보하세요. Matrix를 통해 연결됩니다."; "onboarding_splash_page_1_title" = "대화 내용을 소유하세요."; @@ -1586,7 +1586,7 @@ // Start "user_verification_start_verify_action" = "검증 시작하기"; -"key_verification_user_title" = "검증"; +"key_verification_user_title" = "인증"; "key_verification_tile_request_outgoing_title" = "검증 전송됨"; "widget_picker_manage_integrations" = "통합 관리하기…"; "room_widget_permission_room_id_permission" = "방 ID"; @@ -1632,3 +1632,4 @@ "room_preview_decline_invitation_options" = "초대를 거부하거나 친구를 차단하시겠습니까?"; "threads_beta_information_link" = "더 알아보기"; "threads_beta_title" = "스레드"; +"room_access_settings_screen_upgrade_alert_message" = "%@에 있는 사람은 누구나 이 방을 찾아 참여할 수 있습니다 - 모두를 수동으로 초대할 필요가 없습니다. 당신은 언제든지 방 설정에서 변경할 수 있습니다."; diff --git a/Riot/Assets/sk.lproj/Vector.strings b/Riot/Assets/sk.lproj/Vector.strings index a18873e4d8..5ad14f43f2 100644 --- a/Riot/Assets/sk.lproj/Vector.strings +++ b/Riot/Assets/sk.lproj/Vector.strings @@ -2970,3 +2970,10 @@ "settings_manage_account_description" = "Spravujte svoj účet na %@"; "manage_session_redirect" = "Budete presmerovaní na poskytovateľa overovania vášho servera, aby ste dokončili odhlásenie."; "manage_session_redirect_error" = "Funkcia aktuálne nie je dostupná. Obráťte sa na správcu vášho domovského servera"; +"room_action_report_prompt_reason" = "Dôvod nahlásenia tejto miestnosti"; +"wysiwyg_composer_action_maximise_action" = "Rozšíriť editor"; +"room_action_report" = "Nahlásiť miestnosť"; + + +// MARK: - WYSIWYG Composer +"wysiwyg_composer_action_minimise_action" = "Zmenšiť editor"; diff --git a/Riot/Assets/sq.lproj/Vector.strings b/Riot/Assets/sq.lproj/Vector.strings index cd338d626b..b1158c152d 100644 --- a/Riot/Assets/sq.lproj/Vector.strings +++ b/Riot/Assets/sq.lproj/Vector.strings @@ -14,7 +14,7 @@ "leave" = "Dilni"; "remove" = "Hiqe"; "invite" = "Ftoje"; -"retry" = "Riprovo"; +"retry" = "Riprovoni"; "off" = "Off"; "cancel" = "Anuloje"; "save" = "Ruaje"; @@ -2757,3 +2757,10 @@ "settings_manage_account_title" = "Llogari"; "settings_manage_account_action" = "Administroni llogari"; "manage_session_redirect" = "Do të ridrejtoheni te shërbimi i mirëfilltësimit të shërbyesit tuaj, për të plotësuar daljen nga llogaria."; +"room_action_report" = "Raportojeni dhomën"; +"room_action_report_prompt_reason" = "Arsye për raportimin e kësaj dhome"; + + +// MARK: - WYSIWYG Composer +"wysiwyg_composer_action_minimise_action" = "Tkurre hartuesin"; +"wysiwyg_composer_action_maximise_action" = "Zgjeroje hartuesin"; diff --git a/Riot/Assets/sv.lproj/Vector.strings b/Riot/Assets/sv.lproj/Vector.strings index 85662f0292..4ba032603a 100644 --- a/Riot/Assets/sv.lproj/Vector.strings +++ b/Riot/Assets/sv.lproj/Vector.strings @@ -2714,3 +2714,10 @@ "settings_manage_account_description" = "Hantera ditt konto på %@"; "manage_session_redirect" = "Du kommer att omdirigeras till din servers autentiseringsleverantör för att fortsätta utloggning."; "manage_session_redirect_error" = "Funktion för närvarande otillgänglig. Vänligen kontakta din hemserveradministratör"; +"room_action_report" = "Rapportera rum"; +"room_action_report_prompt_reason" = "Anledning att rapportera det här rummet"; +"wysiwyg_composer_action_maximise_action" = "Expandera redigerare"; + + +// MARK: - WYSIWYG Composer +"wysiwyg_composer_action_minimise_action" = "Krymp redigerare"; diff --git a/Riot/Assets/uk.lproj/Vector.strings b/Riot/Assets/uk.lproj/Vector.strings index 7c18d9f8b7..0119a6575d 100644 --- a/Riot/Assets/uk.lproj/Vector.strings +++ b/Riot/Assets/uk.lproj/Vector.strings @@ -2972,3 +2972,10 @@ "settings_manage_account_description" = "Керувати обліковим записом у %@"; "manage_session_redirect" = "Вас буде перенаправлено до постачальника автентифікації вашого сервера для завершення виходу."; "manage_session_redirect_error" = "Функціональність наразі недоступна. Зверніться до адміністратора вашого домашнього сервера"; +"wysiwyg_composer_action_maximise_action" = "Розгорнути редактор"; +"room_action_report" = "Поскаржитися на кімнату"; +"room_action_report_prompt_reason" = "Причина скарги на цю кімнату"; + + +// MARK: - WYSIWYG Composer +"wysiwyg_composer_action_minimise_action" = "Зменшити редактор"; diff --git a/Riot/Categories/Array.swift b/Riot/Categories/Array.swift index 88cf73e1fc..58456e324e 100644 --- a/Riot/Categories/Array.swift +++ b/Riot/Categories/Array.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Categories/Bundle.swift b/Riot/Categories/Bundle.swift index a185d26157..0e0ffda2de 100644 --- a/Riot/Categories/Bundle.swift +++ b/Riot/Categories/Bundle.swift @@ -1,17 +1,9 @@ // +// Copyright 2024 New Vector Ltd. // Copyright 2020 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Categories/Character.swift b/Riot/Categories/Character.swift index 50ef89114e..3c047758a9 100644 --- a/Riot/Categories/Character.swift +++ b/Riot/Categories/Character.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Categories/Codable.swift b/Riot/Categories/Codable.swift index b27c9c7ee0..5271b29084 100644 --- a/Riot/Categories/Codable.swift +++ b/Riot/Categories/Codable.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Categories/Date+Calculation.swift b/Riot/Categories/Date+Calculation.swift index fc68c99d57..fbb199add1 100644 --- a/Riot/Categories/Date+Calculation.swift +++ b/Riot/Categories/Date+Calculation.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Categories/FloatingPoint.swift b/Riot/Categories/FloatingPoint.swift index 3d7e5639f0..396762ae1a 100644 --- a/Riot/Categories/FloatingPoint.swift +++ b/Riot/Categories/FloatingPoint.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Categories/MXBeaconInfoSummary.swift b/Riot/Categories/MXBeaconInfoSummary.swift index 3d47a466c0..75d3947e12 100644 --- a/Riot/Categories/MXBeaconInfoSummary.swift +++ b/Riot/Categories/MXBeaconInfoSummary.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Categories/MXBugReportRestClient+Riot.swift b/Riot/Categories/MXBugReportRestClient+Riot.swift index b836f1ab44..69a244575e 100644 --- a/Riot/Categories/MXBugReportRestClient+Riot.swift +++ b/Riot/Categories/MXBugReportRestClient+Riot.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Categories/MXError.swift b/Riot/Categories/MXError.swift index de953cc19a..92148535e9 100644 --- a/Riot/Categories/MXError.swift +++ b/Riot/Categories/MXError.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import MatrixSDK diff --git a/Riot/Categories/MXEvent.swift b/Riot/Categories/MXEvent.swift index f0d10b3dad..7a46b7d650 100644 --- a/Riot/Categories/MXEvent.swift +++ b/Riot/Categories/MXEvent.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Categories/MXFileStore.swift b/Riot/Categories/MXFileStore.swift index e55a88fcb8..7ed0b6dae9 100644 --- a/Riot/Categories/MXFileStore.swift +++ b/Riot/Categories/MXFileStore.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Categories/MXHTTPClient+Async.swift b/Riot/Categories/MXHTTPClient+Async.swift index ab5c87a521..bce6bd6f7a 100644 --- a/Riot/Categories/MXHTTPClient+Async.swift +++ b/Riot/Categories/MXHTTPClient+Async.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Categories/MXKImageView.swift b/Riot/Categories/MXKImageView.swift index 2f324884ab..08ed5b6ce3 100644 --- a/Riot/Categories/MXKImageView.swift +++ b/Riot/Categories/MXKImageView.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Categories/MXKRoomBubbleCellData+Riot.swift b/Riot/Categories/MXKRoomBubbleCellData+Riot.swift index bfb7d18466..62303523bb 100644 --- a/Riot/Categories/MXKRoomBubbleCellData+Riot.swift +++ b/Riot/Categories/MXKRoomBubbleCellData+Riot.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Categories/MXKRoomBubbleTableViewCell+Riot.h b/Riot/Categories/MXKRoomBubbleTableViewCell+Riot.h index 78b0f13deb..3dcfb4c77d 100644 --- a/Riot/Categories/MXKRoomBubbleTableViewCell+Riot.h +++ b/Riot/Categories/MXKRoomBubbleTableViewCell+Riot.h @@ -1,17 +1,9 @@ /* - Copyright 2015 OpenMarket Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2015 OpenMarket Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "MatrixKit.h" diff --git a/Riot/Categories/MXKRoomBubbleTableViewCell+Riot.m b/Riot/Categories/MXKRoomBubbleTableViewCell+Riot.m index 470bcdb9fb..cebda9f79a 100644 --- a/Riot/Categories/MXKRoomBubbleTableViewCell+Riot.m +++ b/Riot/Categories/MXKRoomBubbleTableViewCell+Riot.m @@ -1,18 +1,10 @@ /* - Copyright 2015 OpenMarket Ltd - Copyright 2017 Vector Creations Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd +Copyright 2015 OpenMarket Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "MXKRoomBubbleTableViewCell+Riot.h" diff --git a/Riot/Categories/MXKTableViewCellWithLabelAndSwitch.swift b/Riot/Categories/MXKTableViewCellWithLabelAndSwitch.swift index 2dc8bb88ba..e0fd2ec28a 100644 --- a/Riot/Categories/MXKTableViewCellWithLabelAndSwitch.swift +++ b/Riot/Categories/MXKTableViewCellWithLabelAndSwitch.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Categories/MXKTableViewCellWithTextView.swift b/Riot/Categories/MXKTableViewCellWithTextView.swift index 03288d377e..40cc6d7453 100644 --- a/Riot/Categories/MXKTableViewCellWithTextView.swift +++ b/Riot/Categories/MXKTableViewCellWithTextView.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Categories/MXLocationService.swift b/Riot/Categories/MXLocationService.swift index 0c3dc73798..bf70508146 100644 --- a/Riot/Categories/MXLocationService.swift +++ b/Riot/Categories/MXLocationService.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Categories/MXPreSharingStrategy.swift b/Riot/Categories/MXPreSharingStrategy.swift index 1503234e0e..a9fb320fd8 100644 --- a/Riot/Categories/MXPreSharingStrategy.swift +++ b/Riot/Categories/MXPreSharingStrategy.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Categories/MXRecoveryService.swift b/Riot/Categories/MXRecoveryService.swift index d712a0c8d6..b63ee01a6d 100644 --- a/Riot/Categories/MXRecoveryService.swift +++ b/Riot/Categories/MXRecoveryService.swift @@ -1,17 +1,8 @@ /* - Copyright 2020 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2020-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Categories/MXRestClient+Async.swift b/Riot/Categories/MXRestClient+Async.swift index d0193c4971..ed81da35be 100644 --- a/Riot/Categories/MXRestClient+Async.swift +++ b/Riot/Categories/MXRestClient+Async.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Categories/MXRoom+Riot.h b/Riot/Categories/MXRoom+Riot.h index e57cd21a2f..ced1dcc99e 100644 --- a/Riot/Categories/MXRoom+Riot.h +++ b/Riot/Categories/MXRoom+Riot.h @@ -1,18 +1,10 @@ /* - Copyright 2015 OpenMarket Ltd - Copyright 2017 Vector Creations Ltd +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd +Copyright 2015 OpenMarket Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "UserEncryptionTrustLevel.h" diff --git a/Riot/Categories/MXRoom+Riot.m b/Riot/Categories/MXRoom+Riot.m index 263a1ec432..34e1e98955 100644 --- a/Riot/Categories/MXRoom+Riot.m +++ b/Riot/Categories/MXRoom+Riot.m @@ -1,19 +1,10 @@ /* - Copyright 2015 OpenMarket Ltd - Copyright 2017 Vector Creations Ltd - Copyright 2018 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2018-2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd +Copyright 2015 OpenMarket Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "MXRoom+Riot.h" diff --git a/Riot/Categories/MXRoom+VoiceBroadcast.swift b/Riot/Categories/MXRoom+VoiceBroadcast.swift index 6d74cfaaf4..27f3cae82f 100644 --- a/Riot/Categories/MXRoom+VoiceBroadcast.swift +++ b/Riot/Categories/MXRoom+VoiceBroadcast.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import MatrixSDK diff --git a/Riot/Categories/MXRoomSummary+Riot.h b/Riot/Categories/MXRoomSummary+Riot.h index 324a7f3698..b0d89125cf 100644 --- a/Riot/Categories/MXRoomSummary+Riot.h +++ b/Riot/Categories/MXRoomSummary+Riot.h @@ -1,17 +1,9 @@ /* - Copyright 2017 Vector Creations Ltd +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "MatrixKit.h" diff --git a/Riot/Categories/MXRoomSummary+Riot.m b/Riot/Categories/MXRoomSummary+Riot.m index b2c1eeb407..af9aa8c35b 100644 --- a/Riot/Categories/MXRoomSummary+Riot.m +++ b/Riot/Categories/MXRoomSummary+Riot.m @@ -1,18 +1,9 @@ /* - Copyright 2017 Vector Creations Ltd - Copyright 2018 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2018-2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "MXRoomSummary+Riot.h" diff --git a/Riot/Categories/MXRoomSummary.swift b/Riot/Categories/MXRoomSummary.swift index 4cf55ff6a6..ff691aecca 100644 --- a/Riot/Categories/MXRoomSummary.swift +++ b/Riot/Categories/MXRoomSummary.swift @@ -1,17 +1,8 @@ // -// Copyright 2024 New Vector Ltd +// Copyright 2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Categories/MXSession+Riot.h b/Riot/Categories/MXSession+Riot.h index 168511ec29..6e088aea3e 100644 --- a/Riot/Categories/MXSession+Riot.h +++ b/Riot/Categories/MXSession+Riot.h @@ -1,17 +1,9 @@ /* - Copyright 2017 Vector Creations Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import diff --git a/Riot/Categories/MXSession+Riot.m b/Riot/Categories/MXSession+Riot.m index aff1ec0e1f..012584c33a 100644 --- a/Riot/Categories/MXSession+Riot.m +++ b/Riot/Categories/MXSession+Riot.m @@ -1,17 +1,9 @@ /* - Copyright 2017 Vector Creations Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "MXSession+Riot.h" diff --git a/Riot/Categories/MXSession.swift b/Riot/Categories/MXSession.swift index 4d7256b62f..e399760e3e 100644 --- a/Riot/Categories/MXSession.swift +++ b/Riot/Categories/MXSession.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Categories/MXSessionState.swift b/Riot/Categories/MXSessionState.swift index 9f43992a80..27d8b42b83 100644 --- a/Riot/Categories/MXSessionState.swift +++ b/Riot/Categories/MXSessionState.swift @@ -1,17 +1,9 @@ // +// Copyright 2024 New Vector Ltd. // Copyright 2020 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Categories/MXThirdPartyProtocolInstance.swift b/Riot/Categories/MXThirdPartyProtocolInstance.swift index dadd1108f8..9337fd6b9e 100644 --- a/Riot/Categories/MXThirdPartyProtocolInstance.swift +++ b/Riot/Categories/MXThirdPartyProtocolInstance.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Categories/MatrixSDKCrypto+LocalizedError.swift b/Riot/Categories/MatrixSDKCrypto+LocalizedError.swift index 4b314a0c18..770c192040 100644 --- a/Riot/Categories/MatrixSDKCrypto+LocalizedError.swift +++ b/Riot/Categories/MatrixSDKCrypto+LocalizedError.swift @@ -1,17 +1,8 @@ // -// Copyright 2023 New Vector Ltd +// Copyright 2023, 2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Categories/NSArray+Element.h b/Riot/Categories/NSArray+Element.h index a71f8f714e..d4f9b09b8a 100644 --- a/Riot/Categories/NSArray+Element.h +++ b/Riot/Categories/NSArray+Element.h @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // #import diff --git a/Riot/Categories/NSArray+Element.m b/Riot/Categories/NSArray+Element.m index c5b37d01df..3b1b6c9e14 100644 --- a/Riot/Categories/NSArray+Element.m +++ b/Riot/Categories/NSArray+Element.m @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // #import "NSArray+Element.h" diff --git a/Riot/Categories/NSAttributedString+Theme.swift b/Riot/Categories/NSAttributedString+Theme.swift index 9a0e01c936..408025a50f 100644 --- a/Riot/Categories/NSAttributedString+Theme.swift +++ b/Riot/Categories/NSAttributedString+Theme.swift @@ -1,17 +1,8 @@ // -// Copyright 2023 New Vector Ltd +// Copyright 2023, 2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Categories/NSAttributedString.swift b/Riot/Categories/NSAttributedString.swift index 085579b16b..b2ceba51ec 100644 --- a/Riot/Categories/NSAttributedString.swift +++ b/Riot/Categories/NSAttributedString.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Categories/OperationQueue.swift b/Riot/Categories/OperationQueue.swift index 0b3e73ebd1..121da3cb37 100644 --- a/Riot/Categories/OperationQueue.swift +++ b/Riot/Categories/OperationQueue.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Categories/Publisher+Riot.swift b/Riot/Categories/Publisher+Riot.swift index 7c70404c6e..93c7af1d7d 100644 --- a/Riot/Categories/Publisher+Riot.swift +++ b/Riot/Categories/Publisher+Riot.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Combine diff --git a/Riot/Categories/RoomBubbleCellData.swift b/Riot/Categories/RoomBubbleCellData.swift index 84b795aac9..0f95d42aa3 100644 --- a/Riot/Categories/RoomBubbleCellData.swift +++ b/Riot/Categories/RoomBubbleCellData.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Categories/Sequence.swift b/Riot/Categories/Sequence.swift index f3e1dfb150..fe5cd06837 100644 --- a/Riot/Categories/Sequence.swift +++ b/Riot/Categories/Sequence.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // extension Sequence { diff --git a/Riot/Categories/String.swift b/Riot/Categories/String.swift index 3379234933..ea9e3fc6b5 100644 --- a/Riot/Categories/String.swift +++ b/Riot/Categories/String.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Categories/UIApplication.swift b/Riot/Categories/UIApplication.swift index d2e27c4764..0754bacbad 100644 --- a/Riot/Categories/UIApplication.swift +++ b/Riot/Categories/UIApplication.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Categories/UIButton.swift b/Riot/Categories/UIButton.swift index 195a2c2445..10fdd1be4b 100644 --- a/Riot/Categories/UIButton.swift +++ b/Riot/Categories/UIButton.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import UIKit diff --git a/Riot/Categories/UIColor.swift b/Riot/Categories/UIColor.swift index 6095c4fbf5..085eb1e173 100644 --- a/Riot/Categories/UIColor.swift +++ b/Riot/Categories/UIColor.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd +Copyright 2019-2024 New Vector Ltd. - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import UIKit diff --git a/Riot/Categories/UIControl.swift b/Riot/Categories/UIControl.swift index 619f1e7cda..e7eb7fc38d 100644 --- a/Riot/Categories/UIControl.swift +++ b/Riot/Categories/UIControl.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd +Copyright 2019-2024 New Vector Ltd. - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import UIKit diff --git a/Riot/Categories/UIDevice.swift b/Riot/Categories/UIDevice.swift index 9fabb0f826..cae9f31cb2 100644 --- a/Riot/Categories/UIDevice.swift +++ b/Riot/Categories/UIDevice.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd +Copyright 2019-2024 New Vector Ltd. - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Categories/UIGestureRecognizer.swift b/Riot/Categories/UIGestureRecognizer.swift index 26dd05082f..c6722d21b2 100644 --- a/Riot/Categories/UIGestureRecognizer.swift +++ b/Riot/Categories/UIGestureRecognizer.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import UIKit diff --git a/Riot/Categories/UIImage.swift b/Riot/Categories/UIImage.swift index 2faec2be1a..ec9d603b57 100644 --- a/Riot/Categories/UIImage.swift +++ b/Riot/Categories/UIImage.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Categories/UILabel.swift b/Riot/Categories/UILabel.swift index 8c6ac599dd..90b3c9f021 100644 --- a/Riot/Categories/UILabel.swift +++ b/Riot/Categories/UILabel.swift @@ -1,17 +1,8 @@ /* - Copyright 2020 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2020-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Categories/UINavigationController+Riot.h b/Riot/Categories/UINavigationController+Riot.h index 6e82c2b3e9..64d0c2a9b8 100644 --- a/Riot/Categories/UINavigationController+Riot.h +++ b/Riot/Categories/UINavigationController+Riot.h @@ -1,18 +1,10 @@ /* - Copyright 2016 OpenMarket Ltd - Copyright 2017 Vector Creations Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd +Copyright 2016 OpenMarket Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ /** diff --git a/Riot/Categories/UINavigationController+Riot.m b/Riot/Categories/UINavigationController+Riot.m index 919f467983..b1a2828560 100644 --- a/Riot/Categories/UINavigationController+Riot.m +++ b/Riot/Categories/UINavigationController+Riot.m @@ -1,18 +1,10 @@ /* - Copyright 2016 OpenMarket Ltd - Copyright 2017 Vector Creations Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd +Copyright 2016 OpenMarket Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "UINavigationController+Riot.h" diff --git a/Riot/Categories/UIScrollView.swift b/Riot/Categories/UIScrollView.swift index 891243ccfe..cafd2bc351 100644 --- a/Riot/Categories/UIScrollView.swift +++ b/Riot/Categories/UIScrollView.swift @@ -1,17 +1,9 @@ // +// Copyright 2024 New Vector Ltd. // Copyright 2020 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Categories/UISearchBar.swift b/Riot/Categories/UISearchBar.swift index 9c7aa2a333..b770ac88e7 100644 --- a/Riot/Categories/UISearchBar.swift +++ b/Riot/Categories/UISearchBar.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import UIKit diff --git a/Riot/Categories/UIStackView.swift b/Riot/Categories/UIStackView.swift index b3040c9164..3a3e4d1c4d 100644 --- a/Riot/Categories/UIStackView.swift +++ b/Riot/Categories/UIStackView.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import UIKit diff --git a/Riot/Categories/UITableView.swift b/Riot/Categories/UITableView.swift index 60eb40bab9..6008c3c020 100644 --- a/Riot/Categories/UITableView.swift +++ b/Riot/Categories/UITableView.swift @@ -1,18 +1,10 @@ /* - Copyright 2014 OpenMarket Ltd - Copyright 2020 Vector Creations Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2020 Vector Creations Ltd +Copyright 2014 OpenMarket Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Categories/UITableViewCell.swift b/Riot/Categories/UITableViewCell.swift index 6071a11ec0..18166af339 100644 --- a/Riot/Categories/UITableViewCell.swift +++ b/Riot/Categories/UITableViewCell.swift @@ -1,18 +1,10 @@ /* - Copyright 2014 OpenMarket Ltd - Copyright 2020 Vector Creations Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2020 Vector Creations Ltd +Copyright 2014 OpenMarket Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Categories/UITextView.swift b/Riot/Categories/UITextView.swift index 1c989cc68c..bbfb8dcb21 100644 --- a/Riot/Categories/UITextView.swift +++ b/Riot/Categories/UITextView.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import UIKit diff --git a/Riot/Categories/UITouch.swift b/Riot/Categories/UITouch.swift index be7e8307e8..66917ba808 100644 --- a/Riot/Categories/UITouch.swift +++ b/Riot/Categories/UITouch.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Categories/UIView+Toast.swift b/Riot/Categories/UIView+Toast.swift index 1d3205704f..96db483282 100644 --- a/Riot/Categories/UIView+Toast.swift +++ b/Riot/Categories/UIView+Toast.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Categories/UIView.swift b/Riot/Categories/UIView.swift index 0f7bed26bd..f2fcf2b2b7 100644 --- a/Riot/Categories/UIView.swift +++ b/Riot/Categories/UIView.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Categories/UIViewController+RiotSearch.h b/Riot/Categories/UIViewController+RiotSearch.h index ac95a41394..0ccd7b0f60 100644 --- a/Riot/Categories/UIViewController+RiotSearch.h +++ b/Riot/Categories/UIViewController+RiotSearch.h @@ -1,18 +1,10 @@ /* - Copyright 2015 OpenMarket Ltd - Copyright 2017 Vector Creations Ltd +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd +Copyright 2015 OpenMarket Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ /** diff --git a/Riot/Categories/UIViewController+RiotSearch.m b/Riot/Categories/UIViewController+RiotSearch.m index 98556960fe..1474eb92a9 100644 --- a/Riot/Categories/UIViewController+RiotSearch.m +++ b/Riot/Categories/UIViewController+RiotSearch.m @@ -1,18 +1,10 @@ /* - Copyright 2015 OpenMarket Ltd - Copyright 2017 Vector Creations Ltd +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd +Copyright 2015 OpenMarket Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "UIViewController+RiotSearch.h" diff --git a/Riot/Categories/UIViewController.swift b/Riot/Categories/UIViewController.swift index 2f29631b41..e10db5d34b 100644 --- a/Riot/Categories/UIViewController.swift +++ b/Riot/Categories/UIViewController.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import UIKit diff --git a/Riot/Categories/UNUserNotificationCenter.swift b/Riot/Categories/UNUserNotificationCenter.swift index 2f21dfdebb..593b443588 100644 --- a/Riot/Categories/UNUserNotificationCenter.swift +++ b/Riot/Categories/UNUserNotificationCenter.swift @@ -1,17 +1,8 @@ /* - Copyright 2020 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2020-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Categories/URLComponents.swift b/Riot/Categories/URLComponents.swift index b315d7820b..f9247840f3 100644 --- a/Riot/Categories/URLComponents.swift +++ b/Riot/Categories/URLComponents.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Coordinators/Coordinator.swift b/Riot/Coordinators/Coordinator.swift index 3345c2f945..c2d9721634 100755 --- a/Riot/Coordinators/Coordinator.swift +++ b/Riot/Coordinators/Coordinator.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import UIKit diff --git a/Riot/Experiments/Experiment.swift b/Riot/Experiments/Experiment.swift index 2a1531afc7..1fe8c9af0c 100644 --- a/Riot/Experiments/Experiment.swift +++ b/Riot/Experiments/Experiment.swift @@ -1,17 +1,8 @@ // -// Copyright 2023 New Vector Ltd +// Copyright 2023, 2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Experiments/PhasedRolloutFeature.swift b/Riot/Experiments/PhasedRolloutFeature.swift index 67025fd3e6..047a68a217 100644 --- a/Riot/Experiments/PhasedRolloutFeature.swift +++ b/Riot/Experiments/PhasedRolloutFeature.swift @@ -1,17 +1,8 @@ // -// Copyright 2023 New Vector Ltd +// Copyright 2023, 2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Experiments/RemoteFeaturesClientProtocol.swift b/Riot/Experiments/RemoteFeaturesClientProtocol.swift index 95ca8393e5..bf9815b4e2 100644 --- a/Riot/Experiments/RemoteFeaturesClientProtocol.swift +++ b/Riot/Experiments/RemoteFeaturesClientProtocol.swift @@ -1,17 +1,8 @@ // -// Copyright 2023 New Vector Ltd +// Copyright 2023, 2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Managers/AppInfo/AppInfo.swift b/Riot/Managers/AppInfo/AppInfo.swift index fde62d75bd..8807b595aa 100644 --- a/Riot/Managers/AppInfo/AppInfo.swift +++ b/Riot/Managers/AppInfo/AppInfo.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Managers/AppInfo/AppVersion.swift b/Riot/Managers/AppInfo/AppVersion.swift index ff7e250803..eee1085c49 100644 --- a/Riot/Managers/AppInfo/AppVersion.swift +++ b/Riot/Managers/AppInfo/AppVersion.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Managers/AppInfo/BuildInfo.h b/Riot/Managers/AppInfo/BuildInfo.h index 8817b6c417..ea23f7c838 100644 --- a/Riot/Managers/AppInfo/BuildInfo.h +++ b/Riot/Managers/AppInfo/BuildInfo.h @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // #import diff --git a/Riot/Managers/AppInfo/BuildInfo.m b/Riot/Managers/AppInfo/BuildInfo.m index 525088caa5..d721873e94 100644 --- a/Riot/Managers/AppInfo/BuildInfo.m +++ b/Riot/Managers/AppInfo/BuildInfo.m @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // #import "BuildInfo.h" diff --git a/Riot/Managers/BugReport/RageShakeManager.h b/Riot/Managers/BugReport/RageShakeManager.h index 2caff3e883..6088d79b6b 100644 --- a/Riot/Managers/BugReport/RageShakeManager.h +++ b/Riot/Managers/BugReport/RageShakeManager.h @@ -1,17 +1,9 @@ /* - Copyright 2015 OpenMarket Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2015 OpenMarket Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import diff --git a/Riot/Managers/BugReport/RageShakeManager.m b/Riot/Managers/BugReport/RageShakeManager.m index d560c57532..6709a45582 100644 --- a/Riot/Managers/BugReport/RageShakeManager.m +++ b/Riot/Managers/BugReport/RageShakeManager.m @@ -1,18 +1,10 @@ /* - Copyright 2015 OpenMarket Ltd - Copyright 2017 Vector Creations Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd +Copyright 2015 OpenMarket Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #define RAGESHAKEMANAGER_MINIMUM_SHAKING_DURATION 2 diff --git a/Riot/Managers/Call/AsyncOperation.swift b/Riot/Managers/Call/AsyncOperation.swift index 1e8e87c07a..053fb48e32 100644 --- a/Riot/Managers/Call/AsyncOperation.swift +++ b/Riot/Managers/Call/AsyncOperation.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Managers/Call/CallPresenter.swift b/Riot/Managers/Call/CallPresenter.swift index 888cbfca7c..cdec8328b3 100644 --- a/Riot/Managers/Call/CallPresenter.swift +++ b/Riot/Managers/Call/CallPresenter.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Managers/Call/CallPresenterDelegate.swift b/Riot/Managers/Call/CallPresenterDelegate.swift index a9f6df03e5..0cc539ab70 100644 --- a/Riot/Managers/Call/CallPresenterDelegate.swift +++ b/Riot/Managers/Call/CallPresenterDelegate.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Managers/Call/Operations/CallVCDismissOperation.swift b/Riot/Managers/Call/Operations/CallVCDismissOperation.swift index facc8428cf..a65906c508 100644 --- a/Riot/Managers/Call/Operations/CallVCDismissOperation.swift +++ b/Riot/Managers/Call/Operations/CallVCDismissOperation.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Managers/Call/Operations/CallVCEnterPipOperation.swift b/Riot/Managers/Call/Operations/CallVCEnterPipOperation.swift index 74bde2785f..5876a0d354 100644 --- a/Riot/Managers/Call/Operations/CallVCEnterPipOperation.swift +++ b/Riot/Managers/Call/Operations/CallVCEnterPipOperation.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Managers/Call/Operations/CallVCExitPipOperation.swift b/Riot/Managers/Call/Operations/CallVCExitPipOperation.swift index 1e74c7deda..e7eb5329ba 100644 --- a/Riot/Managers/Call/Operations/CallVCExitPipOperation.swift +++ b/Riot/Managers/Call/Operations/CallVCExitPipOperation.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Managers/Call/Operations/CallVCPresentOperation.swift b/Riot/Managers/Call/Operations/CallVCPresentOperation.swift index ce452d5759..f8b231ed3e 100644 --- a/Riot/Managers/Call/Operations/CallVCPresentOperation.swift +++ b/Riot/Managers/Call/Operations/CallVCPresentOperation.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Managers/Call/PiPAnimator.swift b/Riot/Managers/Call/PiPAnimator.swift index 7df05af53c..8e10524f5e 100644 --- a/Riot/Managers/Call/PiPAnimator.swift +++ b/Riot/Managers/Call/PiPAnimator.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Managers/Call/PiPView.swift b/Riot/Managers/Call/PiPView.swift index 54a1990448..1799fab889 100644 --- a/Riot/Managers/Call/PiPView.swift +++ b/Riot/Managers/Call/PiPView.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import UIKit diff --git a/Riot/Managers/Call/PictureInPicturable.swift b/Riot/Managers/Call/PictureInPicturable.swift index c37a904e81..83c16e85b2 100644 --- a/Riot/Managers/Call/PictureInPicturable.swift +++ b/Riot/Managers/Call/PictureInPicturable.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Managers/EncryptionKeyManager/EncryptionKeyManager.swift b/Riot/Managers/EncryptionKeyManager/EncryptionKeyManager.swift index 484a638321..15864346d6 100644 --- a/Riot/Managers/EncryptionKeyManager/EncryptionKeyManager.swift +++ b/Riot/Managers/EncryptionKeyManager/EncryptionKeyManager.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import UIKit diff --git a/Riot/Managers/KeyValueStorage/Extensions/Keychain.swift b/Riot/Managers/KeyValueStorage/Extensions/Keychain.swift index 36281edb4e..1c18ea4872 100644 --- a/Riot/Managers/KeyValueStorage/Extensions/Keychain.swift +++ b/Riot/Managers/KeyValueStorage/Extensions/Keychain.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Managers/KeyValueStorage/KeyValueStore.swift b/Riot/Managers/KeyValueStorage/KeyValueStore.swift index e70bba8eae..ac9b1aa5ec 100644 --- a/Riot/Managers/KeyValueStorage/KeyValueStore.swift +++ b/Riot/Managers/KeyValueStorage/KeyValueStore.swift @@ -1,17 +1,9 @@ // +// Copyright 2024 New Vector Ltd. // Copyright 2020 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Managers/KeyValueStorage/KeychainStore.swift b/Riot/Managers/KeyValueStorage/KeychainStore.swift index 8f694cb54f..3c25f6dd31 100644 --- a/Riot/Managers/KeyValueStorage/KeychainStore.swift +++ b/Riot/Managers/KeyValueStorage/KeychainStore.swift @@ -1,17 +1,9 @@ // +// Copyright 2024 New Vector Ltd. // Copyright 2020 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Managers/KeyValueStorage/MemoryStore.swift b/Riot/Managers/KeyValueStorage/MemoryStore.swift index 993f0f4c73..6d255b205b 100644 --- a/Riot/Managers/KeyValueStorage/MemoryStore.swift +++ b/Riot/Managers/KeyValueStorage/MemoryStore.swift @@ -1,17 +1,9 @@ // +// Copyright 2024 New Vector Ltd. // Copyright 2020 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Managers/LocalAuthentication/LocalAuthenticationService.swift b/Riot/Managers/LocalAuthentication/LocalAuthenticationService.swift index 83b9ec2656..ab78d28742 100644 --- a/Riot/Managers/LocalAuthentication/LocalAuthenticationService.swift +++ b/Riot/Managers/LocalAuthentication/LocalAuthenticationService.swift @@ -1,17 +1,9 @@ // +// Copyright 2024 New Vector Ltd. // Copyright 2020 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Managers/Locale/LocaleProvider.swift b/Riot/Managers/Locale/LocaleProvider.swift index de5e6f746a..2a51f4ebaa 100644 --- a/Riot/Managers/Locale/LocaleProvider.swift +++ b/Riot/Managers/Locale/LocaleProvider.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Managers/Locale/LocaleProviderType.swift b/Riot/Managers/Locale/LocaleProviderType.swift index ea2d6c8478..6eadfc8919 100644 --- a/Riot/Managers/Locale/LocaleProviderType.swift +++ b/Riot/Managers/Locale/LocaleProviderType.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Managers/Logging/MatrixSDKLogger.swift b/Riot/Managers/Logging/MatrixSDKLogger.swift index 1d9f80fd1b..2596b961a2 100644 --- a/Riot/Managers/Logging/MatrixSDKLogger.swift +++ b/Riot/Managers/Logging/MatrixSDKLogger.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Managers/OnBoarding/OnBoardingManager.swift b/Riot/Managers/OnBoarding/OnBoardingManager.swift index dec2287bc8..be18e99453 100644 --- a/Riot/Managers/OnBoarding/OnBoardingManager.swift +++ b/Riot/Managers/OnBoarding/OnBoardingManager.swift @@ -1,17 +1,8 @@ /* - Copyright 2018 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2018-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Managers/PasswordStrength/PasswordStrength.swift b/Riot/Managers/PasswordStrength/PasswordStrength.swift index a9081dcbac..96a1bf4319 100644 --- a/Riot/Managers/PasswordStrength/PasswordStrength.swift +++ b/Riot/Managers/PasswordStrength/PasswordStrength.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Managers/PasswordStrength/PasswordStrengthManager.swift b/Riot/Managers/PasswordStrength/PasswordStrengthManager.swift index 8e48d6c0de..987ea5f9a4 100644 --- a/Riot/Managers/PasswordStrength/PasswordStrengthManager.swift +++ b/Riot/Managers/PasswordStrength/PasswordStrengthManager.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Managers/PushNotification/PushNotificationService.h b/Riot/Managers/PushNotification/PushNotificationService.h index 3236cfcbc3..541149e633 100644 --- a/Riot/Managers/PushNotification/PushNotificationService.h +++ b/Riot/Managers/PushNotification/PushNotificationService.h @@ -1,18 +1,10 @@ /* - Copyright 2014 OpenMarket Ltd - Copyright 2020 Vector Creations Ltd +Copyright 2024 New Vector Ltd. +Copyright 2020 Vector Creations Ltd +Copyright 2014 OpenMarket Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import diff --git a/Riot/Managers/PushNotification/PushNotificationService.m b/Riot/Managers/PushNotification/PushNotificationService.m index 89c3ac4831..d6c833ed67 100644 --- a/Riot/Managers/PushNotification/PushNotificationService.m +++ b/Riot/Managers/PushNotification/PushNotificationService.m @@ -1,18 +1,10 @@ /* - Copyright 2014 OpenMarket Ltd - Copyright 2020 Vector Creations Ltd +Copyright 2024 New Vector Ltd. +Copyright 2020 Vector Creations Ltd +Copyright 2014 OpenMarket Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "PushNotificationService.h" diff --git a/Riot/Managers/PushNotification/PushNotificationStore.swift b/Riot/Managers/PushNotification/PushNotificationStore.swift index 2c54faf7c0..71f5b50775 100644 --- a/Riot/Managers/PushNotification/PushNotificationStore.swift +++ b/Riot/Managers/PushNotification/PushNotificationStore.swift @@ -1,17 +1,9 @@ // +// Copyright 2024 New Vector Ltd. // Copyright 2020 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Managers/PushRulesUpdater/PushRulesUpdater.swift b/Riot/Managers/PushRulesUpdater/PushRulesUpdater.swift index a0ffea92f0..774dd61dc2 100644 --- a/Riot/Managers/PushRulesUpdater/PushRulesUpdater.swift +++ b/Riot/Managers/PushRulesUpdater/PushRulesUpdater.swift @@ -1,17 +1,8 @@ // -// Copyright 2023 New Vector Ltd +// Copyright 2023, 2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Combine diff --git a/Riot/Managers/Room/RoomIdComponents.swift b/Riot/Managers/Room/RoomIdComponents.swift index 949329ae37..02190f1364 100644 --- a/Riot/Managers/Room/RoomIdComponents.swift +++ b/Riot/Managers/Room/RoomIdComponents.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Managers/RoomMessageLinkParser/RoomMessageURLParser.swift b/Riot/Managers/RoomMessageLinkParser/RoomMessageURLParser.swift index 758cf72c6e..5efbbf1c6c 100644 --- a/Riot/Managers/RoomMessageLinkParser/RoomMessageURLParser.swift +++ b/Riot/Managers/RoomMessageLinkParser/RoomMessageURLParser.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Managers/Serialization/SerializationService.swift b/Riot/Managers/Serialization/SerializationService.swift index da083fc939..2c6a4ca7fb 100644 --- a/Riot/Managers/Serialization/SerializationService.swift +++ b/Riot/Managers/Serialization/SerializationService.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Managers/Serialization/SerializationServiceType.swift b/Riot/Managers/Serialization/SerializationServiceType.swift index f9911e9401..b7ca5b9a00 100644 --- a/Riot/Managers/Serialization/SerializationServiceType.swift +++ b/Riot/Managers/Serialization/SerializationServiceType.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Managers/Settings/RiotSettings+Publisher.swift b/Riot/Managers/Settings/RiotSettings+Publisher.swift index cd37da82eb..fcfe19b344 100644 --- a/Riot/Managers/Settings/RiotSettings+Publisher.swift +++ b/Riot/Managers/Settings/RiotSettings+Publisher.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Managers/Settings/RiotSettings.swift b/Riot/Managers/Settings/RiotSettings.swift index c2755d9561..8c17284156 100644 --- a/Riot/Managers/Settings/RiotSettings.swift +++ b/Riot/Managers/Settings/RiotSettings.swift @@ -1,17 +1,8 @@ /* - Copyright 2018 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2018-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Managers/Settings/Shared/JSONModels/RiotSettingAllowedWidgets.swift b/Riot/Managers/Settings/Shared/JSONModels/RiotSettingAllowedWidgets.swift index a63624edab..682af99068 100644 --- a/Riot/Managers/Settings/Shared/JSONModels/RiotSettingAllowedWidgets.swift +++ b/Riot/Managers/Settings/Shared/JSONModels/RiotSettingAllowedWidgets.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd +Copyright 2019-2024 New Vector Ltd. - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Managers/Settings/Shared/JSONModels/RiotSettingIntegrationProvisioning.swift b/Riot/Managers/Settings/Shared/JSONModels/RiotSettingIntegrationProvisioning.swift index 4c707a6b28..8b284e90b7 100644 --- a/Riot/Managers/Settings/Shared/JSONModels/RiotSettingIntegrationProvisioning.swift +++ b/Riot/Managers/Settings/Shared/JSONModels/RiotSettingIntegrationProvisioning.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd +Copyright 2019-2024 New Vector Ltd. - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Managers/Settings/Shared/RiotSharedSettings.swift b/Riot/Managers/Settings/Shared/RiotSharedSettings.swift index df70ad310a..6e7a225297 100644 --- a/Riot/Managers/Settings/Shared/RiotSharedSettings.swift +++ b/Riot/Managers/Settings/Shared/RiotSharedSettings.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd +Copyright 2019-2024 New Vector Ltd. - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Managers/Theme/Themable.swift b/Riot/Managers/Theme/Themable.swift index 71931bfe81..e0cb8cf5c8 100644 --- a/Riot/Managers/Theme/Themable.swift +++ b/Riot/Managers/Theme/Themable.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd +Copyright 2019-2024 New Vector Ltd. - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Managers/Theme/Theme.swift b/Riot/Managers/Theme/Theme.swift index 66269ec73f..b32a86e302 100644 --- a/Riot/Managers/Theme/Theme.swift +++ b/Riot/Managers/Theme/Theme.swift @@ -1,17 +1,8 @@ /* - Copyright 2018 New Vector Ltd +Copyright 2018-2024 New Vector Ltd. - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import UIKit diff --git a/Riot/Managers/Theme/ThemeIdentifier.swift b/Riot/Managers/Theme/ThemeIdentifier.swift index 76b19e57da..afa8c70555 100644 --- a/Riot/Managers/Theme/ThemeIdentifier.swift +++ b/Riot/Managers/Theme/ThemeIdentifier.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Managers/Theme/ThemeService.h b/Riot/Managers/Theme/ThemeService.h index 24e01f82f1..ccae76f78b 100644 --- a/Riot/Managers/Theme/ThemeService.h +++ b/Riot/Managers/Theme/ThemeService.h @@ -1,19 +1,10 @@ /* - Copyright 2015 OpenMarket Ltd - Copyright 2017 Vector Creations Ltd - Copyright 2019 New Vector Ltd +Copyright 2019-2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd +Copyright 2015 OpenMarket Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import diff --git a/Riot/Managers/Theme/ThemeService.m b/Riot/Managers/Theme/ThemeService.m index 9d544ddce7..273fd7a3aa 100644 --- a/Riot/Managers/Theme/ThemeService.m +++ b/Riot/Managers/Theme/ThemeService.m @@ -1,19 +1,10 @@ /* - Copyright 2016 OpenMarket Ltd - Copyright 2017 Vector Creations Ltd - Copyright 2019 New Vector Ltd +Copyright 2019-2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd +Copyright 2016 OpenMarket Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "ThemeService.h" diff --git a/Riot/Managers/Theme/ThemeService.swift b/Riot/Managers/Theme/ThemeService.swift index 3ce421d019..c8a90b7b77 100644 --- a/Riot/Managers/Theme/ThemeService.swift +++ b/Riot/Managers/Theme/ThemeService.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Managers/Theme/Themes/BlackTheme.swift b/Riot/Managers/Theme/Themes/BlackTheme.swift index c059642366..44c3904e5c 100644 --- a/Riot/Managers/Theme/Themes/BlackTheme.swift +++ b/Riot/Managers/Theme/Themes/BlackTheme.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd +Copyright 2019-2024 New Vector Ltd. - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import UIKit diff --git a/Riot/Managers/Theme/Themes/DarkTheme.swift b/Riot/Managers/Theme/Themes/DarkTheme.swift index 608aa0f147..b8cf96a2ce 100644 --- a/Riot/Managers/Theme/Themes/DarkTheme.swift +++ b/Riot/Managers/Theme/Themes/DarkTheme.swift @@ -1,17 +1,8 @@ /* - Copyright 2018 New Vector Ltd +Copyright 2018-2024 New Vector Ltd. - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Managers/Theme/Themes/DefaultTheme.swift b/Riot/Managers/Theme/Themes/DefaultTheme.swift index 1398e2a44e..0c3fa566b9 100644 --- a/Riot/Managers/Theme/Themes/DefaultTheme.swift +++ b/Riot/Managers/Theme/Themes/DefaultTheme.swift @@ -1,17 +1,8 @@ /* - Copyright 2018 New Vector Ltd +Copyright 2018-2024 New Vector Ltd. - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Managers/UISIAutoReporter/UISIAutoReporter.swift b/Riot/Managers/UISIAutoReporter/UISIAutoReporter.swift index f8cb8ddaf4..0cf0a82ea6 100644 --- a/Riot/Managers/UISIAutoReporter/UISIAutoReporter.swift +++ b/Riot/Managers/UISIAutoReporter/UISIAutoReporter.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Managers/UISIAutoReporter/UISIDetector.swift b/Riot/Managers/UISIAutoReporter/UISIDetector.swift index 5a701230f7..451000929f 100644 --- a/Riot/Managers/UISIAutoReporter/UISIDetector.swift +++ b/Riot/Managers/UISIAutoReporter/UISIDetector.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import MatrixSDK diff --git a/Riot/Managers/URLPreviews/Core Data/URLPreviewDataMO.swift b/Riot/Managers/URLPreviews/Core Data/URLPreviewDataMO.swift index 31b18c5c5d..14cf64019c 100644 --- a/Riot/Managers/URLPreviews/Core Data/URLPreviewDataMO.swift +++ b/Riot/Managers/URLPreviews/Core Data/URLPreviewDataMO.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import CoreData diff --git a/Riot/Managers/URLPreviews/Core Data/URLPreviewImageTransformer.swift b/Riot/Managers/URLPreviews/Core Data/URLPreviewImageTransformer.swift index 565cc96e98..2b849d915a 100644 --- a/Riot/Managers/URLPreviews/Core Data/URLPreviewImageTransformer.swift +++ b/Riot/Managers/URLPreviews/Core Data/URLPreviewImageTransformer.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import CoreData diff --git a/Riot/Managers/URLPreviews/Core Data/URLPreviewStore.swift b/Riot/Managers/URLPreviews/Core Data/URLPreviewStore.swift index 0ead80e80e..102d7366af 100644 --- a/Riot/Managers/URLPreviews/Core Data/URLPreviewStore.swift +++ b/Riot/Managers/URLPreviews/Core Data/URLPreviewStore.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import CoreData diff --git a/Riot/Managers/URLPreviews/Core Data/URLPreviewUserDataMO.swift b/Riot/Managers/URLPreviews/Core Data/URLPreviewUserDataMO.swift index 6b1aa34011..bbd1510bf4 100644 --- a/Riot/Managers/URLPreviews/Core Data/URLPreviewUserDataMO.swift +++ b/Riot/Managers/URLPreviews/Core Data/URLPreviewUserDataMO.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import CoreData diff --git a/Riot/Managers/URLPreviews/URLPreviewData.swift b/Riot/Managers/URLPreviews/URLPreviewData.swift index 856eb43f99..c338d38ef1 100644 --- a/Riot/Managers/URLPreviews/URLPreviewData.swift +++ b/Riot/Managers/URLPreviews/URLPreviewData.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Managers/URLPreviews/URLPreviewService.swift b/Riot/Managers/URLPreviews/URLPreviewService.swift index 6c51c54565..e368418187 100644 --- a/Riot/Managers/URLPreviews/URLPreviewService.swift +++ b/Riot/Managers/URLPreviews/URLPreviewService.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Managers/UserSessions/UserSession.swift b/Riot/Managers/UserSessions/UserSession.swift index 8795812e6a..7115781028 100644 --- a/Riot/Managers/UserSessions/UserSession.swift +++ b/Riot/Managers/UserSessions/UserSession.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Managers/UserSessions/UserSessionProperties.swift b/Riot/Managers/UserSessions/UserSessionProperties.swift index 3cbc03403b..98633dc9c3 100644 --- a/Riot/Managers/UserSessions/UserSessionProperties.swift +++ b/Riot/Managers/UserSessions/UserSessionProperties.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Managers/UserSessions/UserSessionsService.swift b/Riot/Managers/UserSessions/UserSessionsService.swift index c944971614..2171f02392 100644 --- a/Riot/Managers/UserSessions/UserSessionsService.swift +++ b/Riot/Managers/UserSessions/UserSessionsService.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Managers/Widgets/JSONModels/JitsiWidgetData.h b/Riot/Managers/Widgets/JSONModels/JitsiWidgetData.h index 902d11b893..bdccdca1e7 100644 --- a/Riot/Managers/Widgets/JSONModels/JitsiWidgetData.h +++ b/Riot/Managers/Widgets/JSONModels/JitsiWidgetData.h @@ -1,17 +1,8 @@ /* - Copyright 2020 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2020-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import diff --git a/Riot/Managers/Widgets/JSONModels/JitsiWidgetData.m b/Riot/Managers/Widgets/JSONModels/JitsiWidgetData.m index 655c483370..094172d680 100644 --- a/Riot/Managers/Widgets/JSONModels/JitsiWidgetData.m +++ b/Riot/Managers/Widgets/JSONModels/JitsiWidgetData.m @@ -1,17 +1,8 @@ /* - Copyright 2020 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2020-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "JitsiWidgetData.h" diff --git a/Riot/Managers/Widgets/Widget.h b/Riot/Managers/Widgets/Widget.h index 3146d9d730..73adad943b 100644 --- a/Riot/Managers/Widgets/Widget.h +++ b/Riot/Managers/Widgets/Widget.h @@ -1,17 +1,9 @@ /* - Copyright 2017 Vector Creations Ltd +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import diff --git a/Riot/Managers/Widgets/Widget.m b/Riot/Managers/Widgets/Widget.m index ad1acbd772..e6e3e683bc 100644 --- a/Riot/Managers/Widgets/Widget.m +++ b/Riot/Managers/Widgets/Widget.m @@ -1,18 +1,9 @@ /* - Copyright 2017 Vector Creations Ltd - Copyright 2019 New Vector Ltd +Copyright 2019-2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "Widget.h" diff --git a/Riot/Managers/Widgets/WidgetConstants.h b/Riot/Managers/Widgets/WidgetConstants.h index 6c6e4bfbf3..ef982a5c62 100644 --- a/Riot/Managers/Widgets/WidgetConstants.h +++ b/Riot/Managers/Widgets/WidgetConstants.h @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // #import diff --git a/Riot/Managers/Widgets/WidgetConstants.m b/Riot/Managers/Widgets/WidgetConstants.m index cdff6531d9..2c8eb80230 100644 --- a/Riot/Managers/Widgets/WidgetConstants.m +++ b/Riot/Managers/Widgets/WidgetConstants.m @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // #import "WidgetConstants.h" diff --git a/Riot/Managers/Widgets/WidgetManager.h b/Riot/Managers/Widgets/WidgetManager.h index 74a1901079..bd6f619c45 100644 --- a/Riot/Managers/Widgets/WidgetManager.h +++ b/Riot/Managers/Widgets/WidgetManager.h @@ -1,18 +1,9 @@ /* - Copyright 2017 Vector Creations Ltd - Copyright 2019 New Vector Ltd +Copyright 2019-2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import diff --git a/Riot/Managers/Widgets/WidgetManager.m b/Riot/Managers/Widgets/WidgetManager.m index 9060886118..9b5e47e648 100644 --- a/Riot/Managers/Widgets/WidgetManager.m +++ b/Riot/Managers/Widgets/WidgetManager.m @@ -1,18 +1,9 @@ /* - Copyright 2017 Vector Creations Ltd - Copyright 2019 New Vector Ltd +Copyright 2019-2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "WidgetManager.h" diff --git a/Riot/Managers/Widgets/WidgetManagerConfig.swift b/Riot/Managers/Widgets/WidgetManagerConfig.swift index 05b48be7df..5441d76bd4 100644 --- a/Riot/Managers/Widgets/WidgetManagerConfig.swift +++ b/Riot/Managers/Widgets/WidgetManagerConfig.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd +Copyright 2019-2024 New Vector Ltd. - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Model/Contact/Contact.h b/Riot/Model/Contact/Contact.h index 72170281d3..548a16212c 100644 --- a/Riot/Model/Contact/Contact.h +++ b/Riot/Model/Contact/Contact.h @@ -1,17 +1,9 @@ /* - Copyright 2015 OpenMarket Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2015 OpenMarket Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "MatrixKit.h" diff --git a/Riot/Model/Contact/Contact.m b/Riot/Model/Contact/Contact.m index 335995906e..1eae2543d1 100644 --- a/Riot/Model/Contact/Contact.m +++ b/Riot/Model/Contact/Contact.m @@ -1,17 +1,9 @@ /* - Copyright 2015 OpenMarket Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2015 OpenMarket Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "Contact.h" diff --git a/Riot/Model/HomeserverConfiguration/HomeserverConfiguration.swift b/Riot/Model/HomeserverConfiguration/HomeserverConfiguration.swift index 994e4fb2c6..382b2c8b10 100644 --- a/Riot/Model/HomeserverConfiguration/HomeserverConfiguration.swift +++ b/Riot/Model/HomeserverConfiguration/HomeserverConfiguration.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Model/HomeserverConfiguration/HomeserverConfigurationBuilder.swift b/Riot/Model/HomeserverConfiguration/HomeserverConfigurationBuilder.swift index bc6182faac..e1521fff74 100644 --- a/Riot/Model/HomeserverConfiguration/HomeserverConfigurationBuilder.swift +++ b/Riot/Model/HomeserverConfiguration/HomeserverConfigurationBuilder.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Model/HomeserverConfiguration/HomeserverEncryptionConfiguration.swift b/Riot/Model/HomeserverConfiguration/HomeserverEncryptionConfiguration.swift index 671756f634..ee828dd556 100644 --- a/Riot/Model/HomeserverConfiguration/HomeserverEncryptionConfiguration.swift +++ b/Riot/Model/HomeserverConfiguration/HomeserverEncryptionConfiguration.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Model/HomeserverConfiguration/HomeserverJitsiConfiguration.swift b/Riot/Model/HomeserverConfiguration/HomeserverJitsiConfiguration.swift index 16714b5dc3..9bf420628c 100644 --- a/Riot/Model/HomeserverConfiguration/HomeserverJitsiConfiguration.swift +++ b/Riot/Model/HomeserverConfiguration/HomeserverJitsiConfiguration.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Model/HomeserverConfiguration/HomeserverTileServiceConfiguration.swift b/Riot/Model/HomeserverConfiguration/HomeserverTileServiceConfiguration.swift index 2e3d8cd448..ea9442c7c0 100644 --- a/Riot/Model/HomeserverConfiguration/HomeserverTileServiceConfiguration.swift +++ b/Riot/Model/HomeserverConfiguration/HomeserverTileServiceConfiguration.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Model/Room/RoomEmailInvitation.h b/Riot/Model/Room/RoomEmailInvitation.h index 813fc29ec5..4233472433 100644 --- a/Riot/Model/Room/RoomEmailInvitation.h +++ b/Riot/Model/Room/RoomEmailInvitation.h @@ -1,17 +1,9 @@ /* - Copyright 2016 OpenMarket Ltd +Copyright 2024 New Vector Ltd. +Copyright 2016 OpenMarket Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import diff --git a/Riot/Model/Room/RoomEmailInvitation.m b/Riot/Model/Room/RoomEmailInvitation.m index 3ba66b0d29..d796f1887b 100644 --- a/Riot/Model/Room/RoomEmailInvitation.m +++ b/Riot/Model/Room/RoomEmailInvitation.m @@ -1,17 +1,9 @@ /* - Copyright 2016 OpenMarket Ltd +Copyright 2024 New Vector Ltd. +Copyright 2016 OpenMarket Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "RoomEmailInvitation.h" diff --git a/Riot/Model/Room/RoomPowerLevel.swift b/Riot/Model/Room/RoomPowerLevel.swift index 38d6d1d900..b008801b2c 100644 --- a/Riot/Model/Room/RoomPowerLevel.swift +++ b/Riot/Model/Room/RoomPowerLevel.swift @@ -1,17 +1,8 @@ /* - Copyright 2020 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2020-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Model/Room/RoomPreviewData.h b/Riot/Model/Room/RoomPreviewData.h index ac43e491d8..32d0d657ce 100644 --- a/Riot/Model/Room/RoomPreviewData.h +++ b/Riot/Model/Room/RoomPreviewData.h @@ -1,17 +1,9 @@ /* - Copyright 2016 OpenMarket Ltd +Copyright 2024 New Vector Ltd. +Copyright 2016 OpenMarket Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import diff --git a/Riot/Model/Room/RoomPreviewData.m b/Riot/Model/Room/RoomPreviewData.m index c37f2dcdc3..2dd108ed6b 100644 --- a/Riot/Model/Room/RoomPreviewData.m +++ b/Riot/Model/Room/RoomPreviewData.m @@ -1,18 +1,10 @@ /* - Copyright 2016 OpenMarket Ltd - Copyright 2017 Vector Creations Ltd +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd +Copyright 2016 OpenMarket Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "RoomPreviewData.h" diff --git a/Riot/Model/WellKnown/VectorWellKnown.swift b/Riot/Model/WellKnown/VectorWellKnown.swift index 356fbdde8c..1745bceb0f 100644 --- a/Riot/Model/WellKnown/VectorWellKnown.swift +++ b/Riot/Model/WellKnown/VectorWellKnown.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Model/WellKnown/VectorWellKnownBackupSetupMethod.swift b/Riot/Model/WellKnown/VectorWellKnownBackupSetupMethod.swift index a5a241c91b..a11aa174bc 100644 --- a/Riot/Model/WellKnown/VectorWellKnownBackupSetupMethod.swift +++ b/Riot/Model/WellKnown/VectorWellKnownBackupSetupMethod.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Model/WellKnown/VectorWellKnownParser.swift b/Riot/Model/WellKnown/VectorWellKnownParser.swift index 4a2d420e12..9243af07ea 100644 --- a/Riot/Model/WellKnown/VectorWellKnownParser.swift +++ b/Riot/Model/WellKnown/VectorWellKnownParser.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Analytics/Analytics.swift b/Riot/Modules/Analytics/Analytics.swift index 22343098c8..e045aae894 100644 --- a/Riot/Modules/Analytics/Analytics.swift +++ b/Riot/Modules/Analytics/Analytics.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import AnalyticsEvents diff --git a/Riot/Modules/Analytics/AnalyticsClientProtocol.swift b/Riot/Modules/Analytics/AnalyticsClientProtocol.swift index cfc90fadbc..8139640aeb 100644 --- a/Riot/Modules/Analytics/AnalyticsClientProtocol.swift +++ b/Riot/Modules/Analytics/AnalyticsClientProtocol.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import AnalyticsEvents diff --git a/Riot/Modules/Analytics/AnalyticsJoinedRoomTrigger.swift b/Riot/Modules/Analytics/AnalyticsJoinedRoomTrigger.swift index aecfef406f..7ae0452199 100644 --- a/Riot/Modules/Analytics/AnalyticsJoinedRoomTrigger.swift +++ b/Riot/Modules/Analytics/AnalyticsJoinedRoomTrigger.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Analytics/AnalyticsScreen.swift b/Riot/Modules/Analytics/AnalyticsScreen.swift index 4c207a3aea..c4e6b418d8 100644 --- a/Riot/Modules/Analytics/AnalyticsScreen.swift +++ b/Riot/Modules/Analytics/AnalyticsScreen.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Analytics/AnalyticsScreenTimer.swift b/Riot/Modules/Analytics/AnalyticsScreenTimer.swift index 5c704f8d82..526de03d08 100644 --- a/Riot/Modules/Analytics/AnalyticsScreenTimer.swift +++ b/Riot/Modules/Analytics/AnalyticsScreenTimer.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import UIKit diff --git a/Riot/Modules/Analytics/AnalyticsScreenTracker.swift b/Riot/Modules/Analytics/AnalyticsScreenTracker.swift index 25a423dc74..932d2613ed 100644 --- a/Riot/Modules/Analytics/AnalyticsScreenTracker.swift +++ b/Riot/Modules/Analytics/AnalyticsScreenTracker.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Analytics/AnalyticsService.swift b/Riot/Modules/Analytics/AnalyticsService.swift index bf24edfd15..c7f84f3cb2 100644 --- a/Riot/Modules/Analytics/AnalyticsService.swift +++ b/Riot/Modules/Analytics/AnalyticsService.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Analytics/AnalyticsSettings.swift b/Riot/Modules/Analytics/AnalyticsSettings.swift index e847f0668c..f4b8cb2617 100644 --- a/Riot/Modules/Analytics/AnalyticsSettings.swift +++ b/Riot/Modules/Analytics/AnalyticsSettings.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Analytics/AnalyticsSpaceTracker.swift b/Riot/Modules/Analytics/AnalyticsSpaceTracker.swift index 85aad36b7e..00dfdcbfdc 100644 --- a/Riot/Modules/Analytics/AnalyticsSpaceTracker.swift +++ b/Riot/Modules/Analytics/AnalyticsSpaceTracker.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Analytics/AnalyticsUIElement.swift b/Riot/Modules/Analytics/AnalyticsUIElement.swift index 3374a5ce22..fb00c3d81e 100644 --- a/Riot/Modules/Analytics/AnalyticsUIElement.swift +++ b/Riot/Modules/Analytics/AnalyticsUIElement.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import AnalyticsEvents diff --git a/Riot/Modules/Analytics/AnalyticsViewRoomActiveSpace.swift b/Riot/Modules/Analytics/AnalyticsViewRoomActiveSpace.swift index 20f541a15a..4e6cf4aedc 100644 --- a/Riot/Modules/Analytics/AnalyticsViewRoomActiveSpace.swift +++ b/Riot/Modules/Analytics/AnalyticsViewRoomActiveSpace.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Analytics/AnalyticsViewRoomTrigger.swift b/Riot/Modules/Analytics/AnalyticsViewRoomTrigger.swift index eba8c90cce..acb77fb173 100644 --- a/Riot/Modules/Analytics/AnalyticsViewRoomTrigger.swift +++ b/Riot/Modules/Analytics/AnalyticsViewRoomTrigger.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Analytics/DecryptionFailure+Analytics.swift b/Riot/Modules/Analytics/DecryptionFailure+Analytics.swift index 119366a665..0b9e0a77c7 100644 --- a/Riot/Modules/Analytics/DecryptionFailure+Analytics.swift +++ b/Riot/Modules/Analytics/DecryptionFailure+Analytics.swift @@ -1,17 +1,8 @@ // -// Copyright 2024 New Vector Ltd +// Copyright 2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Analytics/DecryptionFailure.swift b/Riot/Modules/Analytics/DecryptionFailure.swift index 179509087e..f3cd32d451 100644 --- a/Riot/Modules/Analytics/DecryptionFailure.swift +++ b/Riot/Modules/Analytics/DecryptionFailure.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import AnalyticsEvents diff --git a/Riot/Modules/Analytics/DecryptionFailureTracker.swift b/Riot/Modules/Analytics/DecryptionFailureTracker.swift index d76a38ca59..001ab36b5d 100644 --- a/Riot/Modules/Analytics/DecryptionFailureTracker.swift +++ b/Riot/Modules/Analytics/DecryptionFailureTracker.swift @@ -1,17 +1,8 @@ // -// Copyright 2024 New Vector Ltd +// Copyright 2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Analytics/Helpers/AllChatsActiveFilter+Analytics.swift b/Riot/Modules/Analytics/Helpers/AllChatsActiveFilter+Analytics.swift index f2519f6793..66d43b7385 100644 --- a/Riot/Modules/Analytics/Helpers/AllChatsActiveFilter+Analytics.swift +++ b/Riot/Modules/Analytics/Helpers/AllChatsActiveFilter+Analytics.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Analytics/Helpers/JoinedRoomSize+MemberCount.swift b/Riot/Modules/Analytics/Helpers/JoinedRoomSize+MemberCount.swift index d5473d5f92..1013799b58 100644 --- a/Riot/Modules/Analytics/Helpers/JoinedRoomSize+MemberCount.swift +++ b/Riot/Modules/Analytics/Helpers/JoinedRoomSize+MemberCount.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import AnalyticsEvents diff --git a/Riot/Modules/Analytics/Helpers/MXCallHangupReason+Analytics.swift b/Riot/Modules/Analytics/Helpers/MXCallHangupReason+Analytics.swift index c60f354466..037b9be5d3 100644 --- a/Riot/Modules/Analytics/Helpers/MXCallHangupReason+Analytics.swift +++ b/Riot/Modules/Analytics/Helpers/MXCallHangupReason+Analytics.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import AnalyticsEvents diff --git a/Riot/Modules/Analytics/Helpers/MXTaskProfileName+Analytics.swift b/Riot/Modules/Analytics/Helpers/MXTaskProfileName+Analytics.swift index 99f89174e4..41a39a277b 100644 --- a/Riot/Modules/Analytics/Helpers/MXTaskProfileName+Analytics.swift +++ b/Riot/Modules/Analytics/Helpers/MXTaskProfileName+Analytics.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import AnalyticsEvents diff --git a/Riot/Modules/Analytics/Helpers/UserSessionPropertiesUseCase+Analytics.swift b/Riot/Modules/Analytics/Helpers/UserSessionPropertiesUseCase+Analytics.swift index c5e601b37a..104bd50c3e 100644 --- a/Riot/Modules/Analytics/Helpers/UserSessionPropertiesUseCase+Analytics.swift +++ b/Riot/Modules/Analytics/Helpers/UserSessionPropertiesUseCase+Analytics.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Analytics/PHGPostHogConfiguration.swift b/Riot/Modules/Analytics/PHGPostHogConfiguration.swift index 875de74e48..f63ca7bddd 100644 --- a/Riot/Modules/Analytics/PHGPostHogConfiguration.swift +++ b/Riot/Modules/Analytics/PHGPostHogConfiguration.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import PostHog diff --git a/Riot/Modules/Analytics/PostHogAnalyticsClient.swift b/Riot/Modules/Analytics/PostHogAnalyticsClient.swift index 5a70c58373..b677f3fd09 100644 --- a/Riot/Modules/Analytics/PostHogAnalyticsClient.swift +++ b/Riot/Modules/Analytics/PostHogAnalyticsClient.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import PostHog diff --git a/Riot/Modules/Analytics/PosthogProtocol.swift b/Riot/Modules/Analytics/PosthogProtocol.swift index d24d19e170..55aa04347e 100644 --- a/Riot/Modules/Analytics/PosthogProtocol.swift +++ b/Riot/Modules/Analytics/PosthogProtocol.swift @@ -1,17 +1,8 @@ // -// Copyright 2024 New Vector Ltd +// Copyright 2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Analytics/SentryMonitoringClient.swift b/Riot/Modules/Analytics/SentryMonitoringClient.swift index 54933a7ab3..44468730e8 100644 --- a/Riot/Modules/Analytics/SentryMonitoringClient.swift +++ b/Riot/Modules/Analytics/SentryMonitoringClient.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Application/AppCoordinator.swift b/Riot/Modules/Application/AppCoordinator.swift index e55874016c..5d1bb6fdde 100755 --- a/Riot/Modules/Application/AppCoordinator.swift +++ b/Riot/Modules/Application/AppCoordinator.swift @@ -1,17 +1,8 @@ /* - Copyright 2020 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2020-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Combine diff --git a/Riot/Modules/Application/AppCoordinatorType.swift b/Riot/Modules/Application/AppCoordinatorType.swift index 7d9c563f6e..e201bb61af 100644 --- a/Riot/Modules/Application/AppCoordinatorType.swift +++ b/Riot/Modules/Application/AppCoordinatorType.swift @@ -1,17 +1,8 @@ /* - Copyright 2020 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2020-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Modules/Application/AppDelegate.swift b/Riot/Modules/Application/AppDelegate.swift index 9700e8bd65..25a03f8c47 100644 --- a/Riot/Modules/Application/AppDelegate.swift +++ b/Riot/Modules/Application/AppDelegate.swift @@ -1,17 +1,9 @@ // +// Copyright 2024 New Vector Ltd. // Copyright 2020 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import UIKit diff --git a/Riot/Modules/Application/AppNavigator.swift b/Riot/Modules/Application/AppNavigator.swift index 13404e62dd..0eeafb9bdb 100644 --- a/Riot/Modules/Application/AppNavigator.swift +++ b/Riot/Modules/Application/AppNavigator.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Application/AppNavigatorDestination.swift b/Riot/Modules/Application/AppNavigatorDestination.swift index 06c90a8112..7682cf202b 100644 --- a/Riot/Modules/Application/AppNavigatorDestination.swift +++ b/Riot/Modules/Application/AppNavigatorDestination.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Application/LegacyAppDelegate.h b/Riot/Modules/Application/LegacyAppDelegate.h index 2421e029b4..0fd0d7e0b5 100644 --- a/Riot/Modules/Application/LegacyAppDelegate.h +++ b/Riot/Modules/Application/LegacyAppDelegate.h @@ -1,18 +1,10 @@ /* - Copyright 2014 OpenMarket Ltd - Copyright 2017 Vector Creations Ltd +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd +Copyright 2014 OpenMarket Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import diff --git a/Riot/Modules/Application/LegacyAppDelegate.m b/Riot/Modules/Application/LegacyAppDelegate.m index ae34bcb445..2bfd6e919c 100644 --- a/Riot/Modules/Application/LegacyAppDelegate.m +++ b/Riot/Modules/Application/LegacyAppDelegate.m @@ -1,19 +1,10 @@ /* - Copyright 2014 OpenMarket Ltd - Copyright 2017 Vector Creations Ltd - Copyright 2018 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2018-2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd +Copyright 2014 OpenMarket Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "LegacyAppDelegate.h" @@ -2463,13 +2454,6 @@ - (void)handleAppState case MXSessionStateSyncInProgress: // Stay in launching during the first server sync if the store is empty. isLaunching = (mainSession.rooms.count == 0 && launchAnimationContainerView); -// Tchap: Disable Cross Signing Managment. -#ifdef CROSS_SIGNING - if (mainSession.crypto.crossSigning && mainSession.crypto.crossSigning.state == MXCrossSigningStateCrossSigningExists && [mainSession.crypto isKindOfClass:[MXLegacyCrypto class]]) - { - [(MXLegacyCrypto *)mainSession.crypto setOutgoingKeyRequestsEnabled:NO onComplete:nil]; - } -#endif break; case MXSessionStateRunning: self.clearingCache = NO; diff --git a/Riot/Modules/Application/ScreenNavigation/RoomNavigationParameters.swift b/Riot/Modules/Application/ScreenNavigation/RoomNavigationParameters.swift index 7a870b56cb..3f40db2e3c 100644 --- a/Riot/Modules/Application/ScreenNavigation/RoomNavigationParameters.swift +++ b/Riot/Modules/Application/ScreenNavigation/RoomNavigationParameters.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Application/ScreenNavigation/RoomPreviewNavigationParameters.swift b/Riot/Modules/Application/ScreenNavigation/RoomPreviewNavigationParameters.swift index 3a9532c020..24c13c07b7 100644 --- a/Riot/Modules/Application/ScreenNavigation/RoomPreviewNavigationParameters.swift +++ b/Riot/Modules/Application/ScreenNavigation/RoomPreviewNavigationParameters.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Application/ScreenNavigation/ScreenPresentationParameters.swift b/Riot/Modules/Application/ScreenNavigation/ScreenPresentationParameters.swift index 6b7666eb7f..334a4e7659 100644 --- a/Riot/Modules/Application/ScreenNavigation/ScreenPresentationParameters.swift +++ b/Riot/Modules/Application/ScreenNavigation/ScreenPresentationParameters.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Application/ScreenNavigation/SpaceNavigationParameters.swift b/Riot/Modules/Application/ScreenNavigation/SpaceNavigationParameters.swift index f335e56bf4..c573a32554 100644 --- a/Riot/Modules/Application/ScreenNavigation/SpaceNavigationParameters.swift +++ b/Riot/Modules/Application/ScreenNavigation/SpaceNavigationParameters.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Application/ScreenNavigation/SpacePreviewNavigationParameters.swift b/Riot/Modules/Application/ScreenNavigation/SpacePreviewNavigationParameters.swift index fdf66cfec7..54cefadf5f 100644 --- a/Riot/Modules/Application/ScreenNavigation/SpacePreviewNavigationParameters.swift +++ b/Riot/Modules/Application/ScreenNavigation/SpacePreviewNavigationParameters.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Authentication/AuthenticationCoordinator.swift b/Riot/Modules/Authentication/AuthenticationCoordinator.swift index 295a591f73..5353a8d238 100644 --- a/Riot/Modules/Authentication/AuthenticationCoordinator.swift +++ b/Riot/Modules/Authentication/AuthenticationCoordinator.swift @@ -32,7 +32,9 @@ final class AuthenticationCoordinator: NSObject, AuthenticationCoordinatorProtoc enum EntryPoint { case registration - case login + // Tchap: allow override home server's preferred login mode +// case login + case login(LoginMode? = nil) } // MARK: - Properties @@ -88,9 +90,17 @@ final class AuthenticationCoordinator: NSObject, AuthenticationCoordinatorProtoc // MARK: - Public + // Tchap: allow override home server's preferred login mode func start() { + start(forcedAuthenticationMode: nil) + } + + // Tchap: allow override home server's preferred login mode + func start(forcedAuthenticationMode: LoginMode? = nil) { Task { @MainActor in - await startAuthenticationFlow() + // Tchap: allow override home server's preferred login mode +// await startAuthenticationFlow() + await startAuthenticationFlow(forcedAuthenticationMode: forcedAuthenticationMode) callback?(.didStart) authenticationService.delegate = self } @@ -114,7 +124,9 @@ final class AuthenticationCoordinator: NSObject, AuthenticationCoordinatorProtoc // MARK: - Private /// Starts the authentication flow. - @MainActor private func startAuthenticationFlow() async { + // Tchap: allow override home server's preferred login mode +// @MainActor private func startAuthenticationFlow() async { + @MainActor private func startAuthenticationFlow(forcedAuthenticationMode: LoginMode? = nil) async { if let softLogoutCredentials = authenticationService.softLogoutCredentials, let homeserverAddress = softLogoutCredentials.homeServer { do { @@ -129,7 +141,15 @@ final class AuthenticationCoordinator: NSObject, AuthenticationCoordinatorProtoc return } - let flow: AuthenticationFlow = initialScreen == .login ? .login : .register + // Tchap: allow override home server's preferred login mode + // let flow: AuthenticationFlow = initialScreen == .login ? .login : .register + let flow: AuthenticationFlow = { + if case .login(_) = initialScreen { + return .login + } else { + return .register + } + }() // Check if the user must select a server if BuildSettings.forceHomeserverSelection, authenticationService.provisioningLink?.homeserverUrl == nil { @@ -137,27 +157,32 @@ final class AuthenticationCoordinator: NSObject, AuthenticationCoordinatorProtoc return } - do { - // Start the flow (if homeserverAddress is nil, the default server will be used). - try await authenticationService.startFlow(flow) - } catch { - MXLog.error("[AuthenticationCoordinator] start: Failed to start, showing server selection.") - showServerSelectionScreen(for: flow) - return - } + // Tchap: Don't use default home server +// do { +// // Start the flow (if homeserverAddress is nil, the default server will be used). +// try await authenticationService.startFlow(flow) +// } catch { +// MXLog.error("[AuthenticationCoordinator] start: Failed to start, showing server selection.") +// showServerSelectionScreen(for: flow) +// return +// } switch initialScreen { case .registration: if authenticationService.state.homeserver.needsRegistrationFallback { showFallback(for: flow) } else { - showRegistrationScreen() + // Tchap: force email registration mode +// showRegistrationScreen() + await TchapShowVerifyEmailScreen() } case .login: if authenticationService.state.homeserver.needsLoginFallback { showFallback(for: flow) } else { - showLoginScreen() + // Tchap: allow override home server's preferred login mode +// showLoginScreen() + showLoginScreen(forcedAuthenticationMode: forcedAuthenticationMode) } } } @@ -260,13 +285,17 @@ final class AuthenticationCoordinator: NSObject, AuthenticationCoordinatorProtoc // MARK: - Login /// Shows the login screen. - @MainActor private func showLoginScreen() { + // Tchap: allow override home server's preferred login mode +// @MainActor private func showLoginScreen() { + @MainActor private func showLoginScreen(forcedAuthenticationMode: LoginMode? = nil) { MXLog.debug("[AuthenticationCoordinator] showLoginScreen") let homeserver = authenticationService.state.homeserver let parameters = AuthenticationLoginCoordinatorParameters(navigationRouter: navigationRouter, authenticationService: authenticationService, - loginMode: homeserver.preferredLoginMode) + // Tchap: allow override home server's preferred login mode + // loginMode: homeserver.preferredLoginMode) + loginMode: forcedAuthenticationMode ?? homeserver.preferredLoginMode) let coordinator = AuthenticationLoginCoordinator(parameters: parameters) coordinator.callback = { [weak self, weak coordinator] result in guard let self = self, let coordinator = coordinator else { return } @@ -298,8 +327,8 @@ final class AuthenticationCoordinator: NSObject, AuthenticationCoordinatorProtoc let store = MXFileStore(credentials: credentials) let userDisplayName = await store.displayName(ofUserWithId: userId) ?? "" - let cryptoStore = MXRealmCryptoStore(credentials: credentials) - let keyBackupNeeded = (cryptoStore?.inboundGroupSessions(toBackup: 1) ?? []).count > 0 + // The backup is now handled by Rust + let keyBackupNeeded = false let softLogoutCredentials = SoftLogoutCredentials(userId: userId, homeserverName: credentials.homeServerName() ?? "", @@ -379,6 +408,41 @@ final class AuthenticationCoordinator: NSObject, AuthenticationCoordinatorProtoc } } + // Tchap: start Registration with VerifyEmail screen + /// Shows the login screen. + @MainActor private func TchapShowVerifyEmailScreen() async { + MXLog.debug("[AuthenticationCoordinator] TchapShowVerifyEmailScreen") + + // Call `startFlow` here to get `registrationWizard` initialized. + try? await authenticationService.startFlow(.register) + + guard let registrationWizard = authenticationService.registrationWizard else { + MXLog.failure("[AuthenticationCoordinator] showStage: Missing the RegistrationWizard needed to complete the stage.") + displayError(message: VectorL10n.errorCommonMessage) + return + } + let homeserver = authenticationService.state.homeserver + + let parameters = AuthenticationVerifyEmailCoordinatorParameters(registrationWizard: registrationWizard, + homeserver: authenticationService.state.homeserver) + let coordinator = AuthenticationVerifyEmailCoordinator(parameters: parameters) + coordinator.callback = { [weak self] result in + self?.registrationStageDidComplete(with: result) + } + + coordinator.start() + add(childCoordinator: coordinator) + + if navigationRouter.modules.isEmpty { + navigationRouter.setRootModule(coordinator, popCompletion: nil) + } else { + navigationRouter.push(coordinator, animated: true) { [weak self] in + self?.remove(childCoordinator: coordinator) + } + } + } + + /// Displays the next view in the flow based on the result from the registration screen. @MainActor private func registrationCoordinator(_ coordinator: AuthenticationRegistrationCoordinator, didCallbackWith result: AuthenticationRegistrationCoordinatorResult) { diff --git a/Riot/Modules/Authentication/AuthenticationType+Analytics.swift b/Riot/Modules/Authentication/AuthenticationType+Analytics.swift index c54cca2e76..12bd0d1968 100644 --- a/Riot/Modules/Authentication/AuthenticationType+Analytics.swift +++ b/Riot/Modules/Authentication/AuthenticationType+Analytics.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import AnalyticsEvents diff --git a/Riot/Modules/Authentication/Legacy/AuthenticationViewController.h b/Riot/Modules/Authentication/Legacy/AuthenticationViewController.h index a8ed741122..41e94ef095 100644 --- a/Riot/Modules/Authentication/Legacy/AuthenticationViewController.h +++ b/Riot/Modules/Authentication/Legacy/AuthenticationViewController.h @@ -1,19 +1,10 @@ /* - Copyright 2015 OpenMarket Ltd - Copyright 2017 Vector Creations Ltd - Copyright 2020 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2020-2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd +Copyright 2015 OpenMarket Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "MatrixKit.h" diff --git a/Riot/Modules/Authentication/Legacy/AuthenticationViewController.m b/Riot/Modules/Authentication/Legacy/AuthenticationViewController.m index c0605d8131..fdf062d5dc 100644 --- a/Riot/Modules/Authentication/Legacy/AuthenticationViewController.m +++ b/Riot/Modules/Authentication/Legacy/AuthenticationViewController.m @@ -1,19 +1,10 @@ /* - Copyright 2015 OpenMarket Ltd - Copyright 2017 Vector Creations Ltd - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd +Copyright 2015 OpenMarket Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "AuthenticationViewController.h" @@ -138,10 +129,10 @@ - (void)viewDidLoad } else { - self.defaultHomeServerUrl = RiotSettings.shared.homeserverUrlString; +// self.defaultHomeServerUrl = RiotSettings.shared.homeserverUrlString; } - self.defaultIdentityServerUrl = RiotSettings.shared.identityServerUrlString; +// self.defaultIdentityServerUrl = RiotSettings.shared.identityServerUrlString; self.welcomeImageView.image = AssetSharedImages.horizontalLogo.image; diff --git a/Riot/Modules/Authentication/Legacy/SocialLogin/SocialLoginButton.swift b/Riot/Modules/Authentication/Legacy/SocialLogin/SocialLoginButton.swift index 0f5aef8e0b..772add82d8 100644 --- a/Riot/Modules/Authentication/Legacy/SocialLogin/SocialLoginButton.swift +++ b/Riot/Modules/Authentication/Legacy/SocialLogin/SocialLoginButton.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import UIKit diff --git a/Riot/Modules/Authentication/Legacy/SocialLogin/SocialLoginButtonFactory.swift b/Riot/Modules/Authentication/Legacy/SocialLogin/SocialLoginButtonFactory.swift index 21a7c5d292..608c4b713c 100644 --- a/Riot/Modules/Authentication/Legacy/SocialLogin/SocialLoginButtonFactory.swift +++ b/Riot/Modules/Authentication/Legacy/SocialLogin/SocialLoginButtonFactory.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Authentication/Legacy/SocialLogin/SocialLoginButtonStyle.swift b/Riot/Modules/Authentication/Legacy/SocialLogin/SocialLoginButtonStyle.swift index cf19b6275c..f8fec124a4 100644 --- a/Riot/Modules/Authentication/Legacy/SocialLogin/SocialLoginButtonStyle.swift +++ b/Riot/Modules/Authentication/Legacy/SocialLogin/SocialLoginButtonStyle.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Authentication/Legacy/SocialLogin/SocialLoginButtonViewData.swift b/Riot/Modules/Authentication/Legacy/SocialLogin/SocialLoginButtonViewData.swift index 5de0bd748e..014eebd63a 100644 --- a/Riot/Modules/Authentication/Legacy/SocialLogin/SocialLoginButtonViewData.swift +++ b/Riot/Modules/Authentication/Legacy/SocialLogin/SocialLoginButtonViewData.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Authentication/Legacy/SocialLogin/SocialLoginListView.swift b/Riot/Modules/Authentication/Legacy/SocialLogin/SocialLoginListView.swift index dc80526b63..184818af39 100644 --- a/Riot/Modules/Authentication/Legacy/SocialLogin/SocialLoginListView.swift +++ b/Riot/Modules/Authentication/Legacy/SocialLogin/SocialLoginListView.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import UIKit diff --git a/Riot/Modules/Authentication/Legacy/Views/AuthInputsView.h b/Riot/Modules/Authentication/Legacy/Views/AuthInputsView.h index c0090f5172..cd9d27a246 100644 --- a/Riot/Modules/Authentication/Legacy/Views/AuthInputsView.h +++ b/Riot/Modules/Authentication/Legacy/Views/AuthInputsView.h @@ -1,18 +1,10 @@ /* - Copyright 2016 OpenMarket Ltd - Copyright 2017 Vector Creations Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd +Copyright 2016 OpenMarket Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "MatrixKit.h" diff --git a/Riot/Modules/Authentication/Legacy/Views/AuthInputsView.m b/Riot/Modules/Authentication/Legacy/Views/AuthInputsView.m index 44bc8bc5fe..5a2c926e3c 100644 --- a/Riot/Modules/Authentication/Legacy/Views/AuthInputsView.m +++ b/Riot/Modules/Authentication/Legacy/Views/AuthInputsView.m @@ -1,19 +1,10 @@ /* - Copyright 2016 OpenMarket Ltd - Copyright 2017 Vector Creations Ltd - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd +Copyright 2016 OpenMarket Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "AuthInputsView.h" @@ -1042,10 +1033,8 @@ - (void)setSoftLogoutCredentials:(MXCredentials *)credentials - (void)displaySoftLogoutMessage { - // Take some shortcuts and make some assumptions (Riot uses MXFileStore and MXRealmCryptoStore) to - // retrieve data to display as quick as possible - MXRealmCryptoStore *cryptoStore = [[MXRealmCryptoStore alloc] initWithCredentials:self.softLogoutCredentials]; - BOOL keyBackupNeeded = [cryptoStore inboundGroupSessionsToBackup:1].count > 0; + // Backup is now handled by Rust + BOOL keyBackupNeeded = NO; MXFileStore *fileStore = [[MXFileStore alloc] initWithCredentials:softLogoutCredentials]; [fileStore asyncUsersWithUserIds:@[softLogoutCredentials.userId] success:^(NSArray * _Nonnull users) { diff --git a/Riot/Modules/Authentication/Legacy/Views/ForgotPasswordInputsView.h b/Riot/Modules/Authentication/Legacy/Views/ForgotPasswordInputsView.h index 7aead4034f..8406fa2e5f 100644 --- a/Riot/Modules/Authentication/Legacy/Views/ForgotPasswordInputsView.h +++ b/Riot/Modules/Authentication/Legacy/Views/ForgotPasswordInputsView.h @@ -1,17 +1,9 @@ /* - Copyright 2016 OpenMarket Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2016 OpenMarket Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "MatrixKit.h" diff --git a/Riot/Modules/Authentication/Legacy/Views/ForgotPasswordInputsView.m b/Riot/Modules/Authentication/Legacy/Views/ForgotPasswordInputsView.m index 16520db27a..a456000562 100644 --- a/Riot/Modules/Authentication/Legacy/Views/ForgotPasswordInputsView.m +++ b/Riot/Modules/Authentication/Legacy/Views/ForgotPasswordInputsView.m @@ -1,18 +1,10 @@ /* - Copyright 2016 OpenMarket Ltd - Copyright 2017 Vector Creations Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd +Copyright 2016 OpenMarket Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "ForgotPasswordInputsView.h" diff --git a/Riot/Modules/Authentication/Legacy/Views/TermsView.swift b/Riot/Modules/Authentication/Legacy/Views/TermsView.swift index 8bd34fa905..6dcc7c807e 100644 --- a/Riot/Modules/Authentication/Legacy/Views/TermsView.swift +++ b/Riot/Modules/Authentication/Legacy/Views/TermsView.swift @@ -1,17 +1,8 @@ /* - Copyright 2018 New Vector Ltd +Copyright 2018-2024 New Vector Ltd. - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Modules/Authentication/SSO/SSOAccountService.swift b/Riot/Modules/Authentication/SSO/SSOAccountService.swift index 4623fb84f8..7819acc967 100644 --- a/Riot/Modules/Authentication/SSO/SSOAccountService.swift +++ b/Riot/Modules/Authentication/SSO/SSOAccountService.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Authentication/SSO/SSOAuthenticationPresenter.swift b/Riot/Modules/Authentication/SSO/SSOAuthenticationPresenter.swift index b45f3a804b..984a3f79c8 100644 --- a/Riot/Modules/Authentication/SSO/SSOAuthenticationPresenter.swift +++ b/Riot/Modules/Authentication/SSO/SSOAuthenticationPresenter.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Authentication/SSO/SSOAuthenticationService.swift b/Riot/Modules/Authentication/SSO/SSOAuthenticationService.swift index cb3d36d075..08b91deb66 100644 --- a/Riot/Modules/Authentication/SSO/SSOAuthenticationService.swift +++ b/Riot/Modules/Authentication/SSO/SSOAuthenticationService.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Authentication/SSO/SSOAuthentificationSession.swift b/Riot/Modules/Authentication/SSO/SSOAuthentificationSession.swift index e0b6d37dd3..ab2d52224b 100644 --- a/Riot/Modules/Authentication/SSO/SSOAuthentificationSession.swift +++ b/Riot/Modules/Authentication/SSO/SSOAuthentificationSession.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Authentication/SSO/SSOAuthentificationSessionProtocol.swift b/Riot/Modules/Authentication/SSO/SSOAuthentificationSessionProtocol.swift index 219271b2b4..ebc708bd95 100644 --- a/Riot/Modules/Authentication/SSO/SSOAuthentificationSessionProtocol.swift +++ b/Riot/Modules/Authentication/SSO/SSOAuthentificationSessionProtocol.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Authentication/SSO/SSOURLConstants.swift b/Riot/Modules/Authentication/SSO/SSOURLConstants.swift index 7cc90150d9..4cd76ec040 100644 --- a/Riot/Modules/Authentication/SSO/SSOURLConstants.swift +++ b/Riot/Modules/Authentication/SSO/SSOURLConstants.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Authentication/SessionVerificationListener.swift b/Riot/Modules/Authentication/SessionVerificationListener.swift index ffefd839a2..454b4907e2 100644 --- a/Riot/Modules/Authentication/SessionVerificationListener.swift +++ b/Riot/Modules/Authentication/SessionVerificationListener.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/BadgeLabel/BadgeLabel.swift b/Riot/Modules/BadgeLabel/BadgeLabel.swift index f61f4dd6af..8a04b2327b 100644 --- a/Riot/Modules/BadgeLabel/BadgeLabel.swift +++ b/Riot/Modules/BadgeLabel/BadgeLabel.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import UIKit diff --git a/Riot/Modules/BugReport/BugReportViewController.h b/Riot/Modules/BugReport/BugReportViewController.h index d7dcd78f1b..fc682f1489 100644 --- a/Riot/Modules/BugReport/BugReportViewController.h +++ b/Riot/Modules/BugReport/BugReportViewController.h @@ -1,17 +1,9 @@ /* - Copyright 2017 Vector Creations Ltd +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import diff --git a/Riot/Modules/BugReport/BugReportViewController.m b/Riot/Modules/BugReport/BugReportViewController.m index dd3e916dbc..824227843d 100644 --- a/Riot/Modules/BugReport/BugReportViewController.m +++ b/Riot/Modules/BugReport/BugReportViewController.m @@ -1,17 +1,9 @@ /* - Copyright 2017 Vector Creations Ltd +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "BugReportViewController.h" diff --git a/Riot/Modules/Call/CallViewController.h b/Riot/Modules/Call/CallViewController.h index 1fe7837da2..fa1ba2f72a 100644 --- a/Riot/Modules/Call/CallViewController.h +++ b/Riot/Modules/Call/CallViewController.h @@ -1,17 +1,9 @@ /* - Copyright 2016 OpenMarket Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2016 OpenMarket Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "MatrixKit.h" diff --git a/Riot/Modules/Call/CallViewController.m b/Riot/Modules/Call/CallViewController.m index 2c35dc30d0..1f366d94e7 100644 --- a/Riot/Modules/Call/CallViewController.m +++ b/Riot/Modules/Call/CallViewController.m @@ -1,19 +1,10 @@ /* - Copyright 2016 OpenMarket Ltd - Copyright 2017 Vector Creations Ltd - Copyright 2018 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2018-2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd +Copyright 2016 OpenMarket Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "CallViewController.h" diff --git a/Riot/Modules/Call/Dialpad/DialpadConfiguration.swift b/Riot/Modules/Call/Dialpad/DialpadConfiguration.swift index 04d617ea97..3d80735a12 100644 --- a/Riot/Modules/Call/Dialpad/DialpadConfiguration.swift +++ b/Riot/Modules/Call/Dialpad/DialpadConfiguration.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Call/Dialpad/Views/DialpadActionButton.swift b/Riot/Modules/Call/Dialpad/Views/DialpadActionButton.swift index 86db7ba400..b6ee2e105c 100644 --- a/Riot/Modules/Call/Dialpad/Views/DialpadActionButton.swift +++ b/Riot/Modules/Call/Dialpad/Views/DialpadActionButton.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import UIKit diff --git a/Riot/Modules/Call/Dialpad/Views/DialpadButton.swift b/Riot/Modules/Call/Dialpad/Views/DialpadButton.swift index f39394e195..1ba19276a4 100644 --- a/Riot/Modules/Call/Dialpad/Views/DialpadButton.swift +++ b/Riot/Modules/Call/Dialpad/Views/DialpadButton.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import UIKit diff --git a/Riot/Modules/Call/PiP/CallPiPView.swift b/Riot/Modules/Call/PiP/CallPiPView.swift index 97f06caf66..a327dc977b 100644 --- a/Riot/Modules/Call/PiP/CallPiPView.swift +++ b/Riot/Modules/Call/PiP/CallPiPView.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import UIKit diff --git a/Riot/Modules/Call/Views/CallAudioRouteMenuView.swift b/Riot/Modules/Call/Views/CallAudioRouteMenuView.swift index 29e9459947..f0ed0d61f8 100644 --- a/Riot/Modules/Call/Views/CallAudioRouteMenuView.swift +++ b/Riot/Modules/Call/Views/CallAudioRouteMenuView.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Call/Views/CallAudioRouteView.swift b/Riot/Modules/Call/Views/CallAudioRouteView.swift index ead55fa29e..b59c0c74ee 100644 --- a/Riot/Modules/Call/Views/CallAudioRouteView.swift +++ b/Riot/Modules/Call/Views/CallAudioRouteView.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import UIKit diff --git a/Riot/Modules/Call/Views/CircleButton.h b/Riot/Modules/Call/Views/CircleButton.h index 61780be30f..49c79f2507 100644 --- a/Riot/Modules/Call/Views/CircleButton.h +++ b/Riot/Modules/Call/Views/CircleButton.h @@ -1,17 +1,9 @@ /* - Copyright 2017 Vector Creations Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import diff --git a/Riot/Modules/Call/Views/CircleButton.m b/Riot/Modules/Call/Views/CircleButton.m index d277935ea9..e9637ff274 100644 --- a/Riot/Modules/Call/Views/CircleButton.m +++ b/Riot/Modules/Call/Views/CircleButton.m @@ -1,17 +1,9 @@ /* - Copyright 2017 Vector Creations Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "CircleButton.h" diff --git a/Riot/Modules/Call/Views/IncomingCallView.h b/Riot/Modules/Call/Views/IncomingCallView.h index 45f8971159..ba895a6e09 100644 --- a/Riot/Modules/Call/Views/IncomingCallView.h +++ b/Riot/Modules/Call/Views/IncomingCallView.h @@ -1,17 +1,9 @@ /* - Copyright 2017 Vector Creations Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import diff --git a/Riot/Modules/Call/Views/IncomingCallView.m b/Riot/Modules/Call/Views/IncomingCallView.m index b58145546b..2700d7e679 100644 --- a/Riot/Modules/Call/Views/IncomingCallView.m +++ b/Riot/Modules/Call/Views/IncomingCallView.m @@ -1,18 +1,9 @@ /* - Copyright 2017 Vector Creations Ltd - Copyright 2018 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2018-2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "IncomingCallView.h" diff --git a/Riot/Modules/CallTransfer/SelectContact/MatrixContactsDataSource.h b/Riot/Modules/CallTransfer/SelectContact/MatrixContactsDataSource.h index 81b37d7be5..2639adac34 100644 --- a/Riot/Modules/CallTransfer/SelectContact/MatrixContactsDataSource.h +++ b/Riot/Modules/CallTransfer/SelectContact/MatrixContactsDataSource.h @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // #import "ContactsDataSource.h" diff --git a/Riot/Modules/CallTransfer/SelectContact/MatrixContactsDataSource.m b/Riot/Modules/CallTransfer/SelectContact/MatrixContactsDataSource.m index 1fb9e8d299..a7c131db4a 100644 --- a/Riot/Modules/CallTransfer/SelectContact/MatrixContactsDataSource.m +++ b/Riot/Modules/CallTransfer/SelectContact/MatrixContactsDataSource.m @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // #import "MatrixContactsDataSource.h" diff --git a/Riot/Modules/Camera/CameraAccessAlertPresenter.swift b/Riot/Modules/Camera/CameraAccessAlertPresenter.swift index 45c828de2a..1726841cb8 100644 --- a/Riot/Modules/Camera/CameraAccessAlertPresenter.swift +++ b/Riot/Modules/Camera/CameraAccessAlertPresenter.swift @@ -1,17 +1,8 @@ /* - Copyright 2020 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2020-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Modules/Camera/CameraAccessManager.swift b/Riot/Modules/Camera/CameraAccessManager.swift index 628bbc2270..e7bffd9f9c 100644 --- a/Riot/Modules/Camera/CameraAccessManager.swift +++ b/Riot/Modules/Camera/CameraAccessManager.swift @@ -1,17 +1,8 @@ /* - Copyright 2020 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2020-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Modules/Camera/CameraPresenter.swift b/Riot/Modules/Camera/CameraPresenter.swift index 863115d237..0d8aa21340 100644 --- a/Riot/Modules/Camera/CameraPresenter.swift +++ b/Riot/Modules/Camera/CameraPresenter.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Modules/Common/ActivityIndicator/ActivityIndicatorPresenter.swift b/Riot/Modules/Common/ActivityIndicator/ActivityIndicatorPresenter.swift index a5ce3b1fd2..b280b10cf2 100755 --- a/Riot/Modules/Common/ActivityIndicator/ActivityIndicatorPresenter.swift +++ b/Riot/Modules/Common/ActivityIndicator/ActivityIndicatorPresenter.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Modules/Common/ActivityIndicator/ActivityIndicatorPresenterType.swift b/Riot/Modules/Common/ActivityIndicator/ActivityIndicatorPresenterType.swift index 5be34f2b95..5796e4e8ff 100644 --- a/Riot/Modules/Common/ActivityIndicator/ActivityIndicatorPresenterType.swift +++ b/Riot/Modules/Common/ActivityIndicator/ActivityIndicatorPresenterType.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Modules/Common/ActivityIndicator/UIKit/ActivityIndicatorView.swift b/Riot/Modules/Common/ActivityIndicator/UIKit/ActivityIndicatorView.swift index d7328611e8..52d1063fe8 100755 --- a/Riot/Modules/Common/ActivityIndicator/UIKit/ActivityIndicatorView.swift +++ b/Riot/Modules/Common/ActivityIndicator/UIKit/ActivityIndicatorView.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import UIKit diff --git a/Riot/Modules/Common/ActivityIndicator/UIKit/LabelledActivityIndicatorView.swift b/Riot/Modules/Common/ActivityIndicator/UIKit/LabelledActivityIndicatorView.swift index 266237bd48..4364e4dc29 100644 --- a/Riot/Modules/Common/ActivityIndicator/UIKit/LabelledActivityIndicatorView.swift +++ b/Riot/Modules/Common/ActivityIndicator/UIKit/LabelledActivityIndicatorView.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Common/Avatar/AvatarView.swift b/Riot/Modules/Common/Avatar/AvatarView.swift index a1ead57dbf..e40bd88f4c 100644 --- a/Riot/Modules/Common/Avatar/AvatarView.swift +++ b/Riot/Modules/Common/Avatar/AvatarView.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import UIKit diff --git a/Riot/Modules/Common/Avatar/AvatarViewData.swift b/Riot/Modules/Common/Avatar/AvatarViewData.swift index 88eb47a078..0b39fc0e35 100644 --- a/Riot/Modules/Common/Avatar/AvatarViewData.swift +++ b/Riot/Modules/Common/Avatar/AvatarViewData.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Common/Avatar/AvatarViewDataProtocol.swift b/Riot/Modules/Common/Avatar/AvatarViewDataProtocol.swift index f3410783bf..31b35d0723 100644 --- a/Riot/Modules/Common/Avatar/AvatarViewDataProtocol.swift +++ b/Riot/Modules/Common/Avatar/AvatarViewDataProtocol.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import UIKit diff --git a/Riot/Modules/Common/Buttons/Close/CloseButton.swift b/Riot/Modules/Common/Buttons/Close/CloseButton.swift index 22a0ba8c8a..eea8d7466c 100644 --- a/Riot/Modules/Common/Buttons/Close/CloseButton.swift +++ b/Riot/Modules/Common/Buttons/Close/CloseButton.swift @@ -1,17 +1,8 @@ /* - Copyright 2020 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2020-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Modules/Common/Buttons/CustomRoundedButton.swift b/Riot/Modules/Common/Buttons/CustomRoundedButton.swift index 15c3070926..2fdc8cf443 100644 --- a/Riot/Modules/Common/Buttons/CustomRoundedButton.swift +++ b/Riot/Modules/Common/Buttons/CustomRoundedButton.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import UIKit diff --git a/Riot/Modules/Common/Buttons/RoundedButton.swift b/Riot/Modules/Common/Buttons/RoundedButton.swift index f1723ce2c6..11ff0a6bde 100644 --- a/Riot/Modules/Common/Buttons/RoundedButton.swift +++ b/Riot/Modules/Common/Buttons/RoundedButton.swift @@ -1,17 +1,8 @@ /* - Copyright 2020 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2020-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import UIKit diff --git a/Riot/Modules/Common/Cells/TableViewCellWithButton.h b/Riot/Modules/Common/Cells/TableViewCellWithButton.h index 3a8a172a6d..c6ab65536a 100644 --- a/Riot/Modules/Common/Cells/TableViewCellWithButton.h +++ b/Riot/Modules/Common/Cells/TableViewCellWithButton.h @@ -1,17 +1,9 @@ /* - Copyright 2015 OpenMarket Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2015 OpenMarket Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "MatrixKit.h" diff --git a/Riot/Modules/Common/Cells/TableViewCellWithButton.m b/Riot/Modules/Common/Cells/TableViewCellWithButton.m index cc2b65d5b4..46e443bc4e 100644 --- a/Riot/Modules/Common/Cells/TableViewCellWithButton.m +++ b/Riot/Modules/Common/Cells/TableViewCellWithButton.m @@ -1,17 +1,9 @@ /* - Copyright 2015 OpenMarket Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2015 OpenMarket Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "TableViewCellWithButton.h" diff --git a/Riot/Modules/Common/Cells/TextFieldTableViewCell.swift b/Riot/Modules/Common/Cells/TextFieldTableViewCell.swift index 3a3d83e455..56c7708e5e 100644 --- a/Riot/Modules/Common/Cells/TextFieldTableViewCell.swift +++ b/Riot/Modules/Common/Cells/TextFieldTableViewCell.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import UIKit diff --git a/Riot/Modules/Common/Cells/TextViewTableViewCell.swift b/Riot/Modules/Common/Cells/TextViewTableViewCell.swift index 830e6cf692..8cf312023e 100644 --- a/Riot/Modules/Common/Cells/TextViewTableViewCell.swift +++ b/Riot/Modules/Common/Cells/TextViewTableViewCell.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import UIKit diff --git a/Riot/Modules/Common/CoachMessages/CoachMarkView.swift b/Riot/Modules/Common/CoachMessages/CoachMarkView.swift index 3c88f8e572..41ce5b94e6 100644 --- a/Riot/Modules/Common/CoachMessages/CoachMarkView.swift +++ b/Riot/Modules/Common/CoachMessages/CoachMarkView.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import UIKit diff --git a/Riot/Modules/Common/CoachMessages/WindowOverlayPresenter.swift b/Riot/Modules/Common/CoachMessages/WindowOverlayPresenter.swift index 97099cb635..ba2087b8a4 100644 --- a/Riot/Modules/Common/CoachMessages/WindowOverlayPresenter.swift +++ b/Riot/Modules/Common/CoachMessages/WindowOverlayPresenter.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import UIKit diff --git a/Riot/Modules/Common/CollectionView/AutosizedCollectionView.swift b/Riot/Modules/Common/CollectionView/AutosizedCollectionView.swift index 10cdbf75c7..297b50a16d 100644 --- a/Riot/Modules/Common/CollectionView/AutosizedCollectionView.swift +++ b/Riot/Modules/Common/CollectionView/AutosizedCollectionView.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import UIKit diff --git a/Riot/Modules/Common/KeyboardAvoiding/KeyboardAvoider.swift b/Riot/Modules/Common/KeyboardAvoiding/KeyboardAvoider.swift index 90090723c0..27ac041b13 100644 --- a/Riot/Modules/Common/KeyboardAvoiding/KeyboardAvoider.swift +++ b/Riot/Modules/Common/KeyboardAvoiding/KeyboardAvoider.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Modules/Common/KeyboardAvoiding/KeyboardNotification.swift b/Riot/Modules/Common/KeyboardAvoiding/KeyboardNotification.swift index cebf3eddd3..a1ecfda1d9 100644 --- a/Riot/Modules/Common/KeyboardAvoiding/KeyboardNotification.swift +++ b/Riot/Modules/Common/KeyboardAvoiding/KeyboardNotification.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import UIKit diff --git a/Riot/Modules/Common/Models/Row.swift b/Riot/Modules/Common/Models/Row.swift index eb9be24c0b..34da24ac9f 100644 --- a/Riot/Modules/Common/Models/Row.swift +++ b/Riot/Modules/Common/Models/Row.swift @@ -1,17 +1,9 @@ // +// Copyright 2024 New Vector Ltd. // Copyright 2020 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Common/Models/Section.swift b/Riot/Modules/Common/Models/Section.swift index 46b5c23397..7642f2e334 100644 --- a/Riot/Modules/Common/Models/Section.swift +++ b/Riot/Modules/Common/Models/Section.swift @@ -1,17 +1,9 @@ // +// Copyright 2024 New Vector Ltd. // Copyright 2020 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Common/Models/SourceImage.swift b/Riot/Modules/Common/Models/SourceImage.swift index bf2ae6208f..0de4f9e9f2 100644 --- a/Riot/Modules/Common/Models/SourceImage.swift +++ b/Riot/Modules/Common/Models/SourceImage.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Common/Models/TableViewSections.swift b/Riot/Modules/Common/Models/TableViewSections.swift index 2f32c61e49..8390d3e171 100644 --- a/Riot/Modules/Common/Models/TableViewSections.swift +++ b/Riot/Modules/Common/Models/TableViewSections.swift @@ -1,17 +1,9 @@ // +// Copyright 2024 New Vector Ltd. // Copyright 2020 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Common/NavigationController/RiotNavigationController.h b/Riot/Modules/Common/NavigationController/RiotNavigationController.h index 00530f7e70..464d8aef7a 100644 --- a/Riot/Modules/Common/NavigationController/RiotNavigationController.h +++ b/Riot/Modules/Common/NavigationController/RiotNavigationController.h @@ -1,17 +1,9 @@ /* - Copyright 2017 Vector Creations Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import diff --git a/Riot/Modules/Common/NavigationController/RiotNavigationController.m b/Riot/Modules/Common/NavigationController/RiotNavigationController.m index bf44d14f2b..79492258ca 100644 --- a/Riot/Modules/Common/NavigationController/RiotNavigationController.m +++ b/Riot/Modules/Common/NavigationController/RiotNavigationController.m @@ -1,17 +1,9 @@ /* - Copyright 2017 Vector Creations Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ @import MatrixSDK; diff --git a/Riot/Modules/Common/PresenceIndicator/PresenceIndicatorListener.swift b/Riot/Modules/Common/PresenceIndicator/PresenceIndicatorListener.swift index 8f11946a46..9e9c6ce604 100644 --- a/Riot/Modules/Common/PresenceIndicator/PresenceIndicatorListener.swift +++ b/Riot/Modules/Common/PresenceIndicator/PresenceIndicatorListener.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Common/PresenceIndicator/PresenceIndicatorView.swift b/Riot/Modules/Common/PresenceIndicator/PresenceIndicatorView.swift index c6c8de7b64..e5d3b7cec2 100644 --- a/Riot/Modules/Common/PresenceIndicator/PresenceIndicatorView.swift +++ b/Riot/Modules/Common/PresenceIndicator/PresenceIndicatorView.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import UIKit diff --git a/Riot/Modules/Common/Presentation/CustomSizedPresentable.swift b/Riot/Modules/Common/Presentation/CustomSizedPresentable.swift index 50c2045cf7..abb613c3dd 100644 --- a/Riot/Modules/Common/Presentation/CustomSizedPresentable.swift +++ b/Riot/Modules/Common/Presentation/CustomSizedPresentable.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Common/Presentation/CustomSizedPresentationController.swift b/Riot/Modules/Common/Presentation/CustomSizedPresentationController.swift index 7c7dfb47de..bce0580946 100644 --- a/Riot/Modules/Common/Presentation/CustomSizedPresentationController.swift +++ b/Riot/Modules/Common/Presentation/CustomSizedPresentationController.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import UIKit diff --git a/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.h b/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.h index eb1b0c6c6d..d189c3b4db 100644 --- a/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.h +++ b/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.h @@ -1,18 +1,10 @@ /* - Copyright 2015 OpenMarket Ltd - Copyright 2017 Vector Creations Ltd +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd +Copyright 2015 OpenMarket Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "MatrixKit.h" diff --git a/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m b/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m index 38808bd136..b447230c29 100644 --- a/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m +++ b/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m @@ -1,18 +1,10 @@ /* - Copyright 2015 OpenMarket Ltd - Copyright 2017 Vector Creations Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd +Copyright 2015 OpenMarket Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "RecentsDataSource.h" diff --git a/Riot/Modules/Common/Recents/DataSources/RecentsDataSourceSectionType.swift b/Riot/Modules/Common/Recents/DataSources/RecentsDataSourceSectionType.swift index 92a301d9e3..a20767f151 100644 --- a/Riot/Modules/Common/Recents/DataSources/RecentsDataSourceSectionType.swift +++ b/Riot/Modules/Common/Recents/DataSources/RecentsDataSourceSectionType.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Common/Recents/DataSources/RecentsDataSourceSections.swift b/Riot/Modules/Common/Recents/DataSources/RecentsDataSourceSections.swift index 85b1594b94..ab92ecbf38 100644 --- a/Riot/Modules/Common/Recents/DataSources/RecentsDataSourceSections.swift +++ b/Riot/Modules/Common/Recents/DataSources/RecentsDataSourceSections.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Common/Recents/Model/DiscussionsCount.swift b/Riot/Modules/Common/Recents/Model/DiscussionsCount.swift index dad3587716..4f60721b7b 100644 --- a/Riot/Modules/Common/Recents/Model/DiscussionsCount.swift +++ b/Riot/Modules/Common/Recents/Model/DiscussionsCount.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Common/Recents/Model/RecentCellData.h b/Riot/Modules/Common/Recents/Model/RecentCellData.h index 43efda4efc..dcf1232609 100644 --- a/Riot/Modules/Common/Recents/Model/RecentCellData.h +++ b/Riot/Modules/Common/Recents/Model/RecentCellData.h @@ -1,17 +1,9 @@ /* - Copyright 2015 OpenMarket Ltd +Copyright 2024 New Vector Ltd. +Copyright 2015 OpenMarket Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import diff --git a/Riot/Modules/Common/Recents/Model/RecentCellData.m b/Riot/Modules/Common/Recents/Model/RecentCellData.m index f706d3c921..7e267877c5 100644 --- a/Riot/Modules/Common/Recents/Model/RecentCellData.m +++ b/Riot/Modules/Common/Recents/Model/RecentCellData.m @@ -1,18 +1,10 @@ /* - Copyright 2015 OpenMarket Ltd - Copyright 2017 Vector Creations Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd +Copyright 2015 OpenMarket Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "RecentCellData.h" diff --git a/Riot/Modules/Common/Recents/RecentsViewController+RoomInvite.swift b/Riot/Modules/Common/Recents/RecentsViewController+RoomInvite.swift index 681a248749..d39fad030f 100644 --- a/Riot/Modules/Common/Recents/RecentsViewController+RoomInvite.swift +++ b/Riot/Modules/Common/Recents/RecentsViewController+RoomInvite.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Common/Recents/RecentsViewController.h b/Riot/Modules/Common/Recents/RecentsViewController.h index 00f74aeed0..349c9a56cb 100644 --- a/Riot/Modules/Common/Recents/RecentsViewController.h +++ b/Riot/Modules/Common/Recents/RecentsViewController.h @@ -1,18 +1,10 @@ /* - Copyright 2015 OpenMarket Ltd - Copyright 2017 Vector Creations Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd +Copyright 2015 OpenMarket Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "MatrixKit.h" diff --git a/Riot/Modules/Common/Recents/RecentsViewController.m b/Riot/Modules/Common/Recents/RecentsViewController.m index 6b118ffa7f..048397d412 100644 --- a/Riot/Modules/Common/Recents/RecentsViewController.m +++ b/Riot/Modules/Common/Recents/RecentsViewController.m @@ -1,19 +1,10 @@ /* - Copyright 2015 OpenMarket Ltd - Copyright 2017 Vector Creations Ltd - Copyright 2018 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2018-2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd +Copyright 2015 OpenMarket Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "RecentsViewController.h" diff --git a/Riot/Modules/Common/Recents/Service/MatrixSDK/RecentsListService.swift b/Riot/Modules/Common/Recents/Service/MatrixSDK/RecentsListService.swift index 1401abe6c4..d74a4e4100 100644 --- a/Riot/Modules/Common/Recents/Service/MatrixSDK/RecentsListService.swift +++ b/Riot/Modules/Common/Recents/Service/MatrixSDK/RecentsListService.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Common/Recents/Service/Mock/MockRecentsListService.swift b/Riot/Modules/Common/Recents/Service/Mock/MockRecentsListService.swift index 1bfdd60d47..d554aa13ec 100644 --- a/Riot/Modules/Common/Recents/Service/Mock/MockRecentsListService.swift +++ b/Riot/Modules/Common/Recents/Service/Mock/MockRecentsListService.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Common/Recents/Service/Mock/MockRoomListData.swift b/Riot/Modules/Common/Recents/Service/Mock/MockRoomListData.swift index ef0a2742bf..87d2dde529 100644 --- a/Riot/Modules/Common/Recents/Service/Mock/MockRoomListData.swift +++ b/Riot/Modules/Common/Recents/Service/Mock/MockRoomListData.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import MatrixSDK diff --git a/Riot/Modules/Common/Recents/Service/Mock/MockRoomSummary.swift b/Riot/Modules/Common/Recents/Service/Mock/MockRoomSummary.swift index 88596c75fe..55f30f9e4f 100644 --- a/Riot/Modules/Common/Recents/Service/Mock/MockRoomSummary.swift +++ b/Riot/Modules/Common/Recents/Service/Mock/MockRoomSummary.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Common/Recents/Service/RecentsListServiceDelegate.swift b/Riot/Modules/Common/Recents/Service/RecentsListServiceDelegate.swift index 0b915898ad..98c4c9a116 100644 --- a/Riot/Modules/Common/Recents/Service/RecentsListServiceDelegate.swift +++ b/Riot/Modules/Common/Recents/Service/RecentsListServiceDelegate.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Common/Recents/Service/RecentsListServiceProtocol.swift b/Riot/Modules/Common/Recents/Service/RecentsListServiceProtocol.swift index 8eec17ed5d..ab91fc4aa4 100644 --- a/Riot/Modules/Common/Recents/Service/RecentsListServiceProtocol.swift +++ b/Riot/Modules/Common/Recents/Service/RecentsListServiceProtocol.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Common/Recents/Service/RecentsListServiceSection.swift b/Riot/Modules/Common/Recents/Service/RecentsListServiceSection.swift index d954439d9c..b9827e9fe2 100644 --- a/Riot/Modules/Common/Recents/Service/RecentsListServiceSection.swift +++ b/Riot/Modules/Common/Recents/Service/RecentsListServiceSection.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Common/Recents/Views/DirectorySectionHeaderContainerView.h b/Riot/Modules/Common/Recents/Views/DirectorySectionHeaderContainerView.h index e512d1109e..bcb469ca27 100644 --- a/Riot/Modules/Common/Recents/Views/DirectorySectionHeaderContainerView.h +++ b/Riot/Modules/Common/Recents/Views/DirectorySectionHeaderContainerView.h @@ -1,18 +1,10 @@ /* - Copyright 2014 OpenMarket Ltd - Copyright 2020 Vector Creations Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2020 Vector Creations Ltd +Copyright 2014 OpenMarket Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import diff --git a/Riot/Modules/Common/Recents/Views/DirectorySectionHeaderContainerView.m b/Riot/Modules/Common/Recents/Views/DirectorySectionHeaderContainerView.m index 02692c6157..1366093e95 100644 --- a/Riot/Modules/Common/Recents/Views/DirectorySectionHeaderContainerView.m +++ b/Riot/Modules/Common/Recents/Views/DirectorySectionHeaderContainerView.m @@ -1,18 +1,10 @@ /* - Copyright 2014 OpenMarket Ltd - Copyright 2020 Vector Creations Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2020 Vector Creations Ltd +Copyright 2014 OpenMarket Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "DirectorySectionHeaderContainerView.h" diff --git a/Riot/Modules/Common/Recents/Views/RecentEmptySectionTableViewCell.swift b/Riot/Modules/Common/Recents/Views/RecentEmptySectionTableViewCell.swift index 11a7c794cd..52f2202634 100644 --- a/Riot/Modules/Common/Recents/Views/RecentEmptySectionTableViewCell.swift +++ b/Riot/Modules/Common/Recents/Views/RecentEmptySectionTableViewCell.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import UIKit diff --git a/Riot/Modules/Common/Recents/Views/RecentEmptySpaceSectionTableViewCell.swift b/Riot/Modules/Common/Recents/Views/RecentEmptySpaceSectionTableViewCell.swift index f56d233cfe..9b3533a306 100644 --- a/Riot/Modules/Common/Recents/Views/RecentEmptySpaceSectionTableViewCell.swift +++ b/Riot/Modules/Common/Recents/Views/RecentEmptySpaceSectionTableViewCell.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import UIKit diff --git a/Riot/Modules/Common/Recents/Views/RecentTableViewCell.h b/Riot/Modules/Common/Recents/Views/RecentTableViewCell.h index ee4489402c..0e4df46998 100644 --- a/Riot/Modules/Common/Recents/Views/RecentTableViewCell.h +++ b/Riot/Modules/Common/Recents/Views/RecentTableViewCell.h @@ -1,17 +1,9 @@ /* - Copyright 2015 OpenMarket Ltd +Copyright 2024 New Vector Ltd. +Copyright 2015 OpenMarket Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "MatrixKit.h" diff --git a/Riot/Modules/Common/Recents/Views/RecentTableViewCell.m b/Riot/Modules/Common/Recents/Views/RecentTableViewCell.m index 32dd25ab37..405e3a1a00 100644 --- a/Riot/Modules/Common/Recents/Views/RecentTableViewCell.m +++ b/Riot/Modules/Common/Recents/Views/RecentTableViewCell.m @@ -1,18 +1,10 @@ /* - Copyright 2015 OpenMarket Ltd - Copyright 2017 Vector Creations Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd +Copyright 2015 OpenMarket Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "RecentTableViewCell.h" diff --git a/Riot/Modules/Common/Recents/Views/RecentsInvitesTableViewCell.swift b/Riot/Modules/Common/Recents/Views/RecentsInvitesTableViewCell.swift index dea15153e7..93e0a1a4df 100644 --- a/Riot/Modules/Common/Recents/Views/RecentsInvitesTableViewCell.swift +++ b/Riot/Modules/Common/Recents/Views/RecentsInvitesTableViewCell.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import UIKit diff --git a/Riot/Modules/Common/Recents/Views/RootTabEmptyView.swift b/Riot/Modules/Common/Recents/Views/RootTabEmptyView.swift index 3d14f605e2..33f381cf8b 100644 --- a/Riot/Modules/Common/Recents/Views/RootTabEmptyView.swift +++ b/Riot/Modules/Common/Recents/Views/RootTabEmptyView.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Common/SectionFooters/SectionFooterView.swift b/Riot/Modules/Common/SectionFooters/SectionFooterView.swift index 92c36e88cf..cfe3d0cfd4 100644 --- a/Riot/Modules/Common/SectionFooters/SectionFooterView.swift +++ b/Riot/Modules/Common/SectionFooters/SectionFooterView.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import UIKit diff --git a/Riot/Modules/Common/SectionHeaders/AllChatsFilterOptionListView.swift b/Riot/Modules/Common/SectionHeaders/AllChatsFilterOptionListView.swift index 0fe8d1fee7..b2e0313f7a 100644 --- a/Riot/Modules/Common/SectionHeaders/AllChatsFilterOptionListView.swift +++ b/Riot/Modules/Common/SectionHeaders/AllChatsFilterOptionListView.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import UIKit diff --git a/Riot/Modules/Common/SectionHeaders/SectionHeaderView.h b/Riot/Modules/Common/SectionHeaders/SectionHeaderView.h index 12295c89f2..e329f9741e 100644 --- a/Riot/Modules/Common/SectionHeaders/SectionHeaderView.h +++ b/Riot/Modules/Common/SectionHeaders/SectionHeaderView.h @@ -1,18 +1,10 @@ /* - Copyright 2014 OpenMarket Ltd - Copyright 2020 Vector Creations Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2020 Vector Creations Ltd +Copyright 2014 OpenMarket Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import diff --git a/Riot/Modules/Common/SectionHeaders/SectionHeaderView.m b/Riot/Modules/Common/SectionHeaders/SectionHeaderView.m index eae348784a..461ec0f7b5 100644 --- a/Riot/Modules/Common/SectionHeaders/SectionHeaderView.m +++ b/Riot/Modules/Common/SectionHeaders/SectionHeaderView.m @@ -1,18 +1,10 @@ /* - Copyright 2014 OpenMarket Ltd - Copyright 2020 Vector Creations Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2020 Vector Creations Ltd +Copyright 2014 OpenMarket Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "SectionHeaderView.h" diff --git a/Riot/Modules/Common/SectionHeaders/TabListView.swift b/Riot/Modules/Common/SectionHeaders/TabListView.swift index 6508fac127..a46671f4f7 100644 --- a/Riot/Modules/Common/SectionHeaders/TabListView.swift +++ b/Riot/Modules/Common/SectionHeaders/TabListView.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import UIKit diff --git a/Riot/Modules/Common/SectionHeaders/TextViewTableViewHeaderFooterView.swift b/Riot/Modules/Common/SectionHeaders/TextViewTableViewHeaderFooterView.swift index 7083308cb6..a8911070fb 100644 --- a/Riot/Modules/Common/SectionHeaders/TextViewTableViewHeaderFooterView.swift +++ b/Riot/Modules/Common/SectionHeaders/TextViewTableViewHeaderFooterView.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Common/SectionHeaders/TitleHeaderView.swift b/Riot/Modules/Common/SectionHeaders/TitleHeaderView.swift index fb7dfabece..0c4fc982f4 100644 --- a/Riot/Modules/Common/SectionHeaders/TitleHeaderView.swift +++ b/Riot/Modules/Common/SectionHeaders/TitleHeaderView.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Common/SegmentedViewController/SegmentedViewController.h b/Riot/Modules/Common/SegmentedViewController/SegmentedViewController.h index 6482f5352f..d98a8f8202 100644 --- a/Riot/Modules/Common/SegmentedViewController/SegmentedViewController.h +++ b/Riot/Modules/Common/SegmentedViewController/SegmentedViewController.h @@ -1,18 +1,10 @@ /* - Copyright 2015 OpenMarket Ltd - Copyright 2017 Vector Creations Ltd +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd +Copyright 2015 OpenMarket Ltd -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import diff --git a/Riot/Modules/Common/SegmentedViewController/SegmentedViewController.m b/Riot/Modules/Common/SegmentedViewController/SegmentedViewController.m index 5bfc87a75c..924a361bd4 100644 --- a/Riot/Modules/Common/SegmentedViewController/SegmentedViewController.m +++ b/Riot/Modules/Common/SegmentedViewController/SegmentedViewController.m @@ -1,19 +1,10 @@ /* - Copyright 2015 OpenMarket Ltd - Copyright 2017 Vector Creations Ltd - Copyright 2018 Vector Creations Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd +Copyright 2015 OpenMarket Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "SegmentedViewController.h" diff --git a/Riot/Modules/Common/SwiftUI/VectorHostingBottomSheetPreferences.swift b/Riot/Modules/Common/SwiftUI/VectorHostingBottomSheetPreferences.swift index d7f94c6260..80f511d50f 100644 --- a/Riot/Modules/Common/SwiftUI/VectorHostingBottomSheetPreferences.swift +++ b/Riot/Modules/Common/SwiftUI/VectorHostingBottomSheetPreferences.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Common/SwiftUI/VectorHostingController.swift b/Riot/Modules/Common/SwiftUI/VectorHostingController.swift index ef1c2a66d6..bd90f4069f 100644 --- a/Riot/Modules/Common/SwiftUI/VectorHostingController.swift +++ b/Riot/Modules/Common/SwiftUI/VectorHostingController.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Common/TableView/AutosizedTableView.swift b/Riot/Modules/Common/TableView/AutosizedTableView.swift index 9bf983de17..6d507242b7 100644 --- a/Riot/Modules/Common/TableView/AutosizedTableView.swift +++ b/Riot/Modules/Common/TableView/AutosizedTableView.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import UIKit diff --git a/Riot/Modules/Common/Toasts/RectangleToastView.swift b/Riot/Modules/Common/Toasts/RectangleToastView.swift index 41aa3c65fe..56962b8d32 100644 --- a/Riot/Modules/Common/Toasts/RectangleToastView.swift +++ b/Riot/Modules/Common/Toasts/RectangleToastView.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Common/Toasts/RoundedToastView.swift b/Riot/Modules/Common/Toasts/RoundedToastView.swift index 058567e839..5d3b27eb3d 100644 --- a/Riot/Modules/Common/Toasts/RoundedToastView.swift +++ b/Riot/Modules/Common/Toasts/RoundedToastView.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Common/Toasts/ToastViewState.swift b/Riot/Modules/Common/Toasts/ToastViewState.swift index 2e7fbab3da..a485658924 100644 --- a/Riot/Modules/Common/Toasts/ToastViewState.swift +++ b/Riot/Modules/Common/Toasts/ToastViewState.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Common/UserIndicators/UserIndicatorCancel.h b/Riot/Modules/Common/UserIndicators/UserIndicatorCancel.h index 6c14404af4..6f1d3b0c3b 100644 --- a/Riot/Modules/Common/UserIndicators/UserIndicatorCancel.h +++ b/Riot/Modules/Common/UserIndicators/UserIndicatorCancel.h @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // #ifndef UserIndicatorCancel_h diff --git a/Riot/Modules/Common/UserIndicators/UserIndicatorPresenter.swift b/Riot/Modules/Common/UserIndicators/UserIndicatorPresenter.swift index f9e1c26f2b..16c3da5ff8 100644 --- a/Riot/Modules/Common/UserIndicators/UserIndicatorPresenter.swift +++ b/Riot/Modules/Common/UserIndicators/UserIndicatorPresenter.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Common/UserIndicators/UserIndicatorStore.swift b/Riot/Modules/Common/UserIndicators/UserIndicatorStore.swift index 79dc641b56..125d8a23f5 100644 --- a/Riot/Modules/Common/UserIndicators/UserIndicatorStore.swift +++ b/Riot/Modules/Common/UserIndicators/UserIndicatorStore.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Common/UserIndicators/ViewPresenters/FullscreenLoadingViewPresenter.swift b/Riot/Modules/Common/UserIndicators/ViewPresenters/FullscreenLoadingViewPresenter.swift index d260a0497b..626d235932 100644 --- a/Riot/Modules/Common/UserIndicators/ViewPresenters/FullscreenLoadingViewPresenter.swift +++ b/Riot/Modules/Common/UserIndicators/ViewPresenters/FullscreenLoadingViewPresenter.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Common/UserIndicators/ViewPresenters/ToastViewPresenter.swift b/Riot/Modules/Common/UserIndicators/ViewPresenters/ToastViewPresenter.swift index 9493e8552f..1cf0a3dbe9 100644 --- a/Riot/Modules/Common/UserIndicators/ViewPresenters/ToastViewPresenter.swift +++ b/Riot/Modules/Common/UserIndicators/ViewPresenters/ToastViewPresenter.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Common/Views/BadgedBarButtonItem.swift b/Riot/Modules/Common/Views/BadgedBarButtonItem.swift index fade1f8742..40f8165bae 100644 --- a/Riot/Modules/Common/Views/BadgedBarButtonItem.swift +++ b/Riot/Modules/Common/Views/BadgedBarButtonItem.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import UIKit diff --git a/Riot/Modules/Common/Views/CopyableLabel.swift b/Riot/Modules/Common/Views/CopyableLabel.swift index 56a7356959..962e6b79fd 100644 --- a/Riot/Modules/Common/Views/CopyableLabel.swift +++ b/Riot/Modules/Common/Views/CopyableLabel.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import UIKit diff --git a/Riot/Modules/Common/Views/InsettedTextField.swift b/Riot/Modules/Common/Views/InsettedTextField.swift index ff07804356..e520560286 100644 --- a/Riot/Modules/Common/Views/InsettedTextField.swift +++ b/Riot/Modules/Common/Views/InsettedTextField.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import UIKit diff --git a/Riot/Modules/Common/Views/PlaceholderedTextView.swift b/Riot/Modules/Common/Views/PlaceholderedTextView.swift index ecfaf8643e..4ca30454d8 100644 --- a/Riot/Modules/Common/Views/PlaceholderedTextView.swift +++ b/Riot/Modules/Common/Views/PlaceholderedTextView.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import UIKit diff --git a/Riot/Modules/Common/WebViewController/WebViewViewController.h b/Riot/Modules/Common/WebViewController/WebViewViewController.h index af5afe2a41..8e49fb92ab 100644 --- a/Riot/Modules/Common/WebViewController/WebViewViewController.h +++ b/Riot/Modules/Common/WebViewController/WebViewViewController.h @@ -1,17 +1,9 @@ /* - Copyright 2017 Vector Creations Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "MatrixKit.h" diff --git a/Riot/Modules/Common/WebViewController/WebViewViewController.m b/Riot/Modules/Common/WebViewController/WebViewViewController.m index c4394c71dd..e40d089385 100644 --- a/Riot/Modules/Common/WebViewController/WebViewViewController.m +++ b/Riot/Modules/Common/WebViewController/WebViewViewController.m @@ -1,17 +1,9 @@ /* - Copyright 2017 Vector Creations Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "WebViewViewController.h" diff --git a/Riot/Modules/Contacts/ContactsTableViewController.h b/Riot/Modules/Contacts/ContactsTableViewController.h index e1a3bc8928..0359e7fb78 100644 --- a/Riot/Modules/Contacts/ContactsTableViewController.h +++ b/Riot/Modules/Contacts/ContactsTableViewController.h @@ -1,18 +1,10 @@ /* - Copyright 2017 OpenMarket Ltd - Copyright 2017 Vector Creations Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2017 OpenMarket Ltd +Copyright 2017 Vector Creations Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "ContactsDataSource.h" diff --git a/Riot/Modules/Contacts/ContactsTableViewController.m b/Riot/Modules/Contacts/ContactsTableViewController.m index e97a9ae192..b2df49f1e0 100644 --- a/Riot/Modules/Contacts/ContactsTableViewController.m +++ b/Riot/Modules/Contacts/ContactsTableViewController.m @@ -1,18 +1,10 @@ /* - Copyright 2017 OpenMarket Ltd - Copyright 2017 Vector Creations Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2017 OpenMarket Ltd +Copyright 2017 Vector Creations Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import diff --git a/Riot/Modules/Contacts/DataSources/ContactsDataSource.h b/Riot/Modules/Contacts/DataSources/ContactsDataSource.h index 6d6205e9b7..e943fafb7c 100644 --- a/Riot/Modules/Contacts/DataSources/ContactsDataSource.h +++ b/Riot/Modules/Contacts/DataSources/ContactsDataSource.h @@ -1,17 +1,9 @@ /* - Copyright 2017 Vector Creations Ltd +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "MatrixKit.h" diff --git a/Riot/Modules/Contacts/DataSources/ContactsDataSource.m b/Riot/Modules/Contacts/DataSources/ContactsDataSource.m index 37a42c1294..d780438a5c 100644 --- a/Riot/Modules/Contacts/DataSources/ContactsDataSource.m +++ b/Riot/Modules/Contacts/DataSources/ContactsDataSource.m @@ -1,17 +1,9 @@ /* - Copyright 2017 Vector Creations Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import diff --git a/Riot/Modules/Contacts/Details/ContactDetailsViewController.h b/Riot/Modules/Contacts/Details/ContactDetailsViewController.h index 737dd6532e..bb5c38d188 100644 --- a/Riot/Modules/Contacts/Details/ContactDetailsViewController.h +++ b/Riot/Modules/Contacts/Details/ContactDetailsViewController.h @@ -1,17 +1,9 @@ /* - Copyright 2016 OpenMarket Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2016 OpenMarket Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "MatrixKit.h" diff --git a/Riot/Modules/Contacts/Details/ContactDetailsViewController.m b/Riot/Modules/Contacts/Details/ContactDetailsViewController.m index 6d46d79ffe..70b4aee82f 100644 --- a/Riot/Modules/Contacts/Details/ContactDetailsViewController.m +++ b/Riot/Modules/Contacts/Details/ContactDetailsViewController.m @@ -1,19 +1,10 @@ /* - Copyright 2016 OpenMarket Ltd - Copyright 2017 Vector Creations Ltd - Copyright 2018 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2018-2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd +Copyright 2016 OpenMarket Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "ContactDetailsViewController.h" diff --git a/Riot/Modules/Contacts/Details/Views/RoomTableViewCell.h b/Riot/Modules/Contacts/Details/Views/RoomTableViewCell.h index a99bd2df55..e10e9549d7 100644 --- a/Riot/Modules/Contacts/Details/Views/RoomTableViewCell.h +++ b/Riot/Modules/Contacts/Details/Views/RoomTableViewCell.h @@ -1,17 +1,9 @@ /* - Copyright 2016 OpenMarket Ltd +Copyright 2024 New Vector Ltd. +Copyright 2016 OpenMarket Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "MatrixKit.h" diff --git a/Riot/Modules/Contacts/Details/Views/RoomTableViewCell.m b/Riot/Modules/Contacts/Details/Views/RoomTableViewCell.m index ce6ee4399d..4ffe225733 100644 --- a/Riot/Modules/Contacts/Details/Views/RoomTableViewCell.m +++ b/Riot/Modules/Contacts/Details/Views/RoomTableViewCell.m @@ -1,18 +1,10 @@ /* - Copyright 2016 OpenMarket Ltd - Copyright 2017 Vector Creations Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd +Copyright 2016 OpenMarket Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "RoomTableViewCell.h" diff --git a/Riot/Modules/Contacts/Views/ContactTableViewCell.h b/Riot/Modules/Contacts/Views/ContactTableViewCell.h index acb9e00972..4a40102483 100644 --- a/Riot/Modules/Contacts/Views/ContactTableViewCell.h +++ b/Riot/Modules/Contacts/Views/ContactTableViewCell.h @@ -1,17 +1,9 @@ /* - Copyright 2015 OpenMarket Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2015 OpenMarket Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "MatrixKit.h" diff --git a/Riot/Modules/Contacts/Views/ContactTableViewCell.m b/Riot/Modules/Contacts/Views/ContactTableViewCell.m index 423445cb9e..db4ca244e0 100644 --- a/Riot/Modules/Contacts/Views/ContactTableViewCell.m +++ b/Riot/Modules/Contacts/Views/ContactTableViewCell.m @@ -1,18 +1,10 @@ /* - Copyright 2015 OpenMarket Ltd - Copyright 2017 Vector Creations Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd +Copyright 2015 OpenMarket Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "ContactTableViewCell.h" diff --git a/Riot/Modules/Contacts/Views/FindYourContactsFooterView.swift b/Riot/Modules/Contacts/Views/FindYourContactsFooterView.swift index c97176f31e..b60469fc6e 100644 --- a/Riot/Modules/Contacts/Views/FindYourContactsFooterView.swift +++ b/Riot/Modules/Contacts/Views/FindYourContactsFooterView.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import UIKit diff --git a/Riot/Modules/Contacts/Views/LocalContactsSectionHeaderContainerView.h b/Riot/Modules/Contacts/Views/LocalContactsSectionHeaderContainerView.h index 818ce6adde..b35e2bcd8b 100644 --- a/Riot/Modules/Contacts/Views/LocalContactsSectionHeaderContainerView.h +++ b/Riot/Modules/Contacts/Views/LocalContactsSectionHeaderContainerView.h @@ -1,18 +1,10 @@ /* - Copyright 2014 OpenMarket Ltd - Copyright 2020 Vector Creations Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2020 Vector Creations Ltd +Copyright 2014 OpenMarket Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import diff --git a/Riot/Modules/Contacts/Views/LocalContactsSectionHeaderContainerView.m b/Riot/Modules/Contacts/Views/LocalContactsSectionHeaderContainerView.m index a3b480eb7b..ead82ee5a2 100644 --- a/Riot/Modules/Contacts/Views/LocalContactsSectionHeaderContainerView.m +++ b/Riot/Modules/Contacts/Views/LocalContactsSectionHeaderContainerView.m @@ -1,18 +1,10 @@ /* - Copyright 2014 OpenMarket Ltd - Copyright 2020 Vector Creations Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2020 Vector Creations Ltd +Copyright 2014 OpenMarket Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "LocalContactsSectionHeaderContainerView.h" diff --git a/Riot/Modules/ContextMenu/ActionProviders/AllChatsActionProvider.swift b/Riot/Modules/ContextMenu/ActionProviders/AllChatsActionProvider.swift index 7081c2b36c..52e130098c 100644 --- a/Riot/Modules/ContextMenu/ActionProviders/AllChatsActionProvider.swift +++ b/Riot/Modules/ContextMenu/ActionProviders/AllChatsActionProvider.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/ContextMenu/ActionProviders/AllChatsEditActionProvider.swift b/Riot/Modules/ContextMenu/ActionProviders/AllChatsEditActionProvider.swift index 69eec2c86e..e802381c12 100644 --- a/Riot/Modules/ContextMenu/ActionProviders/AllChatsEditActionProvider.swift +++ b/Riot/Modules/ContextMenu/ActionProviders/AllChatsEditActionProvider.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import UIKit diff --git a/Riot/Modules/ContextMenu/ActionProviders/AllChatsSpaceActionProvider.swift b/Riot/Modules/ContextMenu/ActionProviders/AllChatsSpaceActionProvider.swift index 1d13e26de6..78a9ed9bfe 100644 --- a/Riot/Modules/ContextMenu/ActionProviders/AllChatsSpaceActionProvider.swift +++ b/Riot/Modules/ContextMenu/ActionProviders/AllChatsSpaceActionProvider.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import UIKit diff --git a/Riot/Modules/ContextMenu/ActionProviders/PublicRoomActionProvider.swift b/Riot/Modules/ContextMenu/ActionProviders/PublicRoomActionProvider.swift index c2d3407976..73dca11c26 100644 --- a/Riot/Modules/ContextMenu/ActionProviders/PublicRoomActionProvider.swift +++ b/Riot/Modules/ContextMenu/ActionProviders/PublicRoomActionProvider.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/ContextMenu/ActionProviders/RoomActionProvider.swift b/Riot/Modules/ContextMenu/ActionProviders/RoomActionProvider.swift index d9cde9dbe6..a62a74267d 100644 --- a/Riot/Modules/ContextMenu/ActionProviders/RoomActionProvider.swift +++ b/Riot/Modules/ContextMenu/ActionProviders/RoomActionProvider.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import UIKit diff --git a/Riot/Modules/ContextMenu/ActionProviders/RoomActionProviderProtocol.swift b/Riot/Modules/ContextMenu/ActionProviders/RoomActionProviderProtocol.swift index 21d5f6ef32..994a7e1ecd 100644 --- a/Riot/Modules/ContextMenu/ActionProviders/RoomActionProviderProtocol.swift +++ b/Riot/Modules/ContextMenu/ActionProviders/RoomActionProviderProtocol.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/ContextMenu/ActionProviders/SpaceChildActionProvider.swift b/Riot/Modules/ContextMenu/ActionProviders/SpaceChildActionProvider.swift index 97fd5efb41..48fc915f2c 100644 --- a/Riot/Modules/ContextMenu/ActionProviders/SpaceChildActionProvider.swift +++ b/Riot/Modules/ContextMenu/ActionProviders/SpaceChildActionProvider.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/ContextMenu/ContextMenuProviders/PublicRoomContextMenuProvider.swift b/Riot/Modules/ContextMenu/ContextMenuProviders/PublicRoomContextMenuProvider.swift index d305941105..cec4bfbf1c 100644 --- a/Riot/Modules/ContextMenu/ContextMenuProviders/PublicRoomContextMenuProvider.swift +++ b/Riot/Modules/ContextMenu/ContextMenuProviders/PublicRoomContextMenuProvider.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/ContextMenu/ContextMenuProviders/RecentCellContextMenuProvider.swift b/Riot/Modules/ContextMenu/ContextMenuProviders/RecentCellContextMenuProvider.swift index c696932dbe..be559bf328 100644 --- a/Riot/Modules/ContextMenu/ContextMenuProviders/RecentCellContextMenuProvider.swift +++ b/Riot/Modules/ContextMenu/ContextMenuProviders/RecentCellContextMenuProvider.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/ContextMenu/Services/RoomContextActionService.swift b/Riot/Modules/ContextMenu/Services/RoomContextActionService.swift index eb49328250..951861351e 100644 --- a/Riot/Modules/ContextMenu/Services/RoomContextActionService.swift +++ b/Riot/Modules/ContextMenu/Services/RoomContextActionService.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/ContextMenu/Services/RoomContextActionServiceProtocol.swift b/Riot/Modules/ContextMenu/Services/RoomContextActionServiceProtocol.swift index 25c66773f0..ca3d7e274d 100644 --- a/Riot/Modules/ContextMenu/Services/RoomContextActionServiceProtocol.swift +++ b/Riot/Modules/ContextMenu/Services/RoomContextActionServiceProtocol.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/ContextMenu/Services/UnownedRoomContextActionService.swift b/Riot/Modules/ContextMenu/Services/UnownedRoomContextActionService.swift index a23cc706c2..844e9e5d3a 100644 --- a/Riot/Modules/ContextMenu/Services/UnownedRoomContextActionService.swift +++ b/Riot/Modules/ContextMenu/Services/UnownedRoomContextActionService.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/ContextMenu/ViewModels/PublicRoomContextPreviewViewModel.swift b/Riot/Modules/ContextMenu/ViewModels/PublicRoomContextPreviewViewModel.swift index 72c0f2ba87..fc8fc3839c 100644 --- a/Riot/Modules/ContextMenu/ViewModels/PublicRoomContextPreviewViewModel.swift +++ b/Riot/Modules/ContextMenu/ViewModels/PublicRoomContextPreviewViewModel.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/ContextMenu/ViewModels/RoomContextPreviewViewModel.swift b/Riot/Modules/ContextMenu/ViewModels/RoomContextPreviewViewModel.swift index 8227fb33df..680af51a37 100644 --- a/Riot/Modules/ContextMenu/ViewModels/RoomContextPreviewViewModel.swift +++ b/Riot/Modules/ContextMenu/ViewModels/RoomContextPreviewViewModel.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/ContextMenu/ViewModels/RoomContextPreviewViewModels.swift b/Riot/Modules/ContextMenu/ViewModels/RoomContextPreviewViewModels.swift index 16867bd401..b28b01d837 100644 --- a/Riot/Modules/ContextMenu/ViewModels/RoomContextPreviewViewModels.swift +++ b/Riot/Modules/ContextMenu/ViewModels/RoomContextPreviewViewModels.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/ContextMenu/ViewModels/SpaceChildContextPreviewViewModel.swift b/Riot/Modules/ContextMenu/ViewModels/SpaceChildContextPreviewViewModel.swift index aaee237600..efffc1a82a 100644 --- a/Riot/Modules/ContextMenu/ViewModels/SpaceChildContextPreviewViewModel.swift +++ b/Riot/Modules/ContextMenu/ViewModels/SpaceChildContextPreviewViewModel.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/CreateRoom/EnterNewRoomDetails/Cells/ChooseAvatarTableViewCell.swift b/Riot/Modules/CreateRoom/EnterNewRoomDetails/Cells/ChooseAvatarTableViewCell.swift index 336e4b0fc4..3500a4b448 100644 --- a/Riot/Modules/CreateRoom/EnterNewRoomDetails/Cells/ChooseAvatarTableViewCell.swift +++ b/Riot/Modules/CreateRoom/EnterNewRoomDetails/Cells/ChooseAvatarTableViewCell.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import UIKit diff --git a/Riot/Modules/CreateRoom/EnterNewRoomDetails/Cells/ChooseAvatarTableViewCellVM.swift b/Riot/Modules/CreateRoom/EnterNewRoomDetails/Cells/ChooseAvatarTableViewCellVM.swift index d9b43ba56f..538a697128 100644 --- a/Riot/Modules/CreateRoom/EnterNewRoomDetails/Cells/ChooseAvatarTableViewCellVM.swift +++ b/Riot/Modules/CreateRoom/EnterNewRoomDetails/Cells/ChooseAvatarTableViewCellVM.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/CreateRoom/Models/RoomCreationParameters.swift b/Riot/Modules/CreateRoom/Models/RoomCreationParameters.swift index 311234c276..2697a55cd8 100644 --- a/Riot/Modules/CreateRoom/Models/RoomCreationParameters.swift +++ b/Riot/Modules/CreateRoom/Models/RoomCreationParameters.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/CrossSigning/Banners/CrossSigningBannerPreferences.swift b/Riot/Modules/CrossSigning/Banners/CrossSigningBannerPreferences.swift index 56565a81c9..7e20353ef1 100644 --- a/Riot/Modules/CrossSigning/Banners/CrossSigningBannerPreferences.swift +++ b/Riot/Modules/CrossSigning/Banners/CrossSigningBannerPreferences.swift @@ -1,17 +1,8 @@ /* - Copyright 2020 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2020-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Modules/CrossSigning/Banners/CrossSigningSetupBannerCell.swift b/Riot/Modules/CrossSigning/Banners/CrossSigningSetupBannerCell.swift index 1fceaf1400..f8ec3ed14a 100644 --- a/Riot/Modules/CrossSigning/Banners/CrossSigningSetupBannerCell.swift +++ b/Riot/Modules/CrossSigning/Banners/CrossSigningSetupBannerCell.swift @@ -1,17 +1,8 @@ /* - Copyright 2020 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2020-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import UIKit diff --git a/Riot/Modules/CrossSigning/CrossSigningService.swift b/Riot/Modules/CrossSigning/CrossSigningService.swift index a4df60aaae..cab22cb071 100644 --- a/Riot/Modules/CrossSigning/CrossSigningService.swift +++ b/Riot/Modules/CrossSigning/CrossSigningService.swift @@ -1,17 +1,8 @@ /* - Copyright 2020 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2020-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Modules/CrossSigning/Setup/CrossSigningSetupCoordinator.swift b/Riot/Modules/CrossSigning/Setup/CrossSigningSetupCoordinator.swift index 2877de09d7..54f9329a0d 100644 --- a/Riot/Modules/CrossSigning/Setup/CrossSigningSetupCoordinator.swift +++ b/Riot/Modules/CrossSigning/Setup/CrossSigningSetupCoordinator.swift @@ -45,7 +45,11 @@ final class CrossSigningSetupCoordinator: CrossSigningSetupCoordinatorType { // MARK: - Public methods func start() { - self.showReauthentication() + // Tchap: launch classic crossiging without authentication parameters + // to trigger real requets to backend, with real keys. + // This will trigger a 401 reponse that will launch the SSO reauthentication. +// self.showReauthentication() + self.setupCrossSigning(with: [:]) } func toPresentable() -> UIViewController { @@ -71,6 +75,24 @@ final class CrossSigningSetupCoordinator: CrossSigningSetupCoordinatorType { coordinator.start() } + // Tchap: reauthenticate with session information (used by SSO reauthentication) + private func showReauthentication(with session: MXAuthenticationSession) { + + let setupCrossSigningRequest = self.crossSigningService.setupCrossSigningRequest() + + let reauthenticationParameters = ReauthenticationCoordinatorParameters(session: parameters.session, + presenter: parameters.presenter, + title: parameters.title, + message: parameters.message, + authenticationSession: session) + + let coordinator = ReauthenticationCoordinator(parameters: reauthenticationParameters) + coordinator.delegate = self + self.add(childCoordinator: coordinator) + + coordinator.start() + } + private func setupCrossSigning(with authenticationParameters: [String: Any]) { guard let crossSigning = self.parameters.session.crypto?.crossSigning else { return @@ -85,7 +107,18 @@ final class CrossSigningSetupCoordinator: CrossSigningSetupCoordinatorType { guard let self = self else { return } - self.delegate?.crossSigningSetupCoordinator(self, didFailWithError: error) + + // Tchap: handle 'authentication requested' error (401) from backend +// self.delegate?.crossSigningSetupCoordinator(self, didFailWithError: error) + let nsError = error as NSError + if let jsonResponse = nsError.userInfo[MXHTTPClientErrorResponseDataKey] as? [AnyHashable: Any], + let authenticationSession = MXAuthenticationSession(fromJSON: jsonResponse) { + self.showReauthentication(with: authenticationSession) + } + else { + self.delegate?.crossSigningSetupCoordinator(self, didFailWithError: error) + } + } } } diff --git a/Riot/Modules/CrossSigning/Setup/CrossSigningSetupCoordinatorParameters.swift b/Riot/Modules/CrossSigning/Setup/CrossSigningSetupCoordinatorParameters.swift index a2918dee45..48871aa129 100644 --- a/Riot/Modules/CrossSigning/Setup/CrossSigningSetupCoordinatorParameters.swift +++ b/Riot/Modules/CrossSigning/Setup/CrossSigningSetupCoordinatorParameters.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/DeepLink/CustomSchemeURLConstants.swift b/Riot/Modules/DeepLink/CustomSchemeURLConstants.swift index 6393592f2c..d8eedfaf59 100644 --- a/Riot/Modules/DeepLink/CustomSchemeURLConstants.swift +++ b/Riot/Modules/DeepLink/CustomSchemeURLConstants.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/DeepLink/CustomSchemeURLParser.swift b/Riot/Modules/DeepLink/CustomSchemeURLParser.swift index 5da141a30a..56e4c8bea0 100644 --- a/Riot/Modules/DeepLink/CustomSchemeURLParser.swift +++ b/Riot/Modules/DeepLink/CustomSchemeURLParser.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/DeepLink/DeepLinkOption.swift b/Riot/Modules/DeepLink/DeepLinkOption.swift index 1799be5888..4cea5f0611 100644 --- a/Riot/Modules/DeepLink/DeepLinkOption.swift +++ b/Riot/Modules/DeepLink/DeepLinkOption.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/DeepLink/MXRoomAliasResolution+Deeplink.swift b/Riot/Modules/DeepLink/MXRoomAliasResolution+Deeplink.swift index ddded6927a..0792c2cab1 100644 --- a/Riot/Modules/DeepLink/MXRoomAliasResolution+Deeplink.swift +++ b/Riot/Modules/DeepLink/MXRoomAliasResolution+Deeplink.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/DeepLink/UniversalLinkParameters.swift b/Riot/Modules/DeepLink/UniversalLinkParameters.swift index 339ecb82e5..141257b2db 100644 --- a/Riot/Modules/DeepLink/UniversalLinkParameters.swift +++ b/Riot/Modules/DeepLink/UniversalLinkParameters.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/DotsView/DotsView.swift b/Riot/Modules/DotsView/DotsView.swift index adcf3ef491..b7b91a632d 100644 --- a/Riot/Modules/DotsView/DotsView.swift +++ b/Riot/Modules/DotsView/DotsView.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import UIKit diff --git a/Riot/Modules/Encryption/EncryptionInfo/EncryptionInfoView.h b/Riot/Modules/Encryption/EncryptionInfo/EncryptionInfoView.h index ce61e04c40..b02a855332 100644 --- a/Riot/Modules/Encryption/EncryptionInfo/EncryptionInfoView.h +++ b/Riot/Modules/Encryption/EncryptionInfo/EncryptionInfoView.h @@ -1,17 +1,9 @@ /* - Copyright 2016 OpenMarket Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2016 OpenMarket Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "MatrixKit.h" diff --git a/Riot/Modules/Encryption/EncryptionInfo/EncryptionInfoView.m b/Riot/Modules/Encryption/EncryptionInfo/EncryptionInfoView.m index da56f1b66c..2abf294392 100644 --- a/Riot/Modules/Encryption/EncryptionInfo/EncryptionInfoView.m +++ b/Riot/Modules/Encryption/EncryptionInfo/EncryptionInfoView.m @@ -1,18 +1,10 @@ /* - Copyright 2016 OpenMarket Ltd - Copyright 2017 Vector Creations Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd +Copyright 2016 OpenMarket Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "EncryptionInfoView.h" diff --git a/Riot/Modules/Encryption/EncryptionTrustLevel.swift b/Riot/Modules/Encryption/EncryptionTrustLevel.swift index 275d74ffc4..9de437e449 100644 --- a/Riot/Modules/Encryption/EncryptionTrustLevel.swift +++ b/Riot/Modules/Encryption/EncryptionTrustLevel.swift @@ -1,17 +1,8 @@ // -// Copyright 2023 New Vector Ltd +// Copyright 2023, 2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Encryption/EncryptionTrustLevelBadgeImageHelper.swift b/Riot/Modules/Encryption/EncryptionTrustLevelBadgeImageHelper.swift index 25c00fc3e9..94219c0831 100644 --- a/Riot/Modules/Encryption/EncryptionTrustLevelBadgeImageHelper.swift +++ b/Riot/Modules/Encryption/EncryptionTrustLevelBadgeImageHelper.swift @@ -1,17 +1,8 @@ /* - Copyright 2020 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2020-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import UIKit diff --git a/Riot/Modules/Encryption/RoomEncryptionTrustLevel.h b/Riot/Modules/Encryption/RoomEncryptionTrustLevel.h index a942f53606..95bae5b3a4 100644 --- a/Riot/Modules/Encryption/RoomEncryptionTrustLevel.h +++ b/Riot/Modules/Encryption/RoomEncryptionTrustLevel.h @@ -1,17 +1,8 @@ // -// Copyright 2023 New Vector Ltd +// Copyright 2023, 2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // /** diff --git a/Riot/Modules/Encryption/UserEncryptionTrustLevel.h b/Riot/Modules/Encryption/UserEncryptionTrustLevel.h index ea21544636..c028184d52 100644 --- a/Riot/Modules/Encryption/UserEncryptionTrustLevel.h +++ b/Riot/Modules/Encryption/UserEncryptionTrustLevel.h @@ -1,17 +1,8 @@ /* - Copyright 2020 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2020-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ @import Foundation; diff --git a/Riot/Modules/Favorites/FavouritesViewController.h b/Riot/Modules/Favorites/FavouritesViewController.h index fc0e35bab5..5c1bae6a14 100644 --- a/Riot/Modules/Favorites/FavouritesViewController.h +++ b/Riot/Modules/Favorites/FavouritesViewController.h @@ -1,17 +1,9 @@ /* - Copyright 2017 Vector Creations Ltd +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "RecentsViewController.h" diff --git a/Riot/Modules/Favorites/FavouritesViewController.m b/Riot/Modules/Favorites/FavouritesViewController.m index 35da9a0e64..2a96931aa5 100644 --- a/Riot/Modules/Favorites/FavouritesViewController.m +++ b/Riot/Modules/Favorites/FavouritesViewController.m @@ -1,17 +1,9 @@ /* - Copyright 2017 Vector Creations Ltd +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "FavouritesViewController.h" diff --git a/Riot/Modules/GDPR/GDPRConsentViewController.swift b/Riot/Modules/GDPR/GDPRConsentViewController.swift index 8ad4b7ac7e..fb06f3789d 100644 --- a/Riot/Modules/GDPR/GDPRConsentViewController.swift +++ b/Riot/Modules/GDPR/GDPRConsentViewController.swift @@ -1,17 +1,8 @@ /* - Copyright 2018 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2018-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Modules/GlobalSearch/DataSources/UnifiedSearchRecentsDataSource.m b/Riot/Modules/GlobalSearch/DataSources/UnifiedSearchRecentsDataSource.m index 35ad5be47c..ad8ab82614 100644 --- a/Riot/Modules/GlobalSearch/DataSources/UnifiedSearchRecentsDataSource.m +++ b/Riot/Modules/GlobalSearch/DataSources/UnifiedSearchRecentsDataSource.m @@ -1,17 +1,9 @@ /* - Copyright 2017 Vector Creations Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "UnifiedSearchRecentsDataSource.h" diff --git a/Riot/Modules/GlobalSearch/Files/CellData/FilesSearchCellData.h b/Riot/Modules/GlobalSearch/Files/CellData/FilesSearchCellData.h index 15832ca551..bb08180cbc 100644 --- a/Riot/Modules/GlobalSearch/Files/CellData/FilesSearchCellData.h +++ b/Riot/Modules/GlobalSearch/Files/CellData/FilesSearchCellData.h @@ -1,17 +1,9 @@ /* - Copyright 2016 OpenMarket Ltd +Copyright 2024 New Vector Ltd. +Copyright 2016 OpenMarket Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "MatrixKit.h" diff --git a/Riot/Modules/GlobalSearch/Files/CellData/FilesSearchCellData.m b/Riot/Modules/GlobalSearch/Files/CellData/FilesSearchCellData.m index f0526a01d6..343d204c29 100644 --- a/Riot/Modules/GlobalSearch/Files/CellData/FilesSearchCellData.m +++ b/Riot/Modules/GlobalSearch/Files/CellData/FilesSearchCellData.m @@ -1,19 +1,10 @@ /* - Copyright 2016 OpenMarket Ltd - Copyright 2017 Vector Creations Ltd - Copyright 2018 New Vector Ltd +Copyright 2018-2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd +Copyright 2016 OpenMarket Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "FilesSearchCellData.h" diff --git a/Riot/Modules/GlobalSearch/Files/HomeFilesSearchViewController.h b/Riot/Modules/GlobalSearch/Files/HomeFilesSearchViewController.h index e628ec7db4..9de6271f6b 100644 --- a/Riot/Modules/GlobalSearch/Files/HomeFilesSearchViewController.h +++ b/Riot/Modules/GlobalSearch/Files/HomeFilesSearchViewController.h @@ -1,17 +1,9 @@ /* - Copyright 2016 OpenMarket Ltd +Copyright 2024 New Vector Ltd. +Copyright 2016 OpenMarket Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ diff --git a/Riot/Modules/GlobalSearch/Files/HomeFilesSearchViewController.m b/Riot/Modules/GlobalSearch/Files/HomeFilesSearchViewController.m index 151f9733dc..6b998ce6c6 100644 --- a/Riot/Modules/GlobalSearch/Files/HomeFilesSearchViewController.m +++ b/Riot/Modules/GlobalSearch/Files/HomeFilesSearchViewController.m @@ -1,18 +1,10 @@ /* - Copyright 2016 OpenMarket Ltd - Copyright 2017 Vector Creations Ltd +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd +Copyright 2016 OpenMarket Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "HomeFilesSearchViewController.h" diff --git a/Riot/Modules/GlobalSearch/Files/Views/FilesSearchTableViewCell.h b/Riot/Modules/GlobalSearch/Files/Views/FilesSearchTableViewCell.h index 01ebbbd036..9d5e9eb4ea 100644 --- a/Riot/Modules/GlobalSearch/Files/Views/FilesSearchTableViewCell.h +++ b/Riot/Modules/GlobalSearch/Files/Views/FilesSearchTableViewCell.h @@ -1,17 +1,9 @@ /* - Copyright 2016 OpenMarket Ltd +Copyright 2024 New Vector Ltd. +Copyright 2016 OpenMarket Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "MatrixKit.h" diff --git a/Riot/Modules/GlobalSearch/Files/Views/FilesSearchTableViewCell.m b/Riot/Modules/GlobalSearch/Files/Views/FilesSearchTableViewCell.m index 78d69441b3..607d445c25 100644 --- a/Riot/Modules/GlobalSearch/Files/Views/FilesSearchTableViewCell.m +++ b/Riot/Modules/GlobalSearch/Files/Views/FilesSearchTableViewCell.m @@ -1,19 +1,10 @@ /* - Copyright 2016 OpenMarket Ltd - Copyright 2017 Vector Creations Ltd - Copyright 2018 New Vector Ltd +Copyright 2018-2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd +Copyright 2016 OpenMarket Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "FilesSearchTableViewCell.h" diff --git a/Riot/Modules/GlobalSearch/Messages/DataSources/HomeMessagesSearchDataSource.h b/Riot/Modules/GlobalSearch/Messages/DataSources/HomeMessagesSearchDataSource.h index 1f1136942c..6a72d4a573 100644 --- a/Riot/Modules/GlobalSearch/Messages/DataSources/HomeMessagesSearchDataSource.h +++ b/Riot/Modules/GlobalSearch/Messages/DataSources/HomeMessagesSearchDataSource.h @@ -1,17 +1,9 @@ /* - Copyright 2016 OpenMarket Ltd +Copyright 2024 New Vector Ltd. +Copyright 2016 OpenMarket Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "MatrixKit.h" diff --git a/Riot/Modules/GlobalSearch/Messages/DataSources/HomeMessagesSearchDataSource.m b/Riot/Modules/GlobalSearch/Messages/DataSources/HomeMessagesSearchDataSource.m index 1488377f5f..9e362926bc 100644 --- a/Riot/Modules/GlobalSearch/Messages/DataSources/HomeMessagesSearchDataSource.m +++ b/Riot/Modules/GlobalSearch/Messages/DataSources/HomeMessagesSearchDataSource.m @@ -1,19 +1,10 @@ /* - Copyright 2016 OpenMarket Ltd - Copyright 2017 Vector Creations Ltd - Copyright 2018 New Vector Ltd +Copyright 2018-2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd +Copyright 2016 OpenMarket Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "MatrixKit.h" diff --git a/Riot/Modules/GlobalSearch/Messages/HomeMessagesSearchViewController.h b/Riot/Modules/GlobalSearch/Messages/HomeMessagesSearchViewController.h index 0f28b4bef7..778bf8c463 100644 --- a/Riot/Modules/GlobalSearch/Messages/HomeMessagesSearchViewController.h +++ b/Riot/Modules/GlobalSearch/Messages/HomeMessagesSearchViewController.h @@ -1,17 +1,9 @@ /* - Copyright 2016 OpenMarket Ltd +Copyright 2024 New Vector Ltd. +Copyright 2016 OpenMarket Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ diff --git a/Riot/Modules/GlobalSearch/Messages/HomeMessagesSearchViewController.m b/Riot/Modules/GlobalSearch/Messages/HomeMessagesSearchViewController.m index 6be8de0e80..a3dcf93225 100644 --- a/Riot/Modules/GlobalSearch/Messages/HomeMessagesSearchViewController.m +++ b/Riot/Modules/GlobalSearch/Messages/HomeMessagesSearchViewController.m @@ -1,18 +1,10 @@ /* - Copyright 2016 OpenMarket Ltd - Copyright 2017 Vector Creations Ltd +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd +Copyright 2016 OpenMarket Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "HomeMessagesSearchViewController.h" diff --git a/Riot/Modules/GlobalSearch/Messages/Views/MessagesSearchResultAttachmentBubbleCell.h b/Riot/Modules/GlobalSearch/Messages/Views/MessagesSearchResultAttachmentBubbleCell.h index 709b25cfd1..c3db13026f 100644 --- a/Riot/Modules/GlobalSearch/Messages/Views/MessagesSearchResultAttachmentBubbleCell.h +++ b/Riot/Modules/GlobalSearch/Messages/Views/MessagesSearchResultAttachmentBubbleCell.h @@ -1,17 +1,9 @@ /* - Copyright 2016 OpenMarket Ltd +Copyright 2024 New Vector Ltd. +Copyright 2016 OpenMarket Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "MatrixKit.h" diff --git a/Riot/Modules/GlobalSearch/Messages/Views/MessagesSearchResultAttachmentBubbleCell.m b/Riot/Modules/GlobalSearch/Messages/Views/MessagesSearchResultAttachmentBubbleCell.m index 0e5a0312b9..ff658f9370 100644 --- a/Riot/Modules/GlobalSearch/Messages/Views/MessagesSearchResultAttachmentBubbleCell.m +++ b/Riot/Modules/GlobalSearch/Messages/Views/MessagesSearchResultAttachmentBubbleCell.m @@ -1,18 +1,10 @@ /* - Copyright 2016 OpenMarket Ltd - Copyright 2017 Vector Creations Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd +Copyright 2016 OpenMarket Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "MessagesSearchResultAttachmentBubbleCell.h" diff --git a/Riot/Modules/GlobalSearch/Messages/Views/MessagesSearchResultTextMsgBubbleCell.m b/Riot/Modules/GlobalSearch/Messages/Views/MessagesSearchResultTextMsgBubbleCell.m index 6b68de2fa1..39a74b6159 100644 --- a/Riot/Modules/GlobalSearch/Messages/Views/MessagesSearchResultTextMsgBubbleCell.m +++ b/Riot/Modules/GlobalSearch/Messages/Views/MessagesSearchResultTextMsgBubbleCell.m @@ -1,18 +1,10 @@ /* - Copyright 2016 OpenMarket Ltd - Copyright 2017 Vector Creations Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd +Copyright 2016 OpenMarket Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "MessagesSearchResultTextMsgBubbleCell.h" diff --git a/Riot/Modules/GlobalSearch/Rooms/DirectoryViewController.m b/Riot/Modules/GlobalSearch/Rooms/DirectoryViewController.m index 020dc624f5..66f9f8ea7a 100644 --- a/Riot/Modules/GlobalSearch/Rooms/DirectoryViewController.m +++ b/Riot/Modules/GlobalSearch/Rooms/DirectoryViewController.m @@ -1,18 +1,10 @@ /* - Copyright 2015 OpenMarket Ltd - Copyright 2017 Vector Creations Ltd +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd +Copyright 2015 OpenMarket Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "DirectoryViewController.h" diff --git a/Riot/Modules/GlobalSearch/UnifiedSearchViewController.h b/Riot/Modules/GlobalSearch/UnifiedSearchViewController.h index 72fddaef67..19d2e1ce61 100644 --- a/Riot/Modules/GlobalSearch/UnifiedSearchViewController.h +++ b/Riot/Modules/GlobalSearch/UnifiedSearchViewController.h @@ -1,17 +1,9 @@ /* - Copyright 2017 Vector Creations Ltd +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "SegmentedViewController.h" diff --git a/Riot/Modules/GlobalSearch/UnifiedSearchViewController.m b/Riot/Modules/GlobalSearch/UnifiedSearchViewController.m index 94ae50f5a2..0fdaec4ab3 100644 --- a/Riot/Modules/GlobalSearch/UnifiedSearchViewController.m +++ b/Riot/Modules/GlobalSearch/UnifiedSearchViewController.m @@ -1,17 +1,9 @@ /* - Copyright 2017 Vector Creations Ltd +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "UnifiedSearchViewController.h" diff --git a/Riot/Modules/GlobalSearch/Views/DirectoryRecentTableViewCell.h b/Riot/Modules/GlobalSearch/Views/DirectoryRecentTableViewCell.h index 04266edb65..5605f338d1 100644 --- a/Riot/Modules/GlobalSearch/Views/DirectoryRecentTableViewCell.h +++ b/Riot/Modules/GlobalSearch/Views/DirectoryRecentTableViewCell.h @@ -1,17 +1,9 @@ /* - Copyright 2015 OpenMarket Ltd +Copyright 2024 New Vector Ltd. +Copyright 2015 OpenMarket Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "MatrixKit.h" diff --git a/Riot/Modules/GlobalSearch/Views/DirectoryRecentTableViewCell.m b/Riot/Modules/GlobalSearch/Views/DirectoryRecentTableViewCell.m index 1042d8265d..a26824128f 100644 --- a/Riot/Modules/GlobalSearch/Views/DirectoryRecentTableViewCell.m +++ b/Riot/Modules/GlobalSearch/Views/DirectoryRecentTableViewCell.m @@ -1,18 +1,10 @@ /* - Copyright 2015 OpenMarket Ltd - Copyright 2017 Vector Creations Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd +Copyright 2015 OpenMarket Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "DirectoryRecentTableViewCell.h" diff --git a/Riot/Modules/GlobalSearch/Views/RoomIdOrAliasTableViewCell.h b/Riot/Modules/GlobalSearch/Views/RoomIdOrAliasTableViewCell.h index 36d0822554..d595efff38 100644 --- a/Riot/Modules/GlobalSearch/Views/RoomIdOrAliasTableViewCell.h +++ b/Riot/Modules/GlobalSearch/Views/RoomIdOrAliasTableViewCell.h @@ -1,17 +1,9 @@ /* - Copyright 2016 OpenMarket Ltd +Copyright 2024 New Vector Ltd. +Copyright 2016 OpenMarket Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "MatrixKit.h" diff --git a/Riot/Modules/GlobalSearch/Views/RoomIdOrAliasTableViewCell.m b/Riot/Modules/GlobalSearch/Views/RoomIdOrAliasTableViewCell.m index 820f2ac030..6c42eea79e 100644 --- a/Riot/Modules/GlobalSearch/Views/RoomIdOrAliasTableViewCell.m +++ b/Riot/Modules/GlobalSearch/Views/RoomIdOrAliasTableViewCell.m @@ -1,18 +1,10 @@ /* - Copyright 2016 OpenMarket Ltd - Copyright 2017 Vector Creations Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd +Copyright 2016 OpenMarket Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "RoomIdOrAliasTableViewCell.h" diff --git a/Riot/Modules/Home/AllChats/AllChatsCoordinator.swift b/Riot/Modules/Home/AllChats/AllChatsCoordinator.swift index e25823cead..6da6e4227f 100644 --- a/Riot/Modules/Home/AllChats/AllChatsCoordinator.swift +++ b/Riot/Modules/Home/AllChats/AllChatsCoordinator.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Home/AllChats/AllChatsFilterOptions.swift b/Riot/Modules/Home/AllChats/AllChatsFilterOptions.swift index 14c63b79f9..43567dd430 100644 --- a/Riot/Modules/Home/AllChats/AllChatsFilterOptions.swift +++ b/Riot/Modules/Home/AllChats/AllChatsFilterOptions.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Home/AllChats/AllChatsLayoutModels.h b/Riot/Modules/Home/AllChats/AllChatsLayoutModels.h index 5583ebff62..b8a358fa8b 100644 --- a/Riot/Modules/Home/AllChats/AllChatsLayoutModels.h +++ b/Riot/Modules/Home/AllChats/AllChatsLayoutModels.h @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // #ifndef AllChatsLayoutModels_h diff --git a/Riot/Modules/Home/AllChats/AllChatsLayoutSettings.swift b/Riot/Modules/Home/AllChats/AllChatsLayoutSettings.swift index c13fd1fee0..cf99956476 100644 --- a/Riot/Modules/Home/AllChats/AllChatsLayoutSettings.swift +++ b/Riot/Modules/Home/AllChats/AllChatsLayoutSettings.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Home/AllChats/AllChatsLayoutSettingsManager.swift b/Riot/Modules/Home/AllChats/AllChatsLayoutSettingsManager.swift index 33b1ee3352..5b9baef691 100644 --- a/Riot/Modules/Home/AllChats/AllChatsLayoutSettingsManager.swift +++ b/Riot/Modules/Home/AllChats/AllChatsLayoutSettingsManager.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Home/AllChats/AllChatsViewController.swift b/Riot/Modules/Home/AllChats/AllChatsViewController.swift index 0efb816e23..0822932ce4 100644 --- a/Riot/Modules/Home/AllChats/AllChatsViewController.swift +++ b/Riot/Modules/Home/AllChats/AllChatsViewController.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // // swiftlint:disable file_length @@ -107,8 +98,6 @@ class AllChatsViewController: HomeViewController { // Reference to the current onboarding flow. It is always nil unless the flow is being presented. private(set) var onboardingCoordinatorBridgePresenter: OnboardingCoordinatorBridgePresenter? - // Tchap: Use welcomeCoordinator instead of onboardingCoordinator - private(set) var welcomeCoordinatorBridgePresenter: WelcomeCoordinatorBridgePresenter? // Tell whether the onboarding screen is preparing. private(set) var isOnboardingInProgress: Bool = false @@ -921,8 +910,7 @@ extension AllChatsViewController: SplitViewMasterViewControllerProtocol { // This method can be called after the user chooses to clear their data as the MXSession // is opened to call logout from. So we only set the credentials when authentication isn't // in progress to prevent a second soft logout screen being shown. - // Tchap: Use WelcomeCoordinatorBridgePresenter instead of OnboardingCoordinatorBridgePresenter - guard self.welcomeCoordinatorBridgePresenter == nil && !self.isOnboardingCoordinatorPreparing else { + guard self.self.onboardingCoordinatorBridgePresenter == nil && !self.isOnboardingCoordinatorPreparing else { return } @@ -1092,8 +1080,7 @@ extension AllChatsViewController: SplitViewMasterViewControllerProtocol { private func showOnboardingFlowAndResetSessionFlags(_ resetSessionFlags: Bool) { // Check whether an authentication screen is not already shown or preparing - // Tchap: Use WelcomeCoordinatorBridgePresenter instead of OnboardingCoordinatorBridgePresenter - guard self.welcomeCoordinatorBridgePresenter == nil && !self.isOnboardingCoordinatorPreparing else { + guard self.self.onboardingCoordinatorBridgePresenter == nil && !self.isOnboardingCoordinatorPreparing else { return } @@ -1117,36 +1104,36 @@ extension AllChatsViewController: SplitViewMasterViewControllerProtocol { MXLog.debug("[AllChatsViewController] presentOnboardingFlow") // Tchap: Use WelcomeCoordinatorBridgePresenter instead of OnboardingCoordinatorBridgePresenter - let welcomeCoordinatorBridgePresenter = WelcomeCoordinatorBridgePresenter() - welcomeCoordinatorBridgePresenter.completion = { [weak self] in - guard let self = self else { return } - - self.welcomeCoordinatorBridgePresenter?.dismiss(animated: true, completion: { - self.welcomeCoordinatorBridgePresenter = nil - }) - - self.isOnboardingInProgress = false // Must be set before calling didCompleteAuthentication - self.allChatsDelegate?.allChatsViewControllerDidCompleteAuthentication(self) - } - - welcomeCoordinatorBridgePresenter.present(from: self, animated: true) - self.welcomeCoordinatorBridgePresenter = welcomeCoordinatorBridgePresenter - - -// let onboardingCoordinatorBridgePresenter = OnboardingCoordinatorBridgePresenter() -// onboardingCoordinatorBridgePresenter.completion = { [weak self] in +// let welcomeCoordinatorBridgePresenter = WelcomeCoordinatorBridgePresenter() +// welcomeCoordinatorBridgePresenter.completion = { [weak self] in // guard let self = self else { return } -// -// self.onboardingCoordinatorBridgePresenter?.dismiss(animated: true, completion: { -// self.onboardingCoordinatorBridgePresenter = nil +// +// self.welcomeCoordinatorBridgePresenter?.dismiss(animated: true, completion: { +// self.welcomeCoordinatorBridgePresenter = nil // }) // // self.isOnboardingInProgress = false // Must be set before calling didCompleteAuthentication // self.allChatsDelegate?.allChatsViewControllerDidCompleteAuthentication(self) // } // -// onboardingCoordinatorBridgePresenter.present(from: self, animated: true) -// self.onboardingCoordinatorBridgePresenter = onboardingCoordinatorBridgePresenter +// welcomeCoordinatorBridgePresenter.present(from: self, animated: true) +// self.welcomeCoordinatorBridgePresenter = welcomeCoordinatorBridgePresenter + + + let onboardingCoordinatorBridgePresenter = OnboardingCoordinatorBridgePresenter() + onboardingCoordinatorBridgePresenter.completion = { [weak self] in + guard let self = self else { return } + + self.onboardingCoordinatorBridgePresenter?.dismiss(animated: true, completion: { + self.onboardingCoordinatorBridgePresenter = nil + }) + + self.isOnboardingInProgress = false // Must be set before calling didCompleteAuthentication + self.allChatsDelegate?.allChatsViewControllerDidCompleteAuthentication(self) + } + + onboardingCoordinatorBridgePresenter.present(from: self, animated: true) + self.onboardingCoordinatorBridgePresenter = onboardingCoordinatorBridgePresenter self.isOnboardingCoordinatorPreparing = false } diff --git a/Riot/Modules/Home/AllChats/ReviewSessionAlertSnoozeController.swift b/Riot/Modules/Home/AllChats/ReviewSessionAlertSnoozeController.swift index e87dedd34d..39a7446770 100644 --- a/Riot/Modules/Home/AllChats/ReviewSessionAlertSnoozeController.swift +++ b/Riot/Modules/Home/AllChats/ReviewSessionAlertSnoozeController.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Home/AllChats/RoomInvitesViewController.swift b/Riot/Modules/Home/AllChats/RoomInvitesViewController.swift index e912d491e8..a6351c81f6 100644 --- a/Riot/Modules/Home/AllChats/RoomInvitesViewController.swift +++ b/Riot/Modules/Home/AllChats/RoomInvitesViewController.swift @@ -1,17 +1,8 @@ // -// Copyright 2022 New Vector Ltd +// Copyright 2022-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Home/ContextMenuSnapshotPreviewViewController.swift b/Riot/Modules/Home/ContextMenuSnapshotPreviewViewController.swift index fc418913ba..d0fe92513e 100644 --- a/Riot/Modules/Home/ContextMenuSnapshotPreviewViewController.swift +++ b/Riot/Modules/Home/ContextMenuSnapshotPreviewViewController.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import UIKit diff --git a/Riot/Modules/Home/Fallback/AuthFallBackViewController.h b/Riot/Modules/Home/Fallback/AuthFallBackViewController.h index 97f868f1ff..6aa3897253 100644 --- a/Riot/Modules/Home/Fallback/AuthFallBackViewController.h +++ b/Riot/Modules/Home/Fallback/AuthFallBackViewController.h @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd +Copyright 2019-2024 New Vector Ltd. - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "WebViewViewController.h" diff --git a/Riot/Modules/Home/Fallback/AuthFallBackViewController.m b/Riot/Modules/Home/Fallback/AuthFallBackViewController.m index 78b66dd804..b8d1131d63 100644 --- a/Riot/Modules/Home/Fallback/AuthFallBackViewController.m +++ b/Riot/Modules/Home/Fallback/AuthFallBackViewController.m @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd +Copyright 2019-2024 New Vector Ltd. - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "AuthFallBackViewController.h" diff --git a/Riot/Modules/Home/HomeViewController.h b/Riot/Modules/Home/HomeViewController.h index 842b79eb9a..f367d0860a 100644 --- a/Riot/Modules/Home/HomeViewController.h +++ b/Riot/Modules/Home/HomeViewController.h @@ -1,18 +1,10 @@ /* - Copyright 2015 OpenMarket Ltd - Copyright 2017 Vector Creations Ltd +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd +Copyright 2015 OpenMarket Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "RecentsViewController.h" diff --git a/Riot/Modules/Home/HomeViewController.m b/Riot/Modules/Home/HomeViewController.m index d522873c2b..56745dac76 100644 --- a/Riot/Modules/Home/HomeViewController.m +++ b/Riot/Modules/Home/HomeViewController.m @@ -1,18 +1,10 @@ /* - Copyright 2015 OpenMarket Ltd - Copyright 2017 Vector Creations Ltd +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd +Copyright 2015 OpenMarket Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "HomeViewController.h" diff --git a/Riot/Modules/Home/VersionCheck/BannerPresentationProtocol.swift b/Riot/Modules/Home/VersionCheck/BannerPresentationProtocol.swift index 71694dfae1..c530c70484 100644 --- a/Riot/Modules/Home/VersionCheck/BannerPresentationProtocol.swift +++ b/Riot/Modules/Home/VersionCheck/BannerPresentationProtocol.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Home/VersionCheck/HomeViewControllerWithBannerWrapperViewController.swift b/Riot/Modules/Home/VersionCheck/HomeViewControllerWithBannerWrapperViewController.swift index 14c95b33bc..ae992a7579 100644 --- a/Riot/Modules/Home/VersionCheck/HomeViewControllerWithBannerWrapperViewController.swift +++ b/Riot/Modules/Home/VersionCheck/HomeViewControllerWithBannerWrapperViewController.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Home/VersionCheck/VersionCheckAlertViewController.swift b/Riot/Modules/Home/VersionCheck/VersionCheckAlertViewController.swift index 509cff84dd..46810d73a3 100644 --- a/Riot/Modules/Home/VersionCheck/VersionCheckAlertViewController.swift +++ b/Riot/Modules/Home/VersionCheck/VersionCheckAlertViewController.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import UIKit diff --git a/Riot/Modules/Home/VersionCheck/VersionCheckBannerView.swift b/Riot/Modules/Home/VersionCheck/VersionCheckBannerView.swift index 37d33b43e2..a438ae3ed9 100644 --- a/Riot/Modules/Home/VersionCheck/VersionCheckBannerView.swift +++ b/Riot/Modules/Home/VersionCheck/VersionCheckBannerView.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import UIKit diff --git a/Riot/Modules/Home/VersionCheck/VersionCheckCoordinator.swift b/Riot/Modules/Home/VersionCheck/VersionCheckCoordinator.swift index 728ca119d0..7e957d5669 100644 --- a/Riot/Modules/Home/VersionCheck/VersionCheckCoordinator.swift +++ b/Riot/Modules/Home/VersionCheck/VersionCheckCoordinator.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Home/Views/AccessibleCollectionView.swift b/Riot/Modules/Home/Views/AccessibleCollectionView.swift index 9ac0d1f160..1a54e407e0 100644 --- a/Riot/Modules/Home/Views/AccessibleCollectionView.swift +++ b/Riot/Modules/Home/Views/AccessibleCollectionView.swift @@ -1,17 +1,8 @@ // -// Copyright 2021 New Vector Ltd +// Copyright 2021-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import UIKit diff --git a/Riot/Modules/Home/Views/RoomCollectionViewCell.h b/Riot/Modules/Home/Views/RoomCollectionViewCell.h index 6145241874..e34e16936a 100644 --- a/Riot/Modules/Home/Views/RoomCollectionViewCell.h +++ b/Riot/Modules/Home/Views/RoomCollectionViewCell.h @@ -1,17 +1,9 @@ /* - Copyright 2017 Vector Creations Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "MatrixKit.h" diff --git a/Riot/Modules/Home/Views/RoomCollectionViewCell.m b/Riot/Modules/Home/Views/RoomCollectionViewCell.m index 30839e1aaa..2c36df5d6e 100644 --- a/Riot/Modules/Home/Views/RoomCollectionViewCell.m +++ b/Riot/Modules/Home/Views/RoomCollectionViewCell.m @@ -1,17 +1,9 @@ /* - Copyright 2017 Vector Creations Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "RoomCollectionViewCell.h" diff --git a/Riot/Modules/Home/Views/TableViewCellWithCollectionView.h b/Riot/Modules/Home/Views/TableViewCellWithCollectionView.h index 832037a88d..989428421b 100644 --- a/Riot/Modules/Home/Views/TableViewCellWithCollectionView.h +++ b/Riot/Modules/Home/Views/TableViewCellWithCollectionView.h @@ -1,17 +1,9 @@ /* - Copyright 2017 Vector Creations Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "MatrixKit.h" diff --git a/Riot/Modules/Home/Views/TableViewCellWithCollectionView.m b/Riot/Modules/Home/Views/TableViewCellWithCollectionView.m index 4cc08d8726..a2accb5ebe 100644 --- a/Riot/Modules/Home/Views/TableViewCellWithCollectionView.m +++ b/Riot/Modules/Home/Views/TableViewCellWithCollectionView.m @@ -1,17 +1,9 @@ /* - Copyright 2017 Vector Creations Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "TableViewCellWithCollectionView.h" diff --git a/Riot/Modules/Integrations/IntegrationManagerViewController.h b/Riot/Modules/Integrations/IntegrationManagerViewController.h index 8edc670ceb..6f3261b35c 100644 --- a/Riot/Modules/Integrations/IntegrationManagerViewController.h +++ b/Riot/Modules/Integrations/IntegrationManagerViewController.h @@ -1,17 +1,9 @@ /* - Copyright 2017 Vector Creations Ltd +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "WidgetViewController.h" diff --git a/Riot/Modules/Integrations/IntegrationManagerViewController.m b/Riot/Modules/Integrations/IntegrationManagerViewController.m index d67628d62e..d97a0d43bf 100644 --- a/Riot/Modules/Integrations/IntegrationManagerViewController.m +++ b/Riot/Modules/Integrations/IntegrationManagerViewController.m @@ -1,18 +1,9 @@ /* - Copyright 2017 Vector Creations Ltd - Copyright 2019 New Vector Ltd +Copyright 2019-2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "IntegrationManagerViewController.h" diff --git a/Riot/Modules/Integrations/WidgetPermission/WidgetPermissionViewModel.swift b/Riot/Modules/Integrations/WidgetPermission/WidgetPermissionViewModel.swift index 55f52ade23..1c9eacd0a4 100644 --- a/Riot/Modules/Integrations/WidgetPermission/WidgetPermissionViewModel.swift +++ b/Riot/Modules/Integrations/WidgetPermission/WidgetPermissionViewModel.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Modules/Integrations/WidgetPicker/WidgetPickerViewController.h b/Riot/Modules/Integrations/WidgetPicker/WidgetPickerViewController.h index 0396a55f04..1ab1b00b05 100644 --- a/Riot/Modules/Integrations/WidgetPicker/WidgetPickerViewController.h +++ b/Riot/Modules/Integrations/WidgetPicker/WidgetPickerViewController.h @@ -1,17 +1,9 @@ /* - Copyright 2017 Vector Creations Ltd +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import diff --git a/Riot/Modules/Integrations/WidgetPicker/WidgetPickerViewController.m b/Riot/Modules/Integrations/WidgetPicker/WidgetPickerViewController.m index dc1f6d0aac..581cacc110 100644 --- a/Riot/Modules/Integrations/WidgetPicker/WidgetPickerViewController.m +++ b/Riot/Modules/Integrations/WidgetPicker/WidgetPickerViewController.m @@ -1,17 +1,9 @@ /* - Copyright 2017 Vector Creations Ltd +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "WidgetPickerViewController.h" diff --git a/Riot/Modules/Integrations/Widgets/Jitsi/JitsiAuthenticationType.swift b/Riot/Modules/Integrations/Widgets/Jitsi/JitsiAuthenticationType.swift index 2f04c975fa..ec7b236ebf 100644 --- a/Riot/Modules/Integrations/Widgets/Jitsi/JitsiAuthenticationType.swift +++ b/Riot/Modules/Integrations/Widgets/Jitsi/JitsiAuthenticationType.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Integrations/Widgets/Jitsi/JitsiJWTPayload.swift b/Riot/Modules/Integrations/Widgets/Jitsi/JitsiJWTPayload.swift index ffd8b42085..0873e20a9c 100644 --- a/Riot/Modules/Integrations/Widgets/Jitsi/JitsiJWTPayload.swift +++ b/Riot/Modules/Integrations/Widgets/Jitsi/JitsiJWTPayload.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Integrations/Widgets/Jitsi/JitsiJWTTokenBuilder.swift b/Riot/Modules/Integrations/Widgets/Jitsi/JitsiJWTTokenBuilder.swift index 8f55bcb0e8..f7f10a06cb 100644 --- a/Riot/Modules/Integrations/Widgets/Jitsi/JitsiJWTTokenBuilder.swift +++ b/Riot/Modules/Integrations/Widgets/Jitsi/JitsiJWTTokenBuilder.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Integrations/Widgets/Jitsi/JitsiService.swift b/Riot/Modules/Integrations/Widgets/Jitsi/JitsiService.swift index 56618a3847..1b29503aeb 100644 --- a/Riot/Modules/Integrations/Widgets/Jitsi/JitsiService.swift +++ b/Riot/Modules/Integrations/Widgets/Jitsi/JitsiService.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Modules/Integrations/Widgets/Jitsi/JitsiViewController.h b/Riot/Modules/Integrations/Widgets/Jitsi/JitsiViewController.h index c79a07b2a0..341009dbda 100644 --- a/Riot/Modules/Integrations/Widgets/Jitsi/JitsiViewController.h +++ b/Riot/Modules/Integrations/Widgets/Jitsi/JitsiViewController.h @@ -1,17 +1,9 @@ /* - Copyright 2017 Vector Creations Ltd +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "MatrixKit.h" diff --git a/Riot/Modules/Integrations/Widgets/Jitsi/JitsiViewController.m b/Riot/Modules/Integrations/Widgets/Jitsi/JitsiViewController.m index baa8907d46..fcb1936e91 100644 --- a/Riot/Modules/Integrations/Widgets/Jitsi/JitsiViewController.m +++ b/Riot/Modules/Integrations/Widgets/Jitsi/JitsiViewController.m @@ -1,17 +1,9 @@ /* - Copyright 2017 Vector Creations Ltd +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "JitsiViewController.h" diff --git a/Riot/Modules/Integrations/Widgets/Jitsi/JitsiWellKnown.swift b/Riot/Modules/Integrations/Widgets/Jitsi/JitsiWellKnown.swift index c505012b37..dd4e84deed 100644 --- a/Riot/Modules/Integrations/Widgets/Jitsi/JitsiWellKnown.swift +++ b/Riot/Modules/Integrations/Widgets/Jitsi/JitsiWellKnown.swift @@ -1,17 +1,8 @@ // -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // import Foundation diff --git a/Riot/Modules/Integrations/Widgets/StickerPicker/StickerPickerViewController.h b/Riot/Modules/Integrations/Widgets/StickerPicker/StickerPickerViewController.h index 036ac09d60..9bf163ddfd 100644 --- a/Riot/Modules/Integrations/Widgets/StickerPicker/StickerPickerViewController.h +++ b/Riot/Modules/Integrations/Widgets/StickerPicker/StickerPickerViewController.h @@ -1,17 +1,8 @@ /* - Copyright 2018 New Vector Ltd +Copyright 2018-2024 New Vector Ltd. - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "WidgetViewController.h" diff --git a/Riot/Modules/Integrations/Widgets/StickerPicker/StickerPickerViewController.m b/Riot/Modules/Integrations/Widgets/StickerPicker/StickerPickerViewController.m index 0215209c5a..c3535585f8 100644 --- a/Riot/Modules/Integrations/Widgets/StickerPicker/StickerPickerViewController.m +++ b/Riot/Modules/Integrations/Widgets/StickerPicker/StickerPickerViewController.m @@ -1,17 +1,8 @@ /* - Copyright 2018 New Vector Ltd +Copyright 2018-2024 New Vector Ltd. - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "StickerPickerViewController.h" diff --git a/Riot/Modules/Integrations/Widgets/WidgetViewController.h b/Riot/Modules/Integrations/Widgets/WidgetViewController.h index 895f229c58..1866ffff29 100644 --- a/Riot/Modules/Integrations/Widgets/WidgetViewController.h +++ b/Riot/Modules/Integrations/Widgets/WidgetViewController.h @@ -1,17 +1,9 @@ /* - Copyright 2017 Vector Creations Ltd +Copyright 2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "WebViewViewController.h" diff --git a/Riot/Modules/Integrations/Widgets/WidgetViewController.m b/Riot/Modules/Integrations/Widgets/WidgetViewController.m index 2238a54809..dd5d3055e7 100644 --- a/Riot/Modules/Integrations/Widgets/WidgetViewController.m +++ b/Riot/Modules/Integrations/Widgets/WidgetViewController.m @@ -1,18 +1,9 @@ /* - Copyright 2017 Vector Creations Ltd - Copyright 2018 New Vector Ltd +Copyright 2018-2024 New Vector Ltd. +Copyright 2017 Vector Creations Ltd - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ #import "WidgetViewController.h" diff --git a/Riot/Modules/KeyBackup/ManualExport/EncryptionKeysExportPresenter.swift b/Riot/Modules/KeyBackup/ManualExport/EncryptionKeysExportPresenter.swift index edbfbc70cc..e0b7c43967 100644 --- a/Riot/Modules/KeyBackup/ManualExport/EncryptionKeysExportPresenter.swift +++ b/Riot/Modules/KeyBackup/ManualExport/EncryptionKeysExportPresenter.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Modules/KeyBackup/Recover/KeyBackupRecoverCoordinator.swift b/Riot/Modules/KeyBackup/Recover/KeyBackupRecoverCoordinator.swift index 4fe1c4b74d..b775e14bdd 100644 --- a/Riot/Modules/KeyBackup/Recover/KeyBackupRecoverCoordinator.swift +++ b/Riot/Modules/KeyBackup/Recover/KeyBackupRecoverCoordinator.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Modules/KeyBackup/Recover/KeyBackupRecoverCoordinatorBridgePresenter.swift b/Riot/Modules/KeyBackup/Recover/KeyBackupRecoverCoordinatorBridgePresenter.swift index 52390711e7..295c1f2c38 100644 --- a/Riot/Modules/KeyBackup/Recover/KeyBackupRecoverCoordinatorBridgePresenter.swift +++ b/Riot/Modules/KeyBackup/Recover/KeyBackupRecoverCoordinatorBridgePresenter.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Modules/KeyBackup/Recover/KeyBackupRecoverCoordinatorType.swift b/Riot/Modules/KeyBackup/Recover/KeyBackupRecoverCoordinatorType.swift index 52bb891ea1..aab62fbc2c 100644 --- a/Riot/Modules/KeyBackup/Recover/KeyBackupRecoverCoordinatorType.swift +++ b/Riot/Modules/KeyBackup/Recover/KeyBackupRecoverCoordinatorType.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Modules/KeyBackup/Recover/Passphrase/KeyBackupRecoverFromPassphraseCoordinator.swift b/Riot/Modules/KeyBackup/Recover/Passphrase/KeyBackupRecoverFromPassphraseCoordinator.swift index eaf5c7ee65..d967d38254 100644 --- a/Riot/Modules/KeyBackup/Recover/Passphrase/KeyBackupRecoverFromPassphraseCoordinator.swift +++ b/Riot/Modules/KeyBackup/Recover/Passphrase/KeyBackupRecoverFromPassphraseCoordinator.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Modules/KeyBackup/Recover/Passphrase/KeyBackupRecoverFromPassphraseCoordinatorType.swift b/Riot/Modules/KeyBackup/Recover/Passphrase/KeyBackupRecoverFromPassphraseCoordinatorType.swift index a3bc9030bb..4f76e8c6e1 100644 --- a/Riot/Modules/KeyBackup/Recover/Passphrase/KeyBackupRecoverFromPassphraseCoordinatorType.swift +++ b/Riot/Modules/KeyBackup/Recover/Passphrase/KeyBackupRecoverFromPassphraseCoordinatorType.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Modules/KeyBackup/Recover/Passphrase/KeyBackupRecoverFromPassphraseViewAction.swift b/Riot/Modules/KeyBackup/Recover/Passphrase/KeyBackupRecoverFromPassphraseViewAction.swift index d3cba95f9f..0fd33d9f23 100644 --- a/Riot/Modules/KeyBackup/Recover/Passphrase/KeyBackupRecoverFromPassphraseViewAction.swift +++ b/Riot/Modules/KeyBackup/Recover/Passphrase/KeyBackupRecoverFromPassphraseViewAction.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Modules/KeyBackup/Recover/Passphrase/KeyBackupRecoverFromPassphraseViewController.swift b/Riot/Modules/KeyBackup/Recover/Passphrase/KeyBackupRecoverFromPassphraseViewController.swift index 34e15f14dc..23fa25d2f8 100644 --- a/Riot/Modules/KeyBackup/Recover/Passphrase/KeyBackupRecoverFromPassphraseViewController.swift +++ b/Riot/Modules/KeyBackup/Recover/Passphrase/KeyBackupRecoverFromPassphraseViewController.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import UIKit diff --git a/Riot/Modules/KeyBackup/Recover/Passphrase/KeyBackupRecoverFromPassphraseViewModel.swift b/Riot/Modules/KeyBackup/Recover/Passphrase/KeyBackupRecoverFromPassphraseViewModel.swift index 264db3063f..dcbffd38a1 100644 --- a/Riot/Modules/KeyBackup/Recover/Passphrase/KeyBackupRecoverFromPassphraseViewModel.swift +++ b/Riot/Modules/KeyBackup/Recover/Passphrase/KeyBackupRecoverFromPassphraseViewModel.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Modules/KeyBackup/Recover/Passphrase/KeyBackupRecoverFromPassphraseViewModelType.swift b/Riot/Modules/KeyBackup/Recover/Passphrase/KeyBackupRecoverFromPassphraseViewModelType.swift index 69bc84b01f..3626e80771 100644 --- a/Riot/Modules/KeyBackup/Recover/Passphrase/KeyBackupRecoverFromPassphraseViewModelType.swift +++ b/Riot/Modules/KeyBackup/Recover/Passphrase/KeyBackupRecoverFromPassphraseViewModelType.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Modules/KeyBackup/Recover/Passphrase/KeyBackupRecoverFromPassphraseViewState.swift b/Riot/Modules/KeyBackup/Recover/Passphrase/KeyBackupRecoverFromPassphraseViewState.swift index c470c03204..c02786091d 100644 --- a/Riot/Modules/KeyBackup/Recover/Passphrase/KeyBackupRecoverFromPassphraseViewState.swift +++ b/Riot/Modules/KeyBackup/Recover/Passphrase/KeyBackupRecoverFromPassphraseViewState.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Modules/KeyBackup/Recover/RecoveryKey/KeyBackupRecoverFromRecoveryKeyCoordinator.swift b/Riot/Modules/KeyBackup/Recover/RecoveryKey/KeyBackupRecoverFromRecoveryKeyCoordinator.swift index f18f40f60a..fc64a0d9d7 100644 --- a/Riot/Modules/KeyBackup/Recover/RecoveryKey/KeyBackupRecoverFromRecoveryKeyCoordinator.swift +++ b/Riot/Modules/KeyBackup/Recover/RecoveryKey/KeyBackupRecoverFromRecoveryKeyCoordinator.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Modules/KeyBackup/Recover/RecoveryKey/KeyBackupRecoverFromRecoveryKeyCoordinatorType.swift b/Riot/Modules/KeyBackup/Recover/RecoveryKey/KeyBackupRecoverFromRecoveryKeyCoordinatorType.swift index c354fd13fc..b753f089d0 100644 --- a/Riot/Modules/KeyBackup/Recover/RecoveryKey/KeyBackupRecoverFromRecoveryKeyCoordinatorType.swift +++ b/Riot/Modules/KeyBackup/Recover/RecoveryKey/KeyBackupRecoverFromRecoveryKeyCoordinatorType.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Modules/KeyBackup/Recover/RecoveryKey/KeyBackupRecoverFromRecoveryKeyViewAction.swift b/Riot/Modules/KeyBackup/Recover/RecoveryKey/KeyBackupRecoverFromRecoveryKeyViewAction.swift index c1d030e0c2..ffbe43df3d 100644 --- a/Riot/Modules/KeyBackup/Recover/RecoveryKey/KeyBackupRecoverFromRecoveryKeyViewAction.swift +++ b/Riot/Modules/KeyBackup/Recover/RecoveryKey/KeyBackupRecoverFromRecoveryKeyViewAction.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Modules/KeyBackup/Recover/RecoveryKey/KeyBackupRecoverFromRecoveryKeyViewController.swift b/Riot/Modules/KeyBackup/Recover/RecoveryKey/KeyBackupRecoverFromRecoveryKeyViewController.swift index a90b519b68..0ef178edc3 100644 --- a/Riot/Modules/KeyBackup/Recover/RecoveryKey/KeyBackupRecoverFromRecoveryKeyViewController.swift +++ b/Riot/Modules/KeyBackup/Recover/RecoveryKey/KeyBackupRecoverFromRecoveryKeyViewController.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import UIKit diff --git a/Riot/Modules/KeyBackup/Recover/RecoveryKey/KeyBackupRecoverFromRecoveryKeyViewModel.swift b/Riot/Modules/KeyBackup/Recover/RecoveryKey/KeyBackupRecoverFromRecoveryKeyViewModel.swift index 4ad042002e..258acd4e8a 100644 --- a/Riot/Modules/KeyBackup/Recover/RecoveryKey/KeyBackupRecoverFromRecoveryKeyViewModel.swift +++ b/Riot/Modules/KeyBackup/Recover/RecoveryKey/KeyBackupRecoverFromRecoveryKeyViewModel.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Modules/KeyBackup/Recover/RecoveryKey/KeyBackupRecoverFromRecoveryKeyViewModelType.swift b/Riot/Modules/KeyBackup/Recover/RecoveryKey/KeyBackupRecoverFromRecoveryKeyViewModelType.swift index 366d547d0e..18d5f6d555 100644 --- a/Riot/Modules/KeyBackup/Recover/RecoveryKey/KeyBackupRecoverFromRecoveryKeyViewModelType.swift +++ b/Riot/Modules/KeyBackup/Recover/RecoveryKey/KeyBackupRecoverFromRecoveryKeyViewModelType.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Modules/KeyBackup/Recover/RecoveryKey/KeyBackupRecoverFromRecoveryKeyViewState.swift b/Riot/Modules/KeyBackup/Recover/RecoveryKey/KeyBackupRecoverFromRecoveryKeyViewState.swift index e772a887fd..8fafa9da81 100644 --- a/Riot/Modules/KeyBackup/Recover/RecoveryKey/KeyBackupRecoverFromRecoveryKeyViewState.swift +++ b/Riot/Modules/KeyBackup/Recover/RecoveryKey/KeyBackupRecoverFromRecoveryKeyViewState.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Modules/KeyBackup/Recover/Success/KeyBackupRecoverSuccessViewController.swift b/Riot/Modules/KeyBackup/Recover/Success/KeyBackupRecoverSuccessViewController.swift index 5661655bab..97e3d210b2 100644 --- a/Riot/Modules/KeyBackup/Recover/Success/KeyBackupRecoverSuccessViewController.swift +++ b/Riot/Modules/KeyBackup/Recover/Success/KeyBackupRecoverSuccessViewController.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import UIKit diff --git a/Riot/Modules/KeyBackup/Setup/Intro/KeyBackupSetupIntroViewController.swift b/Riot/Modules/KeyBackup/Setup/Intro/KeyBackupSetupIntroViewController.swift index 8a1e68c1f2..0c7c0f94b1 100644 --- a/Riot/Modules/KeyBackup/Setup/Intro/KeyBackupSetupIntroViewController.swift +++ b/Riot/Modules/KeyBackup/Setup/Intro/KeyBackupSetupIntroViewController.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import UIKit diff --git a/Riot/Modules/KeyBackup/Setup/KeyBackupSetupCoordinator.swift b/Riot/Modules/KeyBackup/Setup/KeyBackupSetupCoordinator.swift index a6c85ceed1..5683c87671 100644 --- a/Riot/Modules/KeyBackup/Setup/KeyBackupSetupCoordinator.swift +++ b/Riot/Modules/KeyBackup/Setup/KeyBackupSetupCoordinator.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import UIKit diff --git a/Riot/Modules/KeyBackup/Setup/KeyBackupSetupCoordinatorBridgePresenter.swift b/Riot/Modules/KeyBackup/Setup/KeyBackupSetupCoordinatorBridgePresenter.swift index 06c0b7856a..1098cd4f68 100644 --- a/Riot/Modules/KeyBackup/Setup/KeyBackupSetupCoordinatorBridgePresenter.swift +++ b/Riot/Modules/KeyBackup/Setup/KeyBackupSetupCoordinatorBridgePresenter.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Modules/KeyBackup/Setup/KeyBackupSetupCoordinatorType.swift b/Riot/Modules/KeyBackup/Setup/KeyBackupSetupCoordinatorType.swift index 612be7a1d6..3fb3c42cb9 100644 --- a/Riot/Modules/KeyBackup/Setup/KeyBackupSetupCoordinatorType.swift +++ b/Riot/Modules/KeyBackup/Setup/KeyBackupSetupCoordinatorType.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Modules/KeyBackup/Setup/Passphrase/KeyBackupSetupPassphraseCoordinator.swift b/Riot/Modules/KeyBackup/Setup/Passphrase/KeyBackupSetupPassphraseCoordinator.swift index f9c0342bef..c6912c5f22 100644 --- a/Riot/Modules/KeyBackup/Setup/Passphrase/KeyBackupSetupPassphraseCoordinator.swift +++ b/Riot/Modules/KeyBackup/Setup/Passphrase/KeyBackupSetupPassphraseCoordinator.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Modules/KeyBackup/Setup/Passphrase/KeyBackupSetupPassphraseCoordinatorType.swift b/Riot/Modules/KeyBackup/Setup/Passphrase/KeyBackupSetupPassphraseCoordinatorType.swift index 24403a387a..48096aee25 100644 --- a/Riot/Modules/KeyBackup/Setup/Passphrase/KeyBackupSetupPassphraseCoordinatorType.swift +++ b/Riot/Modules/KeyBackup/Setup/Passphrase/KeyBackupSetupPassphraseCoordinatorType.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Modules/KeyBackup/Setup/Passphrase/KeyBackupSetupPassphraseViewAction.swift b/Riot/Modules/KeyBackup/Setup/Passphrase/KeyBackupSetupPassphraseViewAction.swift index b6919a7301..7575a80e8a 100644 --- a/Riot/Modules/KeyBackup/Setup/Passphrase/KeyBackupSetupPassphraseViewAction.swift +++ b/Riot/Modules/KeyBackup/Setup/Passphrase/KeyBackupSetupPassphraseViewAction.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Modules/KeyBackup/Setup/Passphrase/KeyBackupSetupPassphraseViewController.swift b/Riot/Modules/KeyBackup/Setup/Passphrase/KeyBackupSetupPassphraseViewController.swift index c1b6ccd9b9..0b40132e2c 100644 --- a/Riot/Modules/KeyBackup/Setup/Passphrase/KeyBackupSetupPassphraseViewController.swift +++ b/Riot/Modules/KeyBackup/Setup/Passphrase/KeyBackupSetupPassphraseViewController.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import UIKit diff --git a/Riot/Modules/KeyBackup/Setup/Passphrase/KeyBackupSetupPassphraseViewModel.swift b/Riot/Modules/KeyBackup/Setup/Passphrase/KeyBackupSetupPassphraseViewModel.swift index b2dd9163c4..4e575d21e8 100644 --- a/Riot/Modules/KeyBackup/Setup/Passphrase/KeyBackupSetupPassphraseViewModel.swift +++ b/Riot/Modules/KeyBackup/Setup/Passphrase/KeyBackupSetupPassphraseViewModel.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Modules/KeyBackup/Setup/Passphrase/KeyBackupSetupPassphraseViewModelType.swift b/Riot/Modules/KeyBackup/Setup/Passphrase/KeyBackupSetupPassphraseViewModelType.swift index 89da31b4de..bf3ea6ac1a 100644 --- a/Riot/Modules/KeyBackup/Setup/Passphrase/KeyBackupSetupPassphraseViewModelType.swift +++ b/Riot/Modules/KeyBackup/Setup/Passphrase/KeyBackupSetupPassphraseViewModelType.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Modules/KeyBackup/Setup/Passphrase/KeyBackupSetupPassphraseViewState.swift b/Riot/Modules/KeyBackup/Setup/Passphrase/KeyBackupSetupPassphraseViewState.swift index ba0e09e1d0..d9d7e7353d 100644 --- a/Riot/Modules/KeyBackup/Setup/Passphrase/KeyBackupSetupPassphraseViewState.swift +++ b/Riot/Modules/KeyBackup/Setup/Passphrase/KeyBackupSetupPassphraseViewState.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Modules/KeyBackup/Setup/Passphrase/PasswordStrengthView.swift b/Riot/Modules/KeyBackup/Setup/Passphrase/PasswordStrengthView.swift index e7931e50ef..1f364bdba8 100644 --- a/Riot/Modules/KeyBackup/Setup/Passphrase/PasswordStrengthView.swift +++ b/Riot/Modules/KeyBackup/Setup/Passphrase/PasswordStrengthView.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Modules/KeyBackup/Setup/Success/KeyBackupSetupSuccessFromPassphraseViewController.swift b/Riot/Modules/KeyBackup/Setup/Success/KeyBackupSetupSuccessFromPassphraseViewController.swift index 8ae8ed864e..69a7c0b496 100644 --- a/Riot/Modules/KeyBackup/Setup/Success/KeyBackupSetupSuccessFromPassphraseViewController.swift +++ b/Riot/Modules/KeyBackup/Setup/Success/KeyBackupSetupSuccessFromPassphraseViewController.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import UIKit diff --git a/Riot/Modules/KeyBackup/Setup/Success/KeyBackupSetupSuccessFromRecoveryKeyViewController.swift b/Riot/Modules/KeyBackup/Setup/Success/KeyBackupSetupSuccessFromRecoveryKeyViewController.swift index 214079de02..8d781df0a6 100644 --- a/Riot/Modules/KeyBackup/Setup/Success/KeyBackupSetupSuccessFromRecoveryKeyViewController.swift +++ b/Riot/Modules/KeyBackup/Setup/Success/KeyBackupSetupSuccessFromRecoveryKeyViewController.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2019-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import UIKit diff --git a/Riot/Modules/KeyBackup/Setup/Success/KeyBackupSetupSuccessFromSecureBackupViewController.swift b/Riot/Modules/KeyBackup/Setup/Success/KeyBackupSetupSuccessFromSecureBackupViewController.swift index 31c44b76a8..dacd6b367e 100644 --- a/Riot/Modules/KeyBackup/Setup/Success/KeyBackupSetupSuccessFromSecureBackupViewController.swift +++ b/Riot/Modules/KeyBackup/Setup/Success/KeyBackupSetupSuccessFromSecureBackupViewController.swift @@ -1,17 +1,8 @@ /* - Copyright 2021 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2021-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import UIKit diff --git a/Riot/Modules/KeyVerification/Common/KeyVerificationFlow.swift b/Riot/Modules/KeyVerification/Common/KeyVerificationFlow.swift index 57cd6e30e4..69b7e3634e 100644 --- a/Riot/Modules/KeyVerification/Common/KeyVerificationFlow.swift +++ b/Riot/Modules/KeyVerification/Common/KeyVerificationFlow.swift @@ -1,17 +1,8 @@ /* - Copyright 2020 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2020-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Modules/KeyVerification/Common/KeyVerificationKind.swift b/Riot/Modules/KeyVerification/Common/KeyVerificationKind.swift index abe1ba2d98..625abd9feb 100644 --- a/Riot/Modules/KeyVerification/Common/KeyVerificationKind.swift +++ b/Riot/Modules/KeyVerification/Common/KeyVerificationKind.swift @@ -1,17 +1,8 @@ /* - Copyright 2020 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2020-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Modules/KeyVerification/Common/KeyVerificationService.swift b/Riot/Modules/KeyVerification/Common/KeyVerificationService.swift index 29368c83f4..c37b70a64a 100644 --- a/Riot/Modules/KeyVerification/Common/KeyVerificationService.swift +++ b/Riot/Modules/KeyVerification/Common/KeyVerificationService.swift @@ -1,17 +1,8 @@ /* - Copyright 2020 New Vector Ltd - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Copyright 2020-2024 New Vector Ltd. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import Foundation diff --git a/Riot/Modules/KeyVerification/Common/Verify/SAS/Views/VerifyEmojiCollectionViewCell.swift b/Riot/Modules/KeyVerification/Common/Verify/SAS/Views/VerifyEmojiCollectionViewCell.swift index df8b3359e1..6c4b800c3e 100644 --- a/Riot/Modules/KeyVerification/Common/Verify/SAS/Views/VerifyEmojiCollectionViewCell.swift +++ b/Riot/Modules/KeyVerification/Common/Verify/SAS/Views/VerifyEmojiCollectionViewCell.swift @@ -1,17 +1,8 @@ /* - Copyright 2019 New Vector Ltd +Copyright 2019-2024 New Vector Ltd. - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ import UIKit diff --git a/Riot/Modules/KeyVerification/Common/Verify/Scanning/KeyVerificationVerifyByScanningViewModel.swift b/Riot/Modules/KeyVerification/Common/Verify/Scanning/KeyVerificationVerifyByScanningViewModel.swift index a8afb86b22..3f59f4d1da 100644 --- a/Riot/Modules/KeyVerification/Common/Verify/Scanning/KeyVerificationVerifyByScanningViewModel.swift +++ b/Riot/Modules/KeyVerification/Common/Verify/Scanning/KeyVerificationVerifyByScanningViewModel.swift @@ -172,14 +172,6 @@ final class KeyVerificationVerifyByScanningViewModel: KeyVerificationVerifyBySca // Remove pending QR code transaction, as we are going to use SAS verification self.removePendingQRCodeTransaction() - - // Check due to legacy implementation of key verification which could pass incorrect type of transaction - if keyVerificationTransaction is MXIncomingSASTransaction { - MXLog.debug("[KeyVerificationVerifyByScanningViewModel] SAS transaction should be outgoing") - self.unregisterDidStateChangeNotification() - self.update(viewState: .error(KeyVerificationVerifyByScanningViewModelError.unknown)) - } - }, failure: { [weak self] (error) in guard let self = self else { return diff --git a/Riot/Modules/KeyVerification/Device/SelfVerifyWait/KeyVerificationSelfVerifyWaitViewController.storyboard b/Riot/Modules/KeyVerification/Device/SelfVerifyWait/KeyVerificationSelfVerifyWaitViewController.storyboard index 4c00dd497b..fd3c080e93 100644 --- a/Riot/Modules/KeyVerification/Device/SelfVerifyWait/KeyVerificationSelfVerifyWaitViewController.storyboard +++ b/Riot/Modules/KeyVerification/Device/SelfVerifyWait/KeyVerificationSelfVerifyWaitViewController.storyboard @@ -1,9 +1,9 @@ - + - + @@ -21,10 +21,10 @@ - + - +