1 files changed, 11 insertions, 11 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java
index 2c75c3a7d..aecc81604 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java
@@ -24,8 +24,9 @@ import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.LoaderManager;
 import android.support.v4.content.Loader;
 import android.support.v4.widget.CursorAdapter;
-import android.support.v7.internal.widget.TintSpinner;
+import android.support.v7.widget.AppCompatSpinner;
 import android.text.format.DateFormat;
+import android.text.format.DateUtils;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
@@ -46,10 +47,10 @@ import java.util.Date;
 import java.util.TimeZone;
 
 /**
- * Use TintSpinner from AppCompat lib instead of Spinner. Fixes white dropdown icon.
+ * Use AppCompatSpinner from AppCompat lib instead of Spinner. Fixes white dropdown icon.
  * Related: http://stackoverflow.com/a/27713090
  */
-public abstract class KeySpinner extends TintSpinner implements LoaderManager.LoaderCallbacks<Cursor> {
+public abstract class KeySpinner extends AppCompatSpinner implements LoaderManager.LoaderCallbacks<Cursor> {
     public interface OnKeyChangedListener {
         public void onKeyChanged(long masterKeyId);
     }
@@ -167,14 +168,13 @@ public abstract class KeySpinner extends TintSpinner implements LoaderManager.Lo
 
                     boolean duplicate = cursor.getLong(mIndexDuplicate) > 0;
                     if (duplicate) {
-                        Date creationDate = new Date(cursor.getLong(mIndexCreationDate) * 1000);
-                        Calendar creationCal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
-                        creationCal.setTime(creationDate);
-                        // convert from UTC to time zone of device
-                        creationCal.setTimeZone(TimeZone.getDefault());
-
-                        vDuplicate.setText(context.getString(R.string.label_creation) + ": "
-                                + DateFormat.getDateFormat(context).format(creationCal.getTime()));
+                        String dateTime = DateUtils.formatDateTime(context,
+                                cursor.getLong(mIndexCreationDate) * 1000,
+                                DateUtils.FORMAT_SHOW_DATE
+                                        | DateUtils.FORMAT_SHOW_YEAR
+                                        | DateUtils.FORMAT_ABBREV_MONTH);
+
+                        vDuplicate.setText(context.getString(R.string.label_key_created, dateTime));
                         vDuplicate.setVisibility(View.VISIBLE);
                     } else {
                         vDuplicate.setVisibility(View.GONE);