Merge pull request #132 from matrix-org/add_get_key_request_support

Add get key request support
matrix-org · Feb 17, 2017 · 1d77f6d · 1d77f6d
2 parents 418b56f + 32842c4
commit 1d77f6d
Show file tree

Hide file tree

Showing 22 changed files with 924 additions and 191 deletions.
diff --git a/matrix-sdk/src/androidTest/java/org/matrix/androidsdk/CryptoRestTest.java b/matrix-sdk/src/androidTest/java/org/matrix/androidsdk/CryptoRestTest.java
@@ -38,7 +38,6 @@
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
@@ -122,7 +121,7 @@ public void onUnexpectedError(Exception e) {
         assertTrue(0 == keysUploadResponse.oneTimeKeyCountsForAlgorithm("deded"));
 
         final CountDownLatch lock1 = new CountDownLatch(1);
-        mBobSession.getCryptoRestClient().downloadKeysForUsers(Arrays.asList(mBobSession.getMyUserId()), new ApiCallback<KeysQueryResponse>() {
+        mBobSession.getCryptoRestClient().downloadKeysForUsers(Arrays.asList(mBobSession.getMyUserId()), null, new ApiCallback<KeysQueryResponse>() {
             @Override
             public void onSuccess(KeysQueryResponse keysQueryResponse) {
                 results.put("keysQueryResponse", keysQueryResponse);