From 2ef4d3f6e0dd88864fedd00ccc9a32e8ba02be44 Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Mon, 16 Dec 2019 17:03:33 +0100
Subject: [PATCH] Fix findBugs performance warning

---
 .../card_locker/LoyaltyCardViewActivity.java        |  5 +++--
 .../java/protect/card_locker/PkpassImporter.java    | 13 +++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
index 74c3d61ac..f32ff2ec2 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
@@ -30,6 +30,7 @@ import org.json.JSONException;
 
 import java.util.HashMap;
 import java.util.Locale;
+import java.util.Map;
 
 import protect.card_locker.preferences.Settings;
 
@@ -307,9 +308,9 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
         StringBuilder items = new StringBuilder();
 
         HashMap<String, String> extraValues = loyaltyCard.extras.getAllValues(new String[]{Locale.getDefault().getLanguage(), "en", ""});
-        for(String key : extraValues.keySet())
+        for(Map.Entry<String, String> entry : extraValues.entrySet())
         {
-            items.append(extraValues.get(key) + "\n");
+            items.append(entry.getValue() + "\n");
         }
 
         new AlertDialog.Builder(this)
diff --git a/app/src/main/java/protect/card_locker/PkpassImporter.java b/app/src/main/java/protect/card_locker/PkpassImporter.java
index 9fcca227c..f54fe5272 100644
--- a/app/src/main/java/protect/card_locker/PkpassImporter.java
+++ b/app/src/main/java/protect/card_locker/PkpassImporter.java
@@ -19,6 +19,7 @@ import java.io.InputStream;
 import java.nio.charset.Charset;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.zip.ZipEntry;
@@ -110,18 +111,18 @@ public class PkpassImporter {
             extrasHelper.addLanguageValue("", key, formattedUntranslatedValue);
 
             // Try to find translations
-            for(String language : translations.keySet())
+            for(Map.Entry<String, HashMap<String, String>> language : translations.entrySet())
             {
                 String translatedLabel = label;
-                if(translations.get(language).containsKey(label))
+                if(language.getValue().containsKey(label))
                 {
-                    translatedLabel = translations.get(language).get(label);
+                    translatedLabel = language.getValue().get(label);
                 }
 
                 String translatedValue = value;
-                if(translations.get(language).containsKey(value))
+                if(language.getValue().containsKey(value))
                 {
-                    translatedValue = translations.get(language).get(value);
+                    translatedValue = language.getValue().get(value);
                 }
 
                 String formattedValue = translatedValue;
@@ -131,7 +132,7 @@ public class PkpassImporter {
                     formattedValue = translatedLabel + ": " + translatedValue;
                 }
 
-                extrasHelper.addLanguageValue(language, key, formattedValue);
+                extrasHelper.addLanguageValue(language.getKey(), key, formattedValue);
             }
         }