Merge tag 'v3.2.1' into linked-identities

Version 3.2.1

Conflicts:
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java
	OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
	OpenKeychain/src/main/res/values/strings.xml

2 files changed, 3 insertions, 22 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java
index f09dc1a4f..3dbae09b6 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java
@@ -18,15 +18,12 @@
 package org.sufficientlysecure.keychain.ui.adapter;
 
 
-import java.util.Calendar;
 import java.util.Date;
-import java.util.TimeZone;
 
 import android.content.Context;
 import android.database.Cursor;
 import android.graphics.PorterDuff;
 import android.support.v4.widget.CursorAdapter;
-import android.text.format.DateFormat;
 import android.text.format.DateUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -176,9 +173,8 @@ public class KeyAdapter extends CursorAdapter {
                                     | DateUtils.FORMAT_SHOW_TIME
                                     | DateUtils.FORMAT_SHOW_YEAR
                                     | DateUtils.FORMAT_ABBREV_MONTH);
-
-                    mCreationDate.setText(context.getString(R.string.label_creation,
-                            dateTime));
+                    mCreationDate.setText(context.getString(R.string.label_key_created,
+                                dateTime));
                     mCreationDate.setVisibility(View.VISIBLE);
                 } else {
                     mCreationDate.setVisibility(View.GONE);
@@ -281,20 +277,6 @@ public class KeyAdapter extends CursorAdapter {
             }
         }
 
-        public boolean hasDuplicate() {
-            return mHasDuplicate;
-        }
-
-        public String getCreationDate(Context context) {
-            Calendar creationCal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
-            creationCal.setTime(mCreation);
-            // convert from UTC to time zone of device
-            creationCal.setTimeZone(TimeZone.getDefault());
-
-            return context.getString(R.string.label_creation) + ": "
-                    + DateFormat.getDateFormat(context).format(creationCal.getTime());
-        }
-
     }
 
 }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java
index 1ccb910d0..6bbf41a88 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java
@@ -140,8 +140,7 @@ abstract public class SelectKeyCursorAdapter extends CursorAdapter {
                             | DateUtils.FORMAT_SHOW_TIME
                             | DateUtils.FORMAT_SHOW_YEAR
                             | DateUtils.FORMAT_ABBREV_MONTH);
-
-            h.creation.setText(context.getString(R.string.label_creation, dateTime));
+            h.creation.setText(context.getString(R.string.label_key_created, dateTime));
             h.creation.setVisibility(View.VISIBLE);
         } else {
             h.creation.setVisibility(View.GONE);