From bae024d0af9ae64f6c0f93adee349bb13c0611ea Mon Sep 17 00:00:00 2001
From: Daniel Micay <danielmicay@gmail.com>
Date: Tue, 8 Dec 2020 02:26:50 -0500
Subject: [PATCH] drop unmaintained support for CalyxOS

---
 .../java/app/attestation/auditor/AttestationProtocol.java | 8 --------
 app/src/main/res/values/strings.xml                       | 2 --
 2 files changed, 10 deletions(-)

diff --git a/app/src/main/java/app/attestation/auditor/AttestationProtocol.java b/app/src/main/java/app/attestation/auditor/AttestationProtocol.java
index 743d137f4..27917b77d 100644
--- a/app/src/main/java/app/attestation/auditor/AttestationProtocol.java
+++ b/app/src/main/java/app/attestation/auditor/AttestationProtocol.java
@@ -311,11 +311,6 @@ private static class DeviceInfo {
                     new DeviceInfo(R.string.device_pixel_4_xl, 3, 4, false /* uses new API */, true, R.string.os_graphene))
             .put("9F2454A1657B1B5AD7F2336B39A2611F7A40B2E0DDFD0D6553A359605928DF29",
                     new DeviceInfo(R.string.device_pixel_4a, 3, 4, false /* uses new API */, true, R.string.os_graphene))
-            // CalyxOS
-            .put("BCEBF6844F6B0FA2ABE8E62A9D0D57A324D0C02CEFDFA019FD49832F9ED39105",
-                    new DeviceInfo(R.string.device_pixel_2_generic, 2, 3, true, true, R.string.os_calyx))
-            .put("B4DE537A5F4B8FDAB6789EB2C06EC6E065E48A79EDD493A91F635004DD89F3E2",
-                    new DeviceInfo(R.string.device_pixel_3_generic, 3, 4, false /* uses new API */, true, R.string.os_calyx))
             .build();
     private static final ImmutableMap<String, DeviceInfo> fingerprintsStock = ImmutableMap
             .<String, DeviceInfo>builder()
@@ -456,9 +451,6 @@ private static class DeviceInfo {
                     new DeviceInfo(R.string.device_pixel_4_xl, 3, 4, false /* uses new API */, true, R.string.os_graphene))
             .put("9F2454A1657B1B5AD7F2336B39A2611F7A40B2E0DDFD0D6553A359605928DF29",
                     new DeviceInfo(R.string.device_pixel_4a, 3, 4, false /* uses new API */, true, R.string.os_graphene))
-            // CalyxOS
-            .put("B4DE537A5F4B8FDAB6789EB2C06EC6E065E48A79EDD493A91F635004DD89F3E2",
-                    new DeviceInfo(R.string.device_pixel_3_generic, 3, 4, false /* uses new API */, true, R.string.os_calyx))
             .build();
     private static final ImmutableMap<String, DeviceInfo> fingerprintsStrongBoxStock = ImmutableMap
             .<String, DeviceInfo>builder()
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1a9978ed7..6838e3d3a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -79,7 +79,6 @@
     <string name="device_nokia_7_1">Nokia 7.1</string>
     <string name="device_pixel_2">Google Pixel 2</string>
     <string name="device_pixel_2_xl">Google Pixel 2 XL</string>
-    <string name="device_pixel_2_generic">Google Pixel 2 / Pixel 2 XL</string>
     <string name="device_pixel_3_generic">Google Pixel 3 / Pixel 3 XL</string>
     <string name="device_pixel_3">Google Pixel 3</string>
     <string name="device_pixel_3_xl">Google Pixel 3 XL</string>
@@ -140,5 +139,4 @@
 
     <string name="os_stock">Stock</string>
     <string name="os_graphene">GrapheneOS</string>
-    <string name="os_calyx">CalyxOS</string>
 </resources>