Implement the backup of the room keys (element-hq/riot-android#2642)

matrix-org · Nov 29, 2018 · 7ac2ee2 · 7ac2ee2
1 parent 27ba2a9
commit 7ac2ee2
Show file tree

Hide file tree

Showing 33 changed files with 2,764 additions and 109 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -7,6 +7,8 @@ Features:
 Improvements:
  - Any Account data element, even if the type is not known is persisted.
  - The crypto store is now implemented using a Realm database. The existing file store will be migrated at first usage (#398)
+ - Upgrade olm-sdk.aar from version 2.3.0 to version 3.0.0
+ - Implement the backup of the room keys (vector-im/riot-android#2642)
 
 Bugfix:
  - Room members who left are listed with the actual members (vector-im/riot-android#2744)
@@ -16,6 +18,7 @@ Bugfix:
 API Change:
  - new API in CallSoundsManager to allow client to play the specified Ringtone (vector-im/riot-android#827)
  - IMXStore.storeAccountData() has been renamed to IMXStore.storeRoomAccountData()
+ - MXCrypto: importRoomKeys methods now return number of imported keys and number of total keys in the Callback.
 
 Translations:
  -

diff --git a/matrix-sdk/libs/olm-sdk.aar b/matrix-sdk/libs/olm-sdk.aar
diff --git a/matrix-sdk/src/androidTest/java/org/matrix/androidsdk/common/Triple.java b/matrix-sdk/src/androidTest/java/org/matrix/androidsdk/common/Triple.java