diff --git a/.idea/dictionaries/bmarty.xml b/.idea/dictionaries/bmarty.xml
index c29bca95f2..e788ef1d18 100644
--- a/.idea/dictionaries/bmarty.xml
+++ b/.idea/dictionaries/bmarty.xml
@@ -44,6 +44,7 @@
unpublish
unwedging
vctr
+ vodozemac
wellknown
diff --git a/changelog.d/8364.misc b/changelog.d/8364.misc
new file mode 100644
index 0000000000..27bf6b975a
--- /dev/null
+++ b/changelog.d/8364.misc
@@ -0,0 +1 @@
+Expose Rust SDK Version in Help & About page and in Bug Reports
diff --git a/library/ui-strings/src/main/res/values/strings.xml b/library/ui-strings/src/main/res/values/strings.xml
index 6810bf52d2..da4602e426 100644
--- a/library/ui-strings/src/main/res/values/strings.xml
+++ b/library/ui-strings/src/main/res/values/strings.xml
@@ -1002,7 +1002,9 @@
Version
- olm version
+
+ olm version
+ Crypto version
Terms & conditions
Acceptable Use Policy
Third party notices
diff --git a/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/RustCryptoService.kt b/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/RustCryptoService.kt
index 3f2b2a6ebe..0d71813c7f 100755
--- a/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/RustCryptoService.kt
+++ b/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/RustCryptoService.kt
@@ -184,8 +184,9 @@ internal class RustCryptoService @Inject constructor(
}
override fun getCryptoVersion(context: Context, longFormat: Boolean): String {
- // TODO we should provide olm and rust-sdk version from the rust-sdk
- return if (longFormat) "Rust SDK 0.3" else "0.3"
+ val version = org.matrix.rustcomponents.sdk.crypto.version()
+ val vodozemac = org.matrix.rustcomponents.sdk.crypto.vodozemacVersion()
+ return if (longFormat) "Rust SDK $version, Vodozemac $vodozemac" else version
}
override fun getMyCryptoDevice(): CryptoDeviceInfo {
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
index 50a53b6e77..56c25da0fd 100755
--- a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
@@ -52,7 +52,7 @@ class VectorPreferences @Inject constructor(
const val SETTINGS_CHANGE_PASSWORD_PREFERENCE_KEY = "SETTINGS_CHANGE_PASSWORD_PREFERENCE_KEY"
const val SETTINGS_VERSION_PREFERENCE_KEY = "SETTINGS_VERSION_PREFERENCE_KEY"
const val SETTINGS_SDK_VERSION_PREFERENCE_KEY = "SETTINGS_SDK_VERSION_PREFERENCE_KEY"
- const val SETTINGS_OLM_VERSION_PREFERENCE_KEY = "SETTINGS_OLM_VERSION_PREFERENCE_KEY"
+ const val SETTINGS_CRYPTO_VERSION_PREFERENCE_KEY = "SETTINGS_CRYPTO_VERSION_PREFERENCE_KEY"
const val SETTINGS_LOGGED_IN_PREFERENCE_KEY = "SETTINGS_LOGGED_IN_PREFERENCE_KEY"
const val SETTINGS_HOME_SERVER_PREFERENCE_KEY = "SETTINGS_HOME_SERVER_PREFERENCE_KEY"
const val SETTINGS_IDENTITY_SERVER_PREFERENCE_KEY = "SETTINGS_IDENTITY_SERVER_PREFERENCE_KEY"
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt
index f1a9b724e2..7777602166 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt
@@ -95,8 +95,8 @@ class VectorSettingsHelpAboutFragment :
}
// olm version
- findPreference(VectorPreferences.SETTINGS_OLM_VERSION_PREFERENCE_KEY)!!
- .summary = session.cryptoService().getCryptoVersion(requireContext(), false)
+ findPreference(VectorPreferences.SETTINGS_CRYPTO_VERSION_PREFERENCE_KEY)!!
+ .summary = session.cryptoService().getCryptoVersion(requireContext(), true)
}
companion object {
diff --git a/vector/src/main/res/xml/vector_settings_help_about.xml b/vector/src/main/res/xml/vector_settings_help_about.xml
index 0388b545b7..460f97d1cd 100644
--- a/vector/src/main/res/xml/vector_settings_help_about.xml
+++ b/vector/src/main/res/xml/vector_settings_help_about.xml
@@ -24,8 +24,8 @@
tools:summary="4.5.6" />
@@ -39,4 +39,4 @@
-
\ No newline at end of file
+