From 5fb4f274f9ee1122252d7db7b28365304681f058 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Sun, 2 Feb 2020 08:00:57 +0100
Subject: [PATCH 1/3] Version ++

---
 CHANGES.md          | 21 +++++++++++++++++++++
 vector/build.gradle |  4 ++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 3ec29d8fc3..dd25c0a2af 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,24 @@
+Changes in RiotX 0.15.0 (2020-XX-XX)
+===================================================
+
+Features ✨:
+ -
+
+Improvements 🙌:
+ -
+
+Other changes:
+ -
+
+Bugfix 🐛:
+ -
+
+Translations 🗣:
+ -
+
+Build 🧱:
+ -
+
 Changes in RiotX 0.14.1 (2020-02-02)
 ===================================================
 
diff --git a/vector/build.gradle b/vector/build.gradle
index 724456eb14..0407874ad0 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -15,8 +15,8 @@ androidExtensions {
 }
 
 ext.versionMajor = 0
-ext.versionMinor = 14
-ext.versionPatch = 1
+ext.versionMinor = 15
+ext.versionPatch = 0
 
 static def getGitTimestamp() {
     def cmd = 'git show -s --format=%ct'

From 367057cc29c261d69cb89d30399c9c3211956437 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Sun, 2 Feb 2020 14:01:45 +0100
Subject: [PATCH 2/3] Fix / cold start

---
 .../crypto/algorithms/megolm/MXMegolmDecryption.kt  | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt
index 5519e5b7ac..9121ce3fcb 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt
@@ -57,7 +57,6 @@ internal class MXMegolmDecryption(private val userId: String,
 
     var newSessionListener: NewSessionListener? = null
 
-    var hasCheckUserCrossSigning = false
     /**
      * Events which we couldn't decrypt due to unknown sessions / indexes: map from
      * senderKey|sessionId to timelines to list of MatrixEvents.
@@ -67,17 +66,7 @@ internal class MXMegolmDecryption(private val userId: String,
     override suspend fun decryptEvent(event: Event, timeline: String): MXEventDecryptionResult {
         // If cross signing is enabled, we don't send request until the keys are trusted
         // There could be a race effect here when xsigning is enabled, we should ensure that keys was downloaded once
-        if (!hasCheckUserCrossSigning) {
-            deviceListManager.downloadKeys(listOf(userId), true)
-            hasCheckUserCrossSigning = true
-        }
-        val requestOnFail =
-                if (cryptoStore.getMyCrossSigningInfo() != null) {
-                    cryptoStore.getMyCrossSigningInfo()?.isTrusted() == true
-                } else {
-                    // Legacy
-                    true
-                }
+        val requestOnFail = cryptoStore.getMyCrossSigningInfo()?.isTrusted() == true
         return decryptEvent(event, timeline, requestOnFail)
     }
 

From b158729b536c1679cd6a1b1a3c25821af9e30d4f Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Sun, 2 Feb 2020 14:05:12 +0100
Subject: [PATCH 3/3] Prepare v0.14.2

---
 CHANGES.md | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index dd25c0a2af..4100031b36 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,23 +1,7 @@
-Changes in RiotX 0.15.0 (2020-XX-XX)
+Changes in RiotX 0.14.2 (2020-02-02)
 ===================================================
 
-Features ✨:
- -
-
-Improvements 🙌:
- -
-
-Other changes:
- -
-
-Bugfix 🐛:
- -
-
-Translations 🗣:
- -
-
-Build 🧱:
- -
+Fix RiotX not starting issue
 
 Changes in RiotX 0.14.1 (2020-02-02)
 ===================================================