diff --git a/Config/AppIdentifiers.xcconfig b/Config/AppIdentifiers.xcconfig index 12467ebbd4..b779271afd 100644 --- a/Config/AppIdentifiers.xcconfig +++ b/Config/AppIdentifiers.xcconfig @@ -1,5 +1,5 @@ // -// Copyright 2022 Vector Creations Ltd +// Copyright 2021 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. @@ -18,11 +18,11 @@ DEVELOPMENT_TEAM = NVMQD635C6 // Provisioning profiles -TCHAP_PROVISIONING_PROFILE_SPECIFIER = DevTchap App Store -TCHAP_PROVISIONING_PROFILE = 2e6b85aa-f6b6-4be0-b061-809b53f557df +TCHAP_PROVISIONING_PROFILE_SPECIFIER = Tchap App Store +TCHAP_PROVISIONING_PROFILE = ab6bd8d7-4490-470d-b76d-2b3744150e5a -NSE_PROVISIONING_PROFILE_SPECIFIER = DevTchap NSE App Store -NSE_PROVISIONING_PROFILE = e0ff349d-d05d-48f0-b2a2-c3314b1f074d +NSE_PROVISIONING_PROFILE_SPECIFIER = Tchap NSE App Store +NSE_PROVISIONING_PROFILE = fbf70dfb-92e7-4eee-9098-d6c798074fff -SHARE_EXTENSION_PROVISIONING_PROFILE_SPECIFIER = DevTchap Share Extension App Store -SHARE_EXTENSION_PROVISIONING_PROFILE = 180b64b6-bc93-46e7-b531-65f3f8363ba7 +SHARE_EXTENSION_PROVISIONING_PROFILE_SPECIFIER = Tchap Share Extension App Store +SHARE_EXTENSION_PROVISIONING_PROFILE = 9419786e-8533-468d-99fe-5e46101af01a diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Contents.json b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Contents.json index 8cae15f226..70e75fd61b 100755 --- a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Contents.json +++ b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Contents.json @@ -1,158 +1,158 @@ { - "images":[ - { - "idiom":"iphone", - "size":"20x20", - "scale":"2x", - "filename":"Icon-App-20x20@2x.png" - }, - { - "idiom":"iphone", - "size":"20x20", - "scale":"3x", - "filename":"Icon-App-20x20@3x.png" - }, - { - "idiom":"iphone", - "size":"29x29", - "scale":"1x", - "filename":"Icon-App-29x29@1x.png" - }, - { - "idiom":"iphone", - "size":"29x29", - "scale":"2x", - "filename":"Icon-App-29x29@2x.png" - }, - { - "idiom":"iphone", - "size":"29x29", - "scale":"3x", - "filename":"Icon-App-29x29@3x.png" - }, - { - "idiom":"iphone", - "size":"40x40", - "scale":"2x", - "filename":"Icon-App-40x40@2x.png" - }, - { - "idiom":"iphone", - "size":"40x40", - "scale":"3x", - "filename":"Icon-App-40x40@3x.png" - }, - { - "idiom":"iphone", - "size":"57x57", - "scale":"1x", - "filename":"Icon-App-57x57@1x.png" - }, - { - "idiom":"iphone", - "size":"57x57", - "scale":"2x", - "filename":"Icon-App-57x57@2x.png" - }, - { - "idiom":"iphone", - "size":"60x60", - "scale":"2x", - "filename":"Icon-App-60x60@2x.png" - }, - { - "idiom":"iphone", - "size":"60x60", - "scale":"3x", - "filename":"Icon-App-60x60@3x.png" - }, - { - "idiom":"ipad", - "size":"20x20", - "scale":"1x", - "filename":"Icon-App-20x20@1x.png" - }, - { - "idiom":"ipad", - "size":"20x20", - "scale":"2x", - "filename":"Icon-App-20x20@2x.png" - }, - { - "idiom":"ipad", - "size":"29x29", - "scale":"1x", - "filename":"Icon-App-29x29@1x.png" - }, - { - "idiom":"ipad", - "size":"29x29", - "scale":"2x", - "filename":"Icon-App-29x29@2x.png" - }, - { - "idiom":"ipad", - "size":"40x40", - "scale":"1x", - "filename":"Icon-App-40x40@1x.png" - }, - { - "idiom":"ipad", - "size":"40x40", - "scale":"2x", - "filename":"Icon-App-40x40@2x.png" - }, - { - "size" : "50x50", - "idiom" : "ipad", - "filename" : "Icon-Small-50x50@1x.png", - "scale" : "1x" - }, - { - "size" : "50x50", - "idiom" : "ipad", - "filename" : "Icon-Small-50x50@2x.png", - "scale" : "2x" - }, - { - "idiom":"ipad", - "size":"72x72", - "scale":"1x", - "filename":"Icon-App-72x72@1x.png" - }, - { - "idiom":"ipad", - "size":"72x72", - "scale":"2x", - "filename":"Icon-App-72x72@2x.png" - }, - { - "idiom":"ipad", - "size":"76x76", - "scale":"1x", - "filename":"Icon-App-76x76@1x.png" - }, - { - "idiom":"ipad", - "size":"76x76", - "scale":"2x", - "filename":"Icon-App-76x76@2x.png" - }, - { - "idiom":"ipad", - "size":"83.5x83.5", - "scale":"2x", - "filename":"Icon-App-83.5x83.5@2x.png" - }, - { - "size" : "1024x1024", - "idiom" : "ios-marketing", - "filename" : "ItunesArtwork@2x.png", - "scale" : "1x" - } - ], - "info":{ - "version":1, - "author":"makeappicon" + "images" : [ + { + "filename" : "Icon-App-20x20@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "Icon-App-20x20@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "20x20" + }, + { + "filename" : "Icon-App-29x29@1x.png", + "idiom" : "iphone", + "scale" : "1x", + "size" : "29x29" + }, + { + "filename" : "Icon-App-29x29@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "Icon-App-29x29@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "29x29" + }, + { + "filename" : "Icon-App-40x40@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "Icon-App-40x40@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "40x40" + }, + { + "filename" : "Icon-App-57x57@1x.png", + "idiom" : "iphone", + "scale" : "1x", + "size" : "57x57" + }, + { + "filename" : "Icon-App-57x57@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "57x57" + }, + { + "filename" : "Icon-App-60x60@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "60x60" + }, + { + "filename" : "Icon-App-60x60@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "60x60" + }, + { + "filename" : "Icon-App-20x20@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "20x20" + }, + { + "filename" : "Icon-App-20x20@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "Icon-App-29x29@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "29x29" + }, + { + "filename" : "Icon-App-29x29@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "Icon-App-40x40@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "40x40" + }, + { + "filename" : "Icon-App-40x40@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "Icon-Small-50x50@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "50x50" + }, + { + "filename" : "Icon-Small-50x50@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "50x50" + }, + { + "filename" : "Icon-App-72x72@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "72x72" + }, + { + "filename" : "Icon-App-72x72@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "72x72" + }, + { + "filename" : "Icon-App-76x76@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "76x76" + }, + { + "filename" : "Icon-App-76x76@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "76x76" + }, + { + "filename" : "Icon-App-83.5x83.5@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "83.5x83.5" + }, + { + "filename" : "ItunesArtwork@2x.png", + "idiom" : "ios-marketing", + "scale" : "1x", + "size" : "1024x1024" } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } } diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png index c100b8d9c4..cb7b524192 100644 Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png index f8313b5403..9fc1fae03d 100644 Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png index e84f9b420a..e6afff4f61 100644 Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png index 3e70abf952..418c89e883 100644 Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png index 259a9f2c35..c8ebd7a93b 100644 Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png index 0f22418f3c..5cbf47956b 100644 Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png index f8313b5403..9fc1fae03d 100644 Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png index 4ed8d1c787..1b67e22da7 100644 Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png index f196b7a48e..df491ba114 100644 Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png index c5d7d1dcae..a09e7bfe0c 100644 Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png index ea9b8abdd2..b05c5e9d08 100644 Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png index f196b7a48e..df491ba114 100644 Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png index b6714dca95..00874fbcf6 100644 Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png index 78f8e0f9ba..0ebcf86a83 100644 Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png index 4ef08bc3ef..8621cc4a50 100644 Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png index 08a0e10cb0..ee09c6b19c 100644 Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png index c8a54a002b..c1bf9e18a6 100644 Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png index 8169a5880b..73270176f2 100644 Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-Small-50x50@1x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-Small-50x50@1x.png index 1b4fe5bd94..76dcd79646 100644 Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-Small-50x50@1x.png and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-Small-50x50@1x.png differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-Small-50x50@2x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-Small-50x50@2x.png index 0f8081781e..b8ce80e160 100644 Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-Small-50x50@2x.png and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-Small-50x50@2x.png differ diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/ItunesArtwork@2x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/ItunesArtwork@2x.png index 19ea05e2f4..fbbd99cb7d 100644 Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/ItunesArtwork@2x.png and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/ItunesArtwork@2x.png differ diff --git a/Riot/Assets/SharedImages.xcassets/TchapLogo.imageset/tchap_logo.png b/Riot/Assets/SharedImages.xcassets/TchapLogo.imageset/tchap_logo.png index 258ce54114..ad91b62fbb 100644 Binary files a/Riot/Assets/SharedImages.xcassets/TchapLogo.imageset/tchap_logo.png and b/Riot/Assets/SharedImages.xcassets/TchapLogo.imageset/tchap_logo.png differ diff --git a/Riot/Assets/SharedImages.xcassets/TchapLogo.imageset/tchap_logo@2x.png b/Riot/Assets/SharedImages.xcassets/TchapLogo.imageset/tchap_logo@2x.png index 1d26c83d7c..bc67dd5f30 100644 Binary files a/Riot/Assets/SharedImages.xcassets/TchapLogo.imageset/tchap_logo@2x.png and b/Riot/Assets/SharedImages.xcassets/TchapLogo.imageset/tchap_logo@2x.png differ diff --git a/Riot/Assets/SharedImages.xcassets/TchapLogo.imageset/tchap_logo@3x.png b/Riot/Assets/SharedImages.xcassets/TchapLogo.imageset/tchap_logo@3x.png index 0b01f38e68..158b53d010 100644 Binary files a/Riot/Assets/SharedImages.xcassets/TchapLogo.imageset/tchap_logo@3x.png and b/Riot/Assets/SharedImages.xcassets/TchapLogo.imageset/tchap_logo@3x.png differ diff --git a/RiotNSE/BuildSettings.swift b/RiotNSE/BuildSettings.swift index fcbc3c92ba..8c501dddaf 100644 --- a/RiotNSE/BuildSettings.swift +++ b/RiotNSE/BuildSettings.swift @@ -1,5 +1,5 @@ // -// Copyright 2022 Vector Creations 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. @@ -96,42 +96,57 @@ final class BuildSettings: NSObject { // Tchap servers static let serverUrlPrefix = "https://matrix." static let preferredIdentityServerNames = [ - "dev01.tchap.incubateur.net", -// "dev02.tchap.incubateur.net" - ] - static let otherIdentityServerNames: [String] = [ - "ext01.tchap.incubateur.net" + "agent.externe.tchap.gouv.fr", + "agent.collectivites.tchap.gouv.fr", + "agent.tchap.gouv.fr", + "agent.elysee.tchap.gouv.fr", + "agent.pm.tchap.gouv.fr", + "agent.ssi.tchap.gouv.fr", + "agent.finances.tchap.gouv.fr", + "agent.social.tchap.gouv.fr", + "agent.interieur.tchap.gouv.fr", + "agent.agriculture.tchap.gouv.fr", + "agent.justice.tchap.gouv.fr", + "agent.diplomatie.tchap.gouv.fr", + "agent.intradef.tchap.gouv.fr", + "agent.dinum.tchap.gouv.fr", + "agent.culture.tchap.gouv.fr", + "agent.dev-durable.tchap.gouv.fr", + "agent.education.tchap.gouv.fr" ] + static let otherIdentityServerNames: [String] = [] // Tchap-Web instance for the app - static let applicationWebAppUrlString = "https://www.tchap.incubateur.net" + static let applicationWebAppUrlString = "https://www.tchap.gouv.fr" /// Whether to allow the app to use a right to left layout or force left to right for all languages static let disableRightToLeftLayout = true // MARK: - Server configuration // Tchap sygnal server url - static let serverConfigSygnalAPIUrlString = "https://sygnal.tchap.incubateur.net/_matrix/push/v1/notify" + static let serverConfigSygnalAPIUrlString = "https://sygnal.tchap.gouv.fr/_matrix/push/v1/notify" /// Force the user to set a homeserver instead of using the default one static let forceHomeserverSelection = false + // MARK: - Legal URLs // Note: Set empty strings to hide the related entry in application settings - static let applicationTermsConditionsUrlString = "https://www.tchap.incubateur.net/tac.html" - static let clientConfigURL = "https://www.tchap.incubateur.net/client/config/agent/ios" - static let applicationHelpUrlString = "https://www.tchap.incubateur.net/faq" + static let applicationTermsConditionsUrlString = "https://www.tchap.gouv.fr/tac.html" + static let clientConfigURL = "https://www.tchap.gouv.fr/client/config/agent/ios" + static let applicationHelpUrlString = "https://www.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]] = [ - "tchap.incubateur.net": ["/"], - "www.tchap.incubateur.net": ["/"], + "matrix.to": ["/"], + "tchap.gouv.fr": ["/"], + "www.tchap.gouv.fr": ["/"] ] - static let clientPermalinkBaseUrl: String? = "https://www.tchap.incubateur.net" + static let clientPermalinkBaseUrl: String? = "https://tchap.gouv.fr" // MARK: - VoIP @@ -148,15 +163,29 @@ final class BuildSettings: NSObject { // MARK: - Public rooms Directory // List of homeservers for the public rooms directory static let publicRoomsDirectoryServers = [ - "dev01.tchap.incubateur.net", - "dev02.tchap.incubateur.net" + "agent.collectivites.tchap.gouv.fr", + "agent.tchap.gouv.fr", + "agent.elysee.tchap.gouv.fr", + "agent.pm.tchap.gouv.fr", + "agent.ssi.tchap.gouv.fr", + "agent.finances.tchap.gouv.fr", + "agent.social.tchap.gouv.fr", + "agent.interieur.tchap.gouv.fr", + "agent.agriculture.tchap.gouv.fr", + "agent.justice.tchap.gouv.fr", + "agent.diplomatie.tchap.gouv.fr", + "agent.intradef.tchap.gouv.fr", + "agent.dinum.tchap.gouv.fr", + "agent.culture.tchap.gouv.fr", + "agent.dev-durable.tchap.gouv.fr", + "agent.education.tchap.gouv.fr" ] // MARK: - Rooms Screen static let roomsAllowToJoinPublicRooms: Bool = true // MARK: - Analytics - + /// A type that represents how to set up the analytics module in the app. /// /// **Note:** Analytics are disabled by default for forks. @@ -183,15 +212,15 @@ final class BuildSettings: NSObject { static let analyticsConfiguration = AnalyticsConfiguration(isEnabled: false, host: "", apiKey: "", - termsURL: URL(string: "")!) + termsURL: URL(string: "https://")!) #endif // MARK: - Bug report static let bugReportEndpointUrlString = "" - static let bugReportDefaultHost = "dev01.tchap.incubateur.net" + static let bugReportDefaultHost = "agent.tchap.gouv.fr" static let bugReportEndpointUrlSuffix = "/bugreports" // Use the name allocated by the bug report server - static let bugReportApplicationId = "devtchap-ios" + static let bugReportApplicationId = "tchap-ios" // MARK: - Integrations @@ -237,12 +266,40 @@ final class BuildSettings: NSObject { // "" : [ tchapFeatureAnyHomeServer ] to allow a feature to any instance static let tchapFeatureNotificationByEmail = "tchapFeatureNotificationByEmail" static let tchapFeatureVoiceOverIP = "tchapFeatureVoiceOverIP" - static let tchapFeatureVideoOverIP = "tchapFeatureVideoOverIP" // Tchap: in Dev, allow any feature to any instance. + static let tchapFeatureVideoOverIP = "tchapFeatureVideoOverIP" static let tchapFeatureGeolocationSharing = "tchapFeatureGeolocationSharing" // linked to `locationSharingEnabled` property (see above) static var tchapFeaturesAllowedHomeServersForFeature: [String: [String]] = [ - tchapFeatureAnyFeature: [ tchapFeatureAnyHomeServer ] + tchapFeatureNotificationByEmail: [ + tchapFeatureAnyHomeServer + ], + // Audio calls for all in Tchap Production. + tchapFeatureVoiceOverIP: [ + "agent.externe.tchap.gouv.fr", + "agent.collectivites.tchap.gouv.fr", + "agent.tchap.gouv.fr", + "agent.elysee.tchap.gouv.fr", + "agent.pm.tchap.gouv.fr", + "agent.ssi.tchap.gouv.fr", + "agent.finances.tchap.gouv.fr", + "agent.social.tchap.gouv.fr", + "agent.interieur.tchap.gouv.fr", + "agent.agriculture.tchap.gouv.fr", + "agent.justice.tchap.gouv.fr", + "agent.diplomatie.tchap.gouv.fr", + "agent.intradef.tchap.gouv.fr", + "agent.dinum.tchap.gouv.fr", + "agent.culture.tchap.gouv.fr", + "agent.dev-durable.tchap.gouv.fr", + "agent.education.tchap.gouv.fr" + ], + tchapFeatureVideoOverIP: [ + "agent.dinum.tchap.gouv.fr" + ], + tchapFeatureGeolocationSharing: [ + tchapFeatureAnyHomeServer + ] ] - + // MARK: - Side Menu static let enableSideMenu: Bool = true && !newAppLayoutEnabled static let sideMenuShowInviteFriends: Bool = true @@ -280,14 +337,14 @@ final class BuildSettings: NSObject { static let settingsScreenShowUserFirstName: Bool = false static let settingsScreenShowUserSurname: Bool = false - static let settingsScreenAllowAddingEmailThreepids: Bool = true - static let settingsScreenAllowAddingPhoneThreepids: Bool = true - static let settingsScreenShowThreepidExplanatory: Bool = true - static let settingsScreenShowDiscoverySettings: Bool = true - static let settingsScreenAllowIdentityServerConfig: Bool = true + static let settingsScreenAllowAddingEmailThreepids: Bool = false + static let settingsScreenAllowAddingPhoneThreepids: Bool = false + static let settingsScreenShowThreepidExplanatory: Bool = false + static let settingsScreenShowDiscoverySettings: Bool = false + static let settingsScreenAllowIdentityServerConfig: Bool = false static let settingsScreenShowConfirmMediaSize: Bool = true static let settingsScreenShowAdvancedSettings: Bool = true - static let settingsScreenShowLabSettings: Bool = true + static let settingsScreenShowLabSettings: Bool = false static let settingsScreenAllowChangingRageshakeSettings: Bool = true static let settingsScreenAllowChangingCrashUsageDataSettings: Bool = true static let settingsScreenAllowBugReportingManually: Bool = true @@ -295,14 +352,14 @@ final class BuildSettings: NSObject { static let settingsScreenShowChangePassword: Bool = true static let settingsScreenShowEnableStunServerFallback: Bool = true static let settingsScreenShowNotificationDecodedContentOption: Bool = true - static let settingsScreenShowNsfwRoomsOption: Bool = true + static let settingsScreenShowNsfwRoomsOption: Bool = false static let settingsSecurityScreenShowSessions: Bool = true static let settingsSecurityScreenShowSetupBackup: Bool = true static let settingsSecurityScreenShowRestoreBackup: Bool = true static let settingsSecurityScreenShowDeleteBackup: Bool = true static let settingsSecurityScreenShowCryptographyInfo: Bool = true static let settingsSecurityScreenShowCryptographyExport: Bool = true - static let settingsSecurityScreenShowAdvancedUnverifiedDevices: Bool = true + static let settingsSecurityScreenShowAdvancedUnverifiedDevices: Bool = false /// A setting to enable the presence configuration settings section. static let settingsScreenPresenceAllowConfiguration: Bool = false @@ -310,8 +367,8 @@ final class BuildSettings: NSObject { static let roomInputToolbarCompressionMode: MediaCompressionMode = .prompt enum MediaCompressionMode { - case prompt, small, medium, large, none - } + case prompt, small, medium, large, none + } // MARK: - Room Creation Screen diff --git a/RiotNSE/Common.xcconfig b/RiotNSE/Common.xcconfig index 8b7652642d..19b42ed0c8 100644 --- a/RiotNSE/Common.xcconfig +++ b/RiotNSE/Common.xcconfig @@ -1,5 +1,5 @@ // -// Copyright 2022 Vector Creations 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. @@ -17,9 +17,12 @@ // Configuration settings file format documentation can be found at: // https://help.apple.com/xcode/#/dev745c5c974 -#include "DevTchap/SupportingFiles/DevTchap-App-Common.xcconfig" +#include "Tchap/SupportingFiles/App-Common.xcconfig" -PRODUCT_NAME = RiotNSE + +// Tchap: Customize TchapNSE user-agent for back-end logs. +// PRODUCT_NAME = RiotNSE +PRODUCT_NAME = TchapNSE PRODUCT_BUNDLE_IDENTIFIER = $(BASE_BUNDLE_IDENTIFIER).nse INFOPLIST_FILE = RiotNSE/Info.plist @@ -27,5 +30,8 @@ INFOPLIST_FILE = RiotNSE/Info.plist CODE_SIGN_ENTITLEMENTS = RiotNSE/RiotNSE.entitlements SKIP_INSTALL = YES -SWIFT_OBJC_BRIDGING_HEADER = $(SRCROOT)/$(PRODUCT_NAME)/SupportingFiles/RiotNSE-Bridging-Header.h + +// Tchap: Customize TchapNSE user-agent for back-end logs. +// SWIFT_OBJC_BRIDGING_HEADER = $(SRCROOT)/$(PRODUCT_NAME)/SupportingFiles/RiotNSE-Bridging-Header.h +SWIFT_OBJC_BRIDGING_HEADER = $(SRCROOT)/RiotNSE/SupportingFiles/RiotNSE-Bridging-Header.h diff --git a/RiotShareExtension/BuildSettings.swift b/RiotShareExtension/BuildSettings.swift index fcbc3c92ba..8c501dddaf 100644 --- a/RiotShareExtension/BuildSettings.swift +++ b/RiotShareExtension/BuildSettings.swift @@ -1,5 +1,5 @@ // -// Copyright 2022 Vector Creations 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. @@ -96,42 +96,57 @@ final class BuildSettings: NSObject { // Tchap servers static let serverUrlPrefix = "https://matrix." static let preferredIdentityServerNames = [ - "dev01.tchap.incubateur.net", -// "dev02.tchap.incubateur.net" - ] - static let otherIdentityServerNames: [String] = [ - "ext01.tchap.incubateur.net" + "agent.externe.tchap.gouv.fr", + "agent.collectivites.tchap.gouv.fr", + "agent.tchap.gouv.fr", + "agent.elysee.tchap.gouv.fr", + "agent.pm.tchap.gouv.fr", + "agent.ssi.tchap.gouv.fr", + "agent.finances.tchap.gouv.fr", + "agent.social.tchap.gouv.fr", + "agent.interieur.tchap.gouv.fr", + "agent.agriculture.tchap.gouv.fr", + "agent.justice.tchap.gouv.fr", + "agent.diplomatie.tchap.gouv.fr", + "agent.intradef.tchap.gouv.fr", + "agent.dinum.tchap.gouv.fr", + "agent.culture.tchap.gouv.fr", + "agent.dev-durable.tchap.gouv.fr", + "agent.education.tchap.gouv.fr" ] + static let otherIdentityServerNames: [String] = [] // Tchap-Web instance for the app - static let applicationWebAppUrlString = "https://www.tchap.incubateur.net" + static let applicationWebAppUrlString = "https://www.tchap.gouv.fr" /// Whether to allow the app to use a right to left layout or force left to right for all languages static let disableRightToLeftLayout = true // MARK: - Server configuration // Tchap sygnal server url - static let serverConfigSygnalAPIUrlString = "https://sygnal.tchap.incubateur.net/_matrix/push/v1/notify" + static let serverConfigSygnalAPIUrlString = "https://sygnal.tchap.gouv.fr/_matrix/push/v1/notify" /// Force the user to set a homeserver instead of using the default one static let forceHomeserverSelection = false + // MARK: - Legal URLs // Note: Set empty strings to hide the related entry in application settings - static let applicationTermsConditionsUrlString = "https://www.tchap.incubateur.net/tac.html" - static let clientConfigURL = "https://www.tchap.incubateur.net/client/config/agent/ios" - static let applicationHelpUrlString = "https://www.tchap.incubateur.net/faq" + static let applicationTermsConditionsUrlString = "https://www.tchap.gouv.fr/tac.html" + static let clientConfigURL = "https://www.tchap.gouv.fr/client/config/agent/ios" + static let applicationHelpUrlString = "https://www.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]] = [ - "tchap.incubateur.net": ["/"], - "www.tchap.incubateur.net": ["/"], + "matrix.to": ["/"], + "tchap.gouv.fr": ["/"], + "www.tchap.gouv.fr": ["/"] ] - static let clientPermalinkBaseUrl: String? = "https://www.tchap.incubateur.net" + static let clientPermalinkBaseUrl: String? = "https://tchap.gouv.fr" // MARK: - VoIP @@ -148,15 +163,29 @@ final class BuildSettings: NSObject { // MARK: - Public rooms Directory // List of homeservers for the public rooms directory static let publicRoomsDirectoryServers = [ - "dev01.tchap.incubateur.net", - "dev02.tchap.incubateur.net" + "agent.collectivites.tchap.gouv.fr", + "agent.tchap.gouv.fr", + "agent.elysee.tchap.gouv.fr", + "agent.pm.tchap.gouv.fr", + "agent.ssi.tchap.gouv.fr", + "agent.finances.tchap.gouv.fr", + "agent.social.tchap.gouv.fr", + "agent.interieur.tchap.gouv.fr", + "agent.agriculture.tchap.gouv.fr", + "agent.justice.tchap.gouv.fr", + "agent.diplomatie.tchap.gouv.fr", + "agent.intradef.tchap.gouv.fr", + "agent.dinum.tchap.gouv.fr", + "agent.culture.tchap.gouv.fr", + "agent.dev-durable.tchap.gouv.fr", + "agent.education.tchap.gouv.fr" ] // MARK: - Rooms Screen static let roomsAllowToJoinPublicRooms: Bool = true // MARK: - Analytics - + /// A type that represents how to set up the analytics module in the app. /// /// **Note:** Analytics are disabled by default for forks. @@ -183,15 +212,15 @@ final class BuildSettings: NSObject { static let analyticsConfiguration = AnalyticsConfiguration(isEnabled: false, host: "", apiKey: "", - termsURL: URL(string: "")!) + termsURL: URL(string: "https://")!) #endif // MARK: - Bug report static let bugReportEndpointUrlString = "" - static let bugReportDefaultHost = "dev01.tchap.incubateur.net" + static let bugReportDefaultHost = "agent.tchap.gouv.fr" static let bugReportEndpointUrlSuffix = "/bugreports" // Use the name allocated by the bug report server - static let bugReportApplicationId = "devtchap-ios" + static let bugReportApplicationId = "tchap-ios" // MARK: - Integrations @@ -237,12 +266,40 @@ final class BuildSettings: NSObject { // "" : [ tchapFeatureAnyHomeServer ] to allow a feature to any instance static let tchapFeatureNotificationByEmail = "tchapFeatureNotificationByEmail" static let tchapFeatureVoiceOverIP = "tchapFeatureVoiceOverIP" - static let tchapFeatureVideoOverIP = "tchapFeatureVideoOverIP" // Tchap: in Dev, allow any feature to any instance. + static let tchapFeatureVideoOverIP = "tchapFeatureVideoOverIP" static let tchapFeatureGeolocationSharing = "tchapFeatureGeolocationSharing" // linked to `locationSharingEnabled` property (see above) static var tchapFeaturesAllowedHomeServersForFeature: [String: [String]] = [ - tchapFeatureAnyFeature: [ tchapFeatureAnyHomeServer ] + tchapFeatureNotificationByEmail: [ + tchapFeatureAnyHomeServer + ], + // Audio calls for all in Tchap Production. + tchapFeatureVoiceOverIP: [ + "agent.externe.tchap.gouv.fr", + "agent.collectivites.tchap.gouv.fr", + "agent.tchap.gouv.fr", + "agent.elysee.tchap.gouv.fr", + "agent.pm.tchap.gouv.fr", + "agent.ssi.tchap.gouv.fr", + "agent.finances.tchap.gouv.fr", + "agent.social.tchap.gouv.fr", + "agent.interieur.tchap.gouv.fr", + "agent.agriculture.tchap.gouv.fr", + "agent.justice.tchap.gouv.fr", + "agent.diplomatie.tchap.gouv.fr", + "agent.intradef.tchap.gouv.fr", + "agent.dinum.tchap.gouv.fr", + "agent.culture.tchap.gouv.fr", + "agent.dev-durable.tchap.gouv.fr", + "agent.education.tchap.gouv.fr" + ], + tchapFeatureVideoOverIP: [ + "agent.dinum.tchap.gouv.fr" + ], + tchapFeatureGeolocationSharing: [ + tchapFeatureAnyHomeServer + ] ] - + // MARK: - Side Menu static let enableSideMenu: Bool = true && !newAppLayoutEnabled static let sideMenuShowInviteFriends: Bool = true @@ -280,14 +337,14 @@ final class BuildSettings: NSObject { static let settingsScreenShowUserFirstName: Bool = false static let settingsScreenShowUserSurname: Bool = false - static let settingsScreenAllowAddingEmailThreepids: Bool = true - static let settingsScreenAllowAddingPhoneThreepids: Bool = true - static let settingsScreenShowThreepidExplanatory: Bool = true - static let settingsScreenShowDiscoverySettings: Bool = true - static let settingsScreenAllowIdentityServerConfig: Bool = true + static let settingsScreenAllowAddingEmailThreepids: Bool = false + static let settingsScreenAllowAddingPhoneThreepids: Bool = false + static let settingsScreenShowThreepidExplanatory: Bool = false + static let settingsScreenShowDiscoverySettings: Bool = false + static let settingsScreenAllowIdentityServerConfig: Bool = false static let settingsScreenShowConfirmMediaSize: Bool = true static let settingsScreenShowAdvancedSettings: Bool = true - static let settingsScreenShowLabSettings: Bool = true + static let settingsScreenShowLabSettings: Bool = false static let settingsScreenAllowChangingRageshakeSettings: Bool = true static let settingsScreenAllowChangingCrashUsageDataSettings: Bool = true static let settingsScreenAllowBugReportingManually: Bool = true @@ -295,14 +352,14 @@ final class BuildSettings: NSObject { static let settingsScreenShowChangePassword: Bool = true static let settingsScreenShowEnableStunServerFallback: Bool = true static let settingsScreenShowNotificationDecodedContentOption: Bool = true - static let settingsScreenShowNsfwRoomsOption: Bool = true + static let settingsScreenShowNsfwRoomsOption: Bool = false static let settingsSecurityScreenShowSessions: Bool = true static let settingsSecurityScreenShowSetupBackup: Bool = true static let settingsSecurityScreenShowRestoreBackup: Bool = true static let settingsSecurityScreenShowDeleteBackup: Bool = true static let settingsSecurityScreenShowCryptographyInfo: Bool = true static let settingsSecurityScreenShowCryptographyExport: Bool = true - static let settingsSecurityScreenShowAdvancedUnverifiedDevices: Bool = true + static let settingsSecurityScreenShowAdvancedUnverifiedDevices: Bool = false /// A setting to enable the presence configuration settings section. static let settingsScreenPresenceAllowConfiguration: Bool = false @@ -310,8 +367,8 @@ final class BuildSettings: NSObject { static let roomInputToolbarCompressionMode: MediaCompressionMode = .prompt enum MediaCompressionMode { - case prompt, small, medium, large, none - } + case prompt, small, medium, large, none + } // MARK: - Room Creation Screen diff --git a/RiotShareExtension/Common.xcconfig b/RiotShareExtension/Common.xcconfig index a225a4e61d..15139328d8 100644 --- a/RiotShareExtension/Common.xcconfig +++ b/RiotShareExtension/Common.xcconfig @@ -1,5 +1,5 @@ // -// Copyright 2022 Vector Creations 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. @@ -17,7 +17,7 @@ // Configuration settings file format documentation can be found at: // https://help.apple.com/xcode/#/dev745c5c974 -#include "DevTchap/SupportingFiles/DevTchap-App-Common.xcconfig" +#include "Tchap/SupportingFiles/App-Common.xcconfig" PRODUCT_NAME = RiotShareExtension PRODUCT_BUNDLE_IDENTIFIER = $(BASE_BUNDLE_IDENTIFIER).shareExtension