Merge pull request #215 from matrix-org/add_room_key_request

Add room keys sharing

matrix-sdk/src/androidTest/java/org/matrix/androidsdk/CryptoTest.java

@@ -1777,6 +1777,8 @@ public void onLiveEvent(Event event, RoomState roomState) {
                 if (TextUtils.equals(event.getType(), Event.EVENT_TYPE_MESSAGE)) {
                     results.put("sam1", "sam1");
                     lock1.countDown();
+                }  else if (TextUtils.equals(event.getType(), Event.EVENT_TYPE_MESSAGE_ENCRYPTED)) {
+                    lock1.countDown();
                 }
             }
         };
@@ -1804,15 +1806,14 @@ public void onUnexpectedError(Exception e) {
                 lock1.countDown();
             }
         });
-        lock1.await(1000, TimeUnit.DAYS.MILLISECONDS);
-        assertTrue(results.containsKey("send1") && results.containsKey("bob1") && results.containsKey("sam1"));
+        lock1.await(10000, TimeUnit.DAYS.MILLISECONDS);
+        assertTrue(results + "", results.containsKey("send1") && results.containsKey("bob1") && results.containsKey("sam1"));
 
         List<MXDeviceInfo> list = mBobSession.getCrypto().getUserDevices(mAliceSession.getMyUserId());
 
         assertTrue(null != list);
         assertTrue(list.size() > 0);
 
-
         final CountDownLatch lock1b = new CountDownLatch(1);
         mBobSession.getCrypto().setDeviceVerification(MXDeviceInfo.DEVICE_VERIFICATION_BLOCKED, list.get(0).deviceId, mAliceSession.getMyUserId(), new ApiCallback<Void>() {
             @Override

matrix-sdk/src/main/java/org/matrix/androidsdk/crypto/IncomingRoomKeyRequest.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2016 OpenMarket Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.androidsdk.crypto;
+
+import org.matrix.androidsdk.rest.model.Event;
+import org.matrix.androidsdk.rest.model.RoomKeyRequest;
+import org.matrix.androidsdk.rest.model.RoomKeyRequestBody;
+
+import org.matrix.androidsdk.util.JsonUtils;
+
+import java.io.Serializable;
+
+/**
+ * IncomingRoomKeyRequest class defines the incoming room keys request.
+ */
+public class IncomingRoomKeyRequest implements Serializable {
+    public String mUserId;
+    public String mDeviceId;
+    public String mRequestId;
+    public RoomKeyRequestBody mRequestBody;
+    public Runnable mShare;
+
+    public IncomingRoomKeyRequest(Event event) {
+        mUserId = event.getSender();
+
+        RoomKeyRequest roomKeyRequest = JsonUtils.toRoomKeyRequest(event.getContentAsJsonObject());
+        mDeviceId = roomKeyRequest.requesting_device_id;
+        mRequestId = roomKeyRequest.request_id;
+        mRequestBody = (null != roomKeyRequest.body) ? roomKeyRequest.body : new RoomKeyRequestBody();
+    }
+}
+

matrix-sdk/src/main/java/org/matrix/androidsdk/crypto/IncomingRoomKeyRequestCancellation.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright 2016 OpenMarket Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.androidsdk.crypto;
+
+import org.matrix.androidsdk.rest.model.Event;
+
+/**
+ * IncomingRoomKeyRequestCancellation describes the incoming room key cancellation.
+ */
+public class IncomingRoomKeyRequestCancellation extends IncomingRoomKeyRequest {
+
+    public IncomingRoomKeyRequestCancellation(Event event) {
+        super(event);
+        mRequestBody = null;
+    }
+}