From 011c8e1794481ddf402e2e79e5642a57027cfae7 Mon Sep 17 00:00:00 2001
From: Doug <douglase@element.io>
Date: Tue, 7 Feb 2023 12:57:52 +0000
Subject: [PATCH 1/3] changelog.d: Upgrade MatrixSDK version
 ([v0.25.1](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.25.1)).

---
 Podfile                       | 2 +-
 changelog.d/x-nolink-0.change | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/x-nolink-0.change

diff --git a/Podfile b/Podfile
index 2330eb1b8..d910bb9e6 100644
--- a/Podfile
+++ b/Podfile
@@ -16,7 +16,7 @@ use_frameworks!
 # - `{ :specHash => {sdk spec hash}` to depend on specific pod options (:git => …, :podspec => …) for MatrixSDK repo. Used by Fastfile during CI
 #
 # Warning: our internal tooling depends on the name of this variable name, so be sure not to change it
-$matrixSDKVersion = '= 0.25.0'
+$matrixSDKVersion = '= 0.25.1'
 # $matrixSDKVersion = :local
 # $matrixSDKVersion = { :branch => 'develop'}
 # $matrixSDKVersion = { :specHash => { git: 'https://git.io/fork123', branch: 'fix' } }
diff --git a/changelog.d/x-nolink-0.change b/changelog.d/x-nolink-0.change
new file mode 100644
index 000000000..628b34c40
--- /dev/null
+++ b/changelog.d/x-nolink-0.change
@@ -0,0 +1 @@
+Upgrade MatrixSDK version ([v0.25.1](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.25.1)).
\ No newline at end of file

From 2649e8cd625b729c0eeabf78b555ef18807853d5 Mon Sep 17 00:00:00 2001
From: Doug <douglase@element.io>
Date: Tue, 7 Feb 2023 12:57:52 +0000
Subject: [PATCH 2/3] version++

---
 CHANGES.md                    | 28 ++++++++++++++++++++++++++++
 changelog.d/6597.change       |  1 -
 changelog.d/7189.change       |  1 -
 changelog.d/7253.feature      |  1 -
 changelog.d/7298.change       |  1 -
 changelog.d/7311.change       |  1 -
 changelog.d/7316.change       |  1 -
 changelog.d/pr-7293.change    |  1 -
 changelog.d/pr-7303.change    |  1 -
 changelog.d/pr-7310.change    |  1 -
 changelog.d/pr-7314.change    |  1 -
 changelog.d/pr-7319.change    |  1 -
 changelog.d/pr-7320.change    |  1 -
 changelog.d/pr-7323.change    |  1 -
 changelog.d/pr-7324.change    |  1 -
 changelog.d/pr-7332.change    |  1 -
 changelog.d/pr-7333.change    |  1 -
 changelog.d/pr-7335.change    |  1 -
 changelog.d/pr-7341.change    |  1 -
 changelog.d/x-nolink-0.change |  1 -
 20 files changed, 28 insertions(+), 19 deletions(-)
 delete mode 100644 changelog.d/6597.change
 delete mode 100644 changelog.d/7189.change
 delete mode 100644 changelog.d/7253.feature
 delete mode 100644 changelog.d/7298.change
 delete mode 100644 changelog.d/7311.change
 delete mode 100644 changelog.d/7316.change
 delete mode 100644 changelog.d/pr-7293.change
 delete mode 100644 changelog.d/pr-7303.change
 delete mode 100644 changelog.d/pr-7310.change
 delete mode 100644 changelog.d/pr-7314.change
 delete mode 100644 changelog.d/pr-7319.change
 delete mode 100644 changelog.d/pr-7320.change
 delete mode 100644 changelog.d/pr-7323.change
 delete mode 100644 changelog.d/pr-7324.change
 delete mode 100644 changelog.d/pr-7332.change
 delete mode 100644 changelog.d/pr-7333.change
 delete mode 100644 changelog.d/pr-7335.change
 delete mode 100644 changelog.d/pr-7341.change
 delete mode 100644 changelog.d/x-nolink-0.change

diff --git a/CHANGES.md b/CHANGES.md
index c24df14b8..af14f69c5 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,31 @@
+## Changes in 1.10.1 (2023-02-07)
+
+✨ Features
+
+- Add mark as unread option for rooms ([#7253](https://github.com/vector-im/element-ios/issues/7253))
+
+🙌 Improvements
+
+- Polls: add logic for fetching poll histories in rooms. ([#7293](https://github.com/vector-im/element-ios/pull/7293))
+- Poll: add a feature to load more polls in the poll history. ([#7303](https://github.com/vector-im/element-ios/pull/7303))
+- CryptoV2: Generate Crypto SDK store key ([#7310](https://github.com/vector-im/element-ios/pull/7310))
+- Poll: added poll detail in poll list hisotry with navigation to timeline ([#7314](https://github.com/vector-im/element-ios/pull/7314))
+- Backup: Display backup import progress ([#7319](https://github.com/vector-im/element-ios/pull/7319))
+- Polls: sync push rules with the one of normal messages. ([#7320](https://github.com/vector-im/element-ios/pull/7320))
+- CryptoV2: Reset Crypto SDK on logout ([#7323](https://github.com/vector-im/element-ios/pull/7323))
+- Polls: add error handling when syncing push rules with the ones of normal messages. ([#7324](https://github.com/vector-im/element-ios/pull/7324))
+- CryptoV2: Refresh notification service on crypto change ([#7332](https://github.com/vector-im/element-ios/pull/7332))
+- CryptoV2: Enable Crypto SDK for production ([#7333](https://github.com/vector-im/element-ios/pull/7333))
+- Polls: add automatic synchronization logic for poll push rules. ([#7335](https://github.com/vector-im/element-ios/pull/7335))
+- Polls: update poll history UI. ([#7341](https://github.com/vector-im/element-ios/pull/7341))
+- Upgrade MatrixSDK version ([v0.25.1](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.25.1)).
+- Hide the presence info if the presence status is unknown. ([#6597](https://github.com/vector-im/element-ios/issues/6597))
+- Inform the user about decryption errors during a voice broadcast. ([#7189](https://github.com/vector-im/element-ios/issues/7189))
+- App Layout: Removed the onboarding flow ([#7298](https://github.com/vector-im/element-ios/issues/7298))
+- Improve error handling during a voice broadcast playback. ([#7311](https://github.com/vector-im/element-ios/issues/7311))
+- Labs: Rich text editor: enable list items indentation ([#7316](https://github.com/vector-im/element-ios/issues/7316))
+
+
 ## Changes in 1.10.0 (2023-02-02)
 
 🙌 Improvements
diff --git a/changelog.d/6597.change b/changelog.d/6597.change
deleted file mode 100644
index 46ca176a7..000000000
--- a/changelog.d/6597.change
+++ /dev/null
@@ -1 +0,0 @@
-Hide the presence info if the presence status is unknown.
diff --git a/changelog.d/7189.change b/changelog.d/7189.change
deleted file mode 100644
index 98ffa1e03..000000000
--- a/changelog.d/7189.change
+++ /dev/null
@@ -1 +0,0 @@
-Inform the user about decryption errors during a voice broadcast.
diff --git a/changelog.d/7253.feature b/changelog.d/7253.feature
deleted file mode 100644
index 9bf47a493..000000000
--- a/changelog.d/7253.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add mark as unread option for rooms
\ No newline at end of file
diff --git a/changelog.d/7298.change b/changelog.d/7298.change
deleted file mode 100644
index a7f7a74ce..000000000
--- a/changelog.d/7298.change
+++ /dev/null
@@ -1 +0,0 @@
-App Layout: Removed the onboarding flow
diff --git a/changelog.d/7311.change b/changelog.d/7311.change
deleted file mode 100644
index d9b992237..000000000
--- a/changelog.d/7311.change
+++ /dev/null
@@ -1 +0,0 @@
-Improve error handling during a voice broadcast playback.
diff --git a/changelog.d/7316.change b/changelog.d/7316.change
deleted file mode 100644
index 4ef97e1bd..000000000
--- a/changelog.d/7316.change
+++ /dev/null
@@ -1 +0,0 @@
-Labs: Rich text editor: enable list items indentation
diff --git a/changelog.d/pr-7293.change b/changelog.d/pr-7293.change
deleted file mode 100644
index 4fe2717d2..000000000
--- a/changelog.d/pr-7293.change
+++ /dev/null
@@ -1 +0,0 @@
-Polls: add logic for fetching poll histories in rooms.
diff --git a/changelog.d/pr-7303.change b/changelog.d/pr-7303.change
deleted file mode 100644
index fc6bbdb3a..000000000
--- a/changelog.d/pr-7303.change
+++ /dev/null
@@ -1 +0,0 @@
-Poll: add a feature to load more polls in the poll history.
diff --git a/changelog.d/pr-7310.change b/changelog.d/pr-7310.change
deleted file mode 100644
index 4ba5e9ee1..000000000
--- a/changelog.d/pr-7310.change
+++ /dev/null
@@ -1 +0,0 @@
-CryptoV2: Generate Crypto SDK store key
diff --git a/changelog.d/pr-7314.change b/changelog.d/pr-7314.change
deleted file mode 100644
index fd3dc46e9..000000000
--- a/changelog.d/pr-7314.change
+++ /dev/null
@@ -1 +0,0 @@
-Poll: added poll detail in poll list hisotry with navigation to timeline
diff --git a/changelog.d/pr-7319.change b/changelog.d/pr-7319.change
deleted file mode 100644
index 187b315b5..000000000
--- a/changelog.d/pr-7319.change
+++ /dev/null
@@ -1 +0,0 @@
-Backup: Display backup import progress
diff --git a/changelog.d/pr-7320.change b/changelog.d/pr-7320.change
deleted file mode 100644
index 3d34c84e2..000000000
--- a/changelog.d/pr-7320.change
+++ /dev/null
@@ -1 +0,0 @@
-Polls: sync push rules with the one of normal messages.
diff --git a/changelog.d/pr-7323.change b/changelog.d/pr-7323.change
deleted file mode 100644
index 308cf2813..000000000
--- a/changelog.d/pr-7323.change
+++ /dev/null
@@ -1 +0,0 @@
-CryptoV2: Reset Crypto SDK on logout
diff --git a/changelog.d/pr-7324.change b/changelog.d/pr-7324.change
deleted file mode 100644
index 1d7133eb8..000000000
--- a/changelog.d/pr-7324.change
+++ /dev/null
@@ -1 +0,0 @@
-Polls: add error handling when syncing push rules with the ones of normal messages.
diff --git a/changelog.d/pr-7332.change b/changelog.d/pr-7332.change
deleted file mode 100644
index 94a5bdc89..000000000
--- a/changelog.d/pr-7332.change
+++ /dev/null
@@ -1 +0,0 @@
-CryptoV2: Refresh notification service on crypto change
diff --git a/changelog.d/pr-7333.change b/changelog.d/pr-7333.change
deleted file mode 100644
index fbf81e873..000000000
--- a/changelog.d/pr-7333.change
+++ /dev/null
@@ -1 +0,0 @@
-CryptoV2: Enable Crypto SDK for production
diff --git a/changelog.d/pr-7335.change b/changelog.d/pr-7335.change
deleted file mode 100644
index 62512e930..000000000
--- a/changelog.d/pr-7335.change
+++ /dev/null
@@ -1 +0,0 @@
-Polls: add automatic synchronization logic for poll push rules.
diff --git a/changelog.d/pr-7341.change b/changelog.d/pr-7341.change
deleted file mode 100644
index 2129cec32..000000000
--- a/changelog.d/pr-7341.change
+++ /dev/null
@@ -1 +0,0 @@
-Polls: update poll history UI.
diff --git a/changelog.d/x-nolink-0.change b/changelog.d/x-nolink-0.change
deleted file mode 100644
index 628b34c40..000000000
--- a/changelog.d/x-nolink-0.change
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade MatrixSDK version ([v0.25.1](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.25.1)).
\ No newline at end of file

From 1bcd8efba0cc133e7f8ce941e70e219c94377b6d Mon Sep 17 00:00:00 2001
From: Doug <douglase@element.io>
Date: Tue, 7 Feb 2023 15:11:52 +0000
Subject: [PATCH 3/3] finish version++

---
 Podfile.lock | 38 ++++++++------------------------------
 1 file changed, 8 insertions(+), 30 deletions(-)

diff --git a/Podfile.lock b/Podfile.lock
index a8c7f04f8..e1d507e8d 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -21,23 +21,6 @@ PODS:
   - Down (0.11.0)
   - DSBottomSheet (0.3.0)
   - DSWaveformImage (6.1.1)
-  - DTCoreText (1.6.26):
-    - DTCoreText/Core (= 1.6.26)
-    - DTFoundation/Core (~> 1.7.5)
-    - DTFoundation/DTAnimatedGIF (~> 1.7.5)
-    - DTFoundation/DTHTMLParser (~> 1.7.5)
-    - DTFoundation/UIKit (~> 1.7.5)
-  - DTCoreText/Core (1.6.26):
-    - DTFoundation/Core (~> 1.7.5)
-    - DTFoundation/DTAnimatedGIF (~> 1.7.5)
-    - DTFoundation/DTHTMLParser (~> 1.7.5)
-    - DTFoundation/UIKit (~> 1.7.5)
-  - DTFoundation/Core (1.7.18)
-  - DTFoundation/DTAnimatedGIF (1.7.18)
-  - DTFoundation/DTHTMLParser (1.7.18):
-    - DTFoundation/Core
-  - DTFoundation/UIKit (1.7.18):
-    - DTFoundation/Core
   - FLEX (4.5.0)
   - FlowCommoniOS (1.12.2)
   - GBDeviceInfo (7.1.0):
@@ -55,9 +38,9 @@ PODS:
   - LoggerAPI (1.9.200):
     - Logging (~> 1.1)
   - Logging (1.4.0)
-  - MatrixSDK (0.25.0):
-    - MatrixSDK/Core (= 0.25.0)
-  - MatrixSDK/Core (0.25.0):
+  - MatrixSDK (0.25.1):
+    - MatrixSDK/Core (= 0.25.1)
+  - MatrixSDK/Core (0.25.1):
     - AFNetworking (~> 4.0.0)
     - GZIP (~> 1.3.0)
     - libbase58 (~> 0.1.4)
@@ -65,7 +48,7 @@ PODS:
     - OLMKit (~> 3.2.5)
     - Realm (= 10.27.0)
     - SwiftyBeaver (= 1.9.5)
-  - MatrixSDK/JingleCallStack (0.25.0):
+  - MatrixSDK/JingleCallStack (0.25.1):
     - JitsiMeetSDK (= 5.0.2)
     - MatrixSDK/Core
   - MatrixSDKCrypto (0.2.0)
@@ -112,7 +95,6 @@ DEPENDENCIES:
   - Down (~> 0.11.0)
   - DSBottomSheet (~> 0.3)
   - DSWaveformImage (~> 6.1.1)
-  - DTCoreText (~> 1.6.25)
   - FLEX (~> 4.5.0)
   - FlowCommoniOS (~> 1.12.0)
   - GBDeviceInfo (~> 7.1.0)
@@ -120,8 +102,8 @@ DEPENDENCIES:
   - KeychainAccess (~> 4.2.2)
   - KTCenterFlowLayout (~> 1.3.1)
   - libPhoneNumber-iOS (~> 0.9.13)
-  - MatrixSDK (= 0.25.0)
-  - MatrixSDK/JingleCallStack (= 0.25.0)
+  - MatrixSDK (= 0.25.1)
+  - MatrixSDK/JingleCallStack (= 0.25.1)
   - OLMKit
   - PostHog (~> 1.4.4)
   - ReadMoreTextView (~> 3.0.1)
@@ -148,8 +130,6 @@ SPEC REPOS:
     - Down
     - DSBottomSheet
     - DSWaveformImage
-    - DTCoreText
-    - DTFoundation
     - FLEX
     - FlowCommoniOS
     - GBDeviceInfo
@@ -203,8 +183,6 @@ SPEC CHECKSUMS:
   Down: b6ba1bc985c9d2f4e15e3b293d2207766fa12612
   DSBottomSheet: ca0ac37eb5af2dd54663f86b84382ed90a59be2a
   DSWaveformImage: 3c718a0cf99291887ee70d1d0c18d80101d3d9ce
-  DTCoreText: ec749e013f2e1f76de5e7c7634642e600a7467ce
-  DTFoundation: a53f8cda2489208cbc71c648be177f902ee17536
   FLEX: e51461dd6f0bfb00643c262acdfea5d5d12c596b
   FlowCommoniOS: ca92071ab526dc89905495a37844fd7e78d1a7f2
   GBDeviceInfo: 5d62fa85bdcce3ed288d83c28789adf1173e4376
@@ -218,7 +196,7 @@ SPEC CHECKSUMS:
   libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
   LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
   Logging: beeb016c9c80cf77042d62e83495816847ef108b
-  MatrixSDK: a9d05e760434eff941bbb35164cffb01b3f94b63
+  MatrixSDK: 823c5c2ef8b8a769c30fa62e1be8ec801e6312e7
   MatrixSDKCrypto: e1ef22aae76b5a6f030ace21a47be83864f4ff44
   OLMKit: da115f16582e47626616874e20f7bb92222c7a51
   PostHog: 4b6321b521569092d4ef3a02238d9435dbaeb99f
@@ -239,6 +217,6 @@ SPEC CHECKSUMS:
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
   ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
 
-PODFILE CHECKSUM: 916221b3e9512715d5e1e1e310a0aa0552e1f0f1
+PODFILE CHECKSUM: becc7a1d080df477982664af957cdc02ff843c56
 
 COCOAPODS: 1.11.3