From e7705eaca8fcfc1ee7c2f55b176260b7971f2950 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 23 Oct 2017 22:52:29 +0200
Subject: [PATCH] Use constants for vendor and product IDs

---
 .../securitytoken/usb/UsbTransport.java       | 49 +++++++++++++------
 .../src/main/res/xml/usb_device_filter.xml    | 12 ++---
 2 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/usb/UsbTransport.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/usb/UsbTransport.java
index a92612ef0..80c7e7252 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/usb/UsbTransport.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/usb/UsbTransport.java
@@ -56,6 +56,25 @@ public class UsbTransport implements Transport {
     private static final int MASK_SHORT_APDU = 0x20000;
     private static final int MASK_EXTENDED_APDU = 0x40000;
 
+    // https://github.com/Yubico/yubikey-personalization/blob/master/ykcore/ykdef.h
+    private static final int VENDOR_YUBICO = 4176;
+    private static final int PRODUCT_YUBIKEY_NEO_OTP_CCID = 273;
+    private static final int PRODUCT_YUBIKEY_NEO_CCID = 274;
+    private static final int PRODUCT_YUBIKEY_NEO_U2F_CCID = 277;
+    private static final int PRODUCT_YUBIKEY_NEO_OTP_U2F_CCID = 278;
+    private static final int PRODUCT_YUBIKEY_4_CCID = 1028;
+    private static final int PRODUCT_YUBIKEY_4_OTP_CCID = 1029;
+    private static final int PRODUCT_YUBIKEY_4_U2F_CCID = 1030;
+    private static final int PRODUCT_YUBIKEY_4_OTP_U2F_CCID = 1031;
+
+    // https://www.nitrokey.com/de/documentation/installation#p:nitrokey-pro&os:linux
+    private static final int VENDOR_NITROKEY = 8352;
+    private static final int PRODUCT_NITROKEY_PRO = 16648;
+    private static final int PRODUCT_NITROKEY_START = 16913;
+    private static final int PRODUCT_NITROKEY_STORAGE = 16649;
+
+    private static final int VENDOR_FSIJ = 9035;
+    private static final int VENDOR_LEDGER = 11415;
 
     private final UsbDevice usbDevice;
     private final UsbManager usbManager;
@@ -211,36 +230,36 @@ public class UsbTransport implements Transport {
     @Override
     public TokenType getTokenType() {
         switch (usbDevice.getVendorId()) {
-            case 4176: {
+            case VENDOR_YUBICO: {
                 switch (usbDevice.getProductId()) {
-                    case 273:
-                    case 274:
-                    case 277:
-                    case 278:
+                    case PRODUCT_YUBIKEY_NEO_OTP_CCID:
+                    case PRODUCT_YUBIKEY_NEO_CCID:
+                    case PRODUCT_YUBIKEY_NEO_U2F_CCID:
+                    case PRODUCT_YUBIKEY_NEO_OTP_U2F_CCID:
                         return TokenType.YUBIKEY_NEO;
-                    case 1028:
-                    case 1029:
-                    case 1030:
-                    case 1031:
+                    case PRODUCT_YUBIKEY_4_CCID:
+                    case PRODUCT_YUBIKEY_4_OTP_CCID:
+                    case PRODUCT_YUBIKEY_4_U2F_CCID:
+                    case PRODUCT_YUBIKEY_4_OTP_U2F_CCID:
                         return TokenType.YUBIKEY_4;
                 }
                 break;
             }
-            case 8352: {
+            case VENDOR_NITROKEY: {
                 switch (usbDevice.getProductId()) {
-                    case 16648:
+                    case PRODUCT_NITROKEY_PRO:
                         return TokenType.NITROKEY_PRO;
-                    case 16913:
+                    case PRODUCT_NITROKEY_START:
                         return TokenType.NITROKEY_START;
-                    case 16649:
+                    case PRODUCT_NITROKEY_STORAGE:
                         return TokenType.NITROKEY_STORAGE;
                 }
                 break;
             }
-            case 9035: {
+            case VENDOR_FSIJ: {
                 return TokenType.GNUK;
             }
-            case 11415: {
+            case VENDOR_LEDGER: {
                 return TokenType.LEDGER_NANO_S;
             }
         }
diff --git a/OpenKeychain/src/main/res/xml/usb_device_filter.xml b/OpenKeychain/src/main/res/xml/usb_device_filter.xml
index d1ecfd32d..4686b6da9 100644
--- a/OpenKeychain/src/main/res/xml/usb_device_filter.xml
+++ b/OpenKeychain/src/main/res/xml/usb_device_filter.xml
@@ -1,12 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<!--
-    Based on
-    https://github.com/Yubico/yubikey-personalization/blob/master/ykcore/ykdef.h
-    https://www.nitrokey.com/de/documentation/installation#p:nitrokey-pro&os:linux
-
-    Note that values are decimal.
--->
 <resources>
 
     <!--
@@ -19,6 +11,10 @@
         Route some HID devices (class 3) to OpenKeychain.
         These tokens are generally supported but need to have CCID enabled.
         Thus, we show a notification inside OpenKeychain to inform the user.
+
+        Based on
+        https://github.com/Yubico/yubikey-personalization/blob/master/ykcore/ykdef.h
+        Note that values are decimal.
     -->
     <!-- Yubikey NEO - OTP only -->
     <usb-device class="3" vendor-id="4176" product-id="272"/>