code cleanup and plurals in import log entries

closes #698

3 files changed, 11 insertions, 5 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
index 60162a682..fab394a14 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
@@ -390,9 +390,6 @@ public class ImportKeysActivity extends ActionBarActivity {
 
     /**
      * Scroll ViewPager left and right
-     *
-     * @param event
-     * @return
      */
     @Override
     public boolean onTouchEvent(MotionEvent event) {
@@ -432,7 +429,7 @@ public class ImportKeysActivity extends ActionBarActivity {
                     // get returned data bundle
                     Bundle returnData = message.getData();
                     final ImportResult result =
-                            returnData.<ImportResult>getParcelable(KeychainIntentService.RESULT);
+                            returnData.getParcelable(KeychainIntentService.RESULT);
 
                     int resultType = result.getResult();
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
index 160869895..9a39b6cc3 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
@@ -35,6 +35,7 @@ import org.sufficientlysecure.keychain.helper.Preferences;
 import org.sufficientlysecure.keychain.keyimport.ImportKeysListEntry;
 import org.sufficientlysecure.keychain.keyimport.Keyserver;
 import org.sufficientlysecure.keychain.keyimport.ParcelableKeyRing;
+import org.sufficientlysecure.keychain.pgp.PgpKeyHelper;
 import org.sufficientlysecure.keychain.ui.adapter.AsyncTaskResultWrapper;
 import org.sufficientlysecure.keychain.ui.adapter.ImportKeysAdapter;
 import org.sufficientlysecure.keychain.ui.adapter.ImportKeysListKeybaseLoader;
@@ -79,6 +80,7 @@ public class ImportKeysListFragment extends ListFragment implements
     public ArrayList<ParcelableKeyRing> getSelectedData() {
         ArrayList<ParcelableKeyRing> result = new ArrayList<ParcelableKeyRing>();
         for (ImportKeysListEntry entry : getSelectedEntries()) {
+            Log.d(Constants.TAG, "code" + Integer.toString(entry.hashCode()));
             result.add(mCachedKeyData.get(entry.hashCode()));
         }
         return result;
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) {