From e551fd2c1bbc8c37485e57a0de2eb1351650c217 Mon Sep 17 00:00:00 2001
From: Jon Chambers <63609320+jon-signal@users.noreply.github.com>
Date: Tue, 17 Nov 2020 09:25:20 -0500
Subject: [PATCH] Revert "Pause checks for GV1 migration when checking for
 capability downgrades."

This reverts commit e7745db36e6ee27bfefddf3ad11d921f016c281f.
---
 .../textsecuregcm/controllers/DeviceController.java           | 4 ++++
 .../textsecuregcm/tests/controllers/DeviceControllerTest.java | 2 --
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/DeviceController.java b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/DeviceController.java
index 00184d591..6864d1fc0 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/DeviceController.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/DeviceController.java
@@ -235,6 +235,10 @@ public class DeviceController {
   private boolean isCapabilityDowngrade(Account account, DeviceCapabilities capabilities, String userAgent) {
     boolean isDowngrade = false;
 
+    if (account.isGv1MigrationSupported() && !capabilities.isGv1Migration()) {
+      isDowngrade = true;
+    }
+
     if (account.isGroupsV2Supported()) {
       try {
         switch (UserAgentUtil.parseUserAgentString(userAgent).getPlatform()) {
diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/DeviceControllerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/DeviceControllerTest.java
index b5419f1af..5715dec84 100644
--- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/DeviceControllerTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/DeviceControllerTest.java
@@ -11,7 +11,6 @@ import junitparams.JUnitParamsRunner;
 import junitparams.Parameters;
 import org.glassfish.jersey.test.grizzly.GrizzlyWebTestContainerFactory;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -261,7 +260,6 @@ public class DeviceControllerTest {
   }
 
   @Test
-  @Ignore
   public void deviceDowngradeGv1MigrationTest() {
     Device.DeviceCapabilities deviceCapabilities = new Device.DeviceCapabilities(true, true, true, true, false, false);
     AccountAttributes accountAttributes = new AccountAttributes("keykeykeykey", false, 1234, null, null, null, null, true, deviceCapabilities);