Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-26 01:18:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove all differences in url parameters.

Browse Source
This commit is contained in:
Matt Corallo
2014-01-09 09:24:46 -10:00
parent 48fe609d53
commit 605e88d4bf
2 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/org/whispersystems/textsecuregcm/controllers/KeysController.java
View File

@@ -16,6 +16,7 @@
*/
package org.whispersystems.textsecuregcm.controllers;
import com.google.common.base.Optional;
import com.yammer.dropwizard.auth.Auth;
import com.yammer.metrics.annotation.Timed;
import org.slf4j.Logger;
@@ -94,23 +95,15 @@ public class KeysController {
@GET
@Path("/{number}")
@Produces(MediaType.APPLICATION_JSON)
public PreKey get(@Auth Account account,
@PathParam("number") String number,
@QueryParam("relay") String relay)
public Response get(@Auth Account account,
@PathParam("number") String number,
@QueryParam("multikeys") Optional<String> multikey,
@QueryParam("relay") String relay)
throws RateLimitExceededException
{
return getKeys(account, number, relay).get(0);
}
@Timed
@GET
@Path("/multikeys/{number}")
@Produces(MediaType.APPLICATION_JSON)
public List<PreKey> getMultiDevice(@Auth Account account,
@PathParam("number") String number,
@QueryParam("relay") String relay)
throws RateLimitExceededException
{
return getKeys(account, number, relay);
if (!multikey.isPresent())
return Response.ok(getKeys(account, number, relay).get(0)).type(MediaType.APPLICATION_JSON).build();
else
return Response.ok(getKeys(account, number, relay)).type(MediaType.APPLICATION_JSON).build();
}
}