Skip to content

Commit

Permalink
Revert "Reset Element Screens"
Browse files Browse the repository at this point in the history
This reverts commit 1d6502e.

# Conflicts:
#	Riot/Modules/Authentication/AuthenticationCoordinator.swift
#	RiotSwiftUI/Modules/Authentication/Login/AuthenticationLoginModels.swift
#	RiotSwiftUI/Modules/Authentication/Login/AuthenticationLoginViewModel.swift
#	Tchap/Assets/Images.xcassets/AgenConnect/agent_connect_icon.imageset/[email protected]
#	Tchap/Extensions/WebLinks+Tchap.swift
  • Loading branch information
Nicolas Buquet committed Oct 7, 2024
1 parent fbb79f7 commit 363d65f
Show file tree
Hide file tree
Showing 36 changed files with 478 additions and 279 deletions.
14 changes: 7 additions & 7 deletions Config/AppIdentifiers.xcconfig
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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
2 changes: 1 addition & 1 deletion DevTchap/Config/BuildSettings.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
18 changes: 9 additions & 9 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ PODS:
- Down (0.11.0)
- DSBottomSheet (0.3.0)
- DSWaveformImage (6.1.1)
- FLEX (5.22.10)
- FLEX (4.5.0)
- FlowCommoniOS (1.12.2)
- GBDeviceInfo (7.1.0):
- GBDeviceInfo/Core (= 7.1.0)
Expand All @@ -39,17 +39,17 @@ PODS:
- LoggerAPI (1.9.200):
- Logging (~> 1.1)
- Logging (1.4.0)
- MatrixSDK (0.27.11):
- MatrixSDK/Core (= 0.27.11)
- MatrixSDK/Core (0.27.11):
- MatrixSDK (0.27.10):
- MatrixSDK/Core (= 0.27.10)
- MatrixSDK/Core (0.27.10):
- AFNetworking (~> 4.0.0)
- GZIP (~> 1.3.0)
- libbase58 (~> 0.1.4)
- MatrixSDKCrypto (= 0.4.2)
- OLMKit (~> 3.2.5)
- Realm (= 10.27.0)
- SwiftyBeaver (= 1.9.5)
- MatrixSDK/JingleCallStack (0.27.11):
- MatrixSDK/JingleCallStack (0.27.10):
- JitsiMeetSDKLite (= 8.1.2-lite)
- MatrixSDK/Core
- MatrixSDKCrypto (0.4.2)
Expand Down Expand Up @@ -96,7 +96,7 @@ DEPENDENCIES:
- Down (~> 0.11.0)
- DSBottomSheet (~> 0.3)
- DSWaveformImage (~> 6.1.1)
- FLEX (~> 5.22.10)
- FLEX (~> 4.5.0)
- FlowCommoniOS (~> 1.12.0)
- GBDeviceInfo (~> 7.1.0)
- Introspect (~> 0.1)
Expand Down Expand Up @@ -179,7 +179,7 @@ SPEC CHECKSUMS:
Down: b6ba1bc985c9d2f4e15e3b293d2207766fa12612
DSBottomSheet: ca0ac37eb5af2dd54663f86b84382ed90a59be2a
DSWaveformImage: 3c718a0cf99291887ee70d1d0c18d80101d3d9ce
FLEX: f21ee4f498eed3f8a1eded66b21939fd3b7a22ce
FLEX: e51461dd6f0bfb00643c262acdfea5d5d12c596b
FlowCommoniOS: ca92071ab526dc89905495a37844fd7e78d1a7f2
GBDeviceInfo: 5d62fa85bdcce3ed288d83c28789adf1173e4376
GZIP: 3c0abf794bfce8c7cb34ea05a1837752416c8868
Expand All @@ -193,7 +193,7 @@ SPEC CHECKSUMS:
libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
Logging: beeb016c9c80cf77042d62e83495816847ef108b
MatrixSDK: 7c29e5cc8934cfc1f81f83fcfa17cd652612086d
MatrixSDK: c805f9306d60955215f4b15043ed0f96fd4867b3
MatrixSDKCrypto: 736069ee0a5ec12852ab3498bf2242acecc443fc
OLMKit: da115f16582e47626616874e20f7bb92222c7a51
PostHog: 660ec6c9d80cec17b685e148f17f6785a88b597d
Expand All @@ -215,6 +215,6 @@ SPEC CHECKSUMS:
zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
ZXingObjC: 8898711ab495761b2dbbdec76d90164a6d7e14c5

PODFILE CHECKSUM: 4c754458cc7f3e4e8d97c36fe5692f5b82807db2
PODFILE CHECKSUM: 971cd7529e2d127b237469afa2c18e6dced151ec

COCOAPODS: 1.14.3
104 changes: 104 additions & 0 deletions Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
{
"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
}
Loading

0 comments on commit 363d65f

Please sign in to comment.