From 9291563cef9a2f2d676bd774df39988c9793ca45 Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Wed, 11 Dec 2019 14:29:41 +0100
Subject: [PATCH] Fix color parsing

---
 app/src/main/java/protect/card_locker/PkpassImporter.java | 8 ++++----
 app/src/test/java/protect/card_locker/PkpassTest.java     | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/protect/card_locker/PkpassImporter.java b/app/src/main/java/protect/card_locker/PkpassImporter.java
index 91deaaaf6..4a05bf3cf 100644
--- a/app/src/main/java/protect/card_locker/PkpassImporter.java
+++ b/app/src/main/java/protect/card_locker/PkpassImporter.java
@@ -105,9 +105,9 @@ public class PkpassImporter {
         if(headerColorMatcher.find())
         {
             headerColor = Color.rgb(
-                    Integer.parseInt(headerColorMatcher.group(0)),
                     Integer.parseInt(headerColorMatcher.group(1)),
-                    Integer.parseInt(headerColorMatcher.group(2)));
+                    Integer.parseInt(headerColorMatcher.group(2)),
+                    Integer.parseInt(headerColorMatcher.group(3)));
         }
 
 
@@ -117,9 +117,9 @@ public class PkpassImporter {
         if(headerTextColorMatcher.find())
         {
             headerTextColor = Color.rgb(
-                Integer.parseInt(headerTextColorMatcher.group(0)),
                 Integer.parseInt(headerTextColorMatcher.group(1)),
-                Integer.parseInt(headerTextColorMatcher.group(2)));
+                Integer.parseInt(headerTextColorMatcher.group(2)),
+                Integer.parseInt(headerTextColorMatcher.group(3)));
         }
 
         return new LoyaltyCard(-1, store, note, cardId, barcodeType, headerColor, headerTextColor);
diff --git a/app/src/test/java/protect/card_locker/PkpassTest.java b/app/src/test/java/protect/card_locker/PkpassTest.java
index ed408fe02..896ffcb37 100644
--- a/app/src/test/java/protect/card_locker/PkpassTest.java
+++ b/app/src/test/java/protect/card_locker/PkpassTest.java
@@ -111,7 +111,7 @@ public class PkpassTest {
         assertEquals(card.cardId, "0000001");
         assertEquals(card.note, "Staff Pass for Employee Number 001");
         assertEquals(card.store, "Passbook Example Company");
-        assertEquals(card.headerColor, String.valueOf(Color.rgb(90, 90, 90)));
-        assertEquals(card.headerTextColor, String.valueOf(Color.rgb(255, 255, 255)));
+        assertEquals(card.headerColor.toString(), String.valueOf(Color.rgb(90, 90, 90)));
+        assertEquals(card.headerTextColor.toString(), String.valueOf(Color.rgb(255, 255, 255)));
     }
 }