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

Always return an empty list of prekeys.

Browse Source
This commit is contained in:
Jon Chambers
2021-01-15 12:20:01 -05:00
committed by Jon Chambers
parent 550c0c7625
commit e5a2c1ab10
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
service/src/main/java/org/whispersystems/textsecuregcm/storage/Keys.java
View File

@@ -21,6 +21,7 @@ import org.whispersystems.textsecuregcm.storage.mappers.KeyRecordRowMapper;
import org.whispersystems.textsecuregcm.util.Constants;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import java.util.function.Supplier;
@@ -74,7 +75,7 @@ public class Keys {
}
public List<KeyRecord> get(String number, long deviceId) {
try {
/* try {
return database.with(jdbi -> jdbi.inTransaction(TransactionIsolationLevel.SERIALIZABLE, handle -> {
try (Timer.Context ignored = getDevicetTimer.time()) {
return handle.createQuery("DELETE FROM keys WHERE id IN (SELECT id FROM keys WHERE number = :number AND device_id = :device_id ORDER BY key_id ASC LIMIT 1) RETURNING *")
@@ -88,11 +89,14 @@ public class Keys {
// TODO 2021-01-13 Replace this with a retry once desktop clients better handle HTTP/500 responses
fallbackMeter.mark();
return Collections.emptyList();
}
} */
// 2021-01-15 Emergency service recovery measure
return new LinkedList<>();
}
public List<KeyRecord> get(String number) {
try {
/* try {
return database.with(jdbi -> jdbi.inTransaction(TransactionIsolationLevel.SERIALIZABLE, handle -> {
try (Timer.Context ignored = getTimer.time()) {
return handle.createQuery("DELETE FROM keys WHERE id IN (SELECT DISTINCT ON (number, device_id) id FROM keys WHERE number = :number ORDER BY number, device_id, key_id ASC) RETURNING *")
@@ -105,7 +109,10 @@ public class Keys {
// TODO 2021-01-13 Replace this with a retry once desktop clients better handle HTTP/500 responses
fallbackMeter.mark();
return Collections.emptyList();
}
} */
// 2021-01-15 Emergency service recovery measure
return new LinkedList<>();
}
public int getCount(String number, long deviceId) {