From 71267ec33345f9e80de93e8159a019680e4ff976 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Sun, 26 Feb 2017 16:27:12 -0800
Subject: [PATCH] phase out legacy support for last resort

// FREEBIE
---
 .../textsecuregcm/controllers/KeysControllerV2.java             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/whispersystems/textsecuregcm/controllers/KeysControllerV2.java b/src/main/java/org/whispersystems/textsecuregcm/controllers/KeysControllerV2.java
index febd18189..d54f0646d 100644
--- a/src/main/java/org/whispersystems/textsecuregcm/controllers/KeysControllerV2.java
+++ b/src/main/java/org/whispersystems/textsecuregcm/controllers/KeysControllerV2.java
@@ -114,7 +114,7 @@ public class KeysControllerV2 extends KeysController {
 
           if (targetKeys.isPresent()) {
             for (KeyRecord keyRecord : targetKeys.get()) {
-              if (keyRecord.getDeviceId() == device.getId()) {
+              if (!keyRecord.isLastResort() && keyRecord.getDeviceId() == device.getId()) {
                 preKey = new PreKeyV2(keyRecord.getKeyId(), keyRecord.getPublicKey());
               }
             }