code cleanup and plurals in import log entries

closes #698

1 files changed, 8 insertions, 1 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/LogDisplayFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/LogDisplayFragment.java
index e42d9d00b..67317de6e 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/LogDisplayFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/LogDisplayFragment.java
@@ -173,7 +173,14 @@ public class LogDisplayFragment extends ListFragment implements OnTouchListener
                 ih = (ItemHolder) convertView.getTag();
             }
 
-            ih.mText.setText(getResources().getString(entry.mType.getMsgId(), (Object[]) entry.mParameters));
+            // special case: first parameter may be a quantity
+            if (entry.mParameters != null && entry.mParameters.length > 0
+                    && entry.mParameters[0] instanceof Integer) {
+                ih.mText.setText(getResources().getQuantityString(entry.mType.getMsgId(),
+                        (Integer) entry.mParameters[0], entry.mParameters));
+            } else {
+                ih.mText.setText(getResources().getString(entry.mType.getMsgId(), entry.mParameters));
+            }
             ih.mText.setTextColor(entry.mLevel == LogLevel.DEBUG ? Color.GRAY : Color.BLACK);
             convertView.setPadding((entry.mIndent) * dipFactor, 0, 0, 0);
             switch (entry.mLevel) {