From c88d2e42b747fac700ab6ac47beeae91c76bdbd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 30 Apr 2015 18:57:51 +0200
Subject: Fix key creation string and display

---
 .../keychain/ui/adapter/KeyAdapter.java                 | 17 +----------------
 .../keychain/ui/adapter/SelectKeyCursorAdapter.java     |  2 +-
 .../keychain/ui/widget/KeySpinner.java                  | 16 ++++++++--------
 OpenKeychain/src/main/res/values/strings.xml            |  5 +++--
 4 files changed, 13 insertions(+), 27 deletions(-)

(limited to 'OpenKeychain')

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..eef44a94b 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
@@ -173,11 +173,10 @@ public class KeyAdapter extends CursorAdapter {
                     String dateTime = DateUtils.formatDateTime(context,
                             cursor.getLong(INDEX_CREATION) * 1000,
                             DateUtils.FORMAT_SHOW_DATE
-                                    | DateUtils.FORMAT_SHOW_TIME
                                     | DateUtils.FORMAT_SHOW_YEAR
                                     | DateUtils.FORMAT_ABBREV_MONTH);
 
-                    mCreationDate.setText(context.getString(R.string.label_creation,
+                    mCreationDate.setText(context.getString(R.string.label_key_created,
                             dateTime));
                     mCreationDate.setVisibility(View.VISIBLE);
                 } else {
@@ -281,20 +280,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..68c59f647 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
@@ -141,7 +141,7 @@ abstract public class SelectKeyCursorAdapter extends CursorAdapter {
                             | 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);
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 fc5ecd76a..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
@@ -26,6 +26,7 @@ import android.support.v4.content.Loader;
 import android.support.v4.widget.CursorAdapter;
 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;
@@ -167,14 +168,13 @@ public abstract class KeySpinner extends AppCompatSpinner implements LoaderManag
 
                     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);
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index d274a5ca3..1a862de7a 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -137,7 +137,8 @@
     <string name="label_file_compression">"File compression"</string>
     <string name="label_keyservers">"Keyservers"</string>
     <string name="label_key_id">"Key ID"</string>
-    <string name="label_creation">"Key created %s"</string>
+    <string name="label_key_created">"Key created %s"</string>
+    <string name="label_creation">"Creation"</string>
     <string name="label_expiry">"Expiry"</string>
     <string name="label_usage">"Usage"</string>
     <string name="label_key_size">"Key Size"</string>
@@ -503,7 +504,7 @@
     <string name="api_settings_delete_account">"Delete account"</string>
     <string name="api_settings_package_name">"Package Name"</string>
     <string name="api_settings_package_signature">"SHA-256 of Package Signature"</string>
-    <string name="api_settings_accounts">"Accounts (deprecated API)"</string>
+    <string name="api_settings_accounts">"Accounts (old API)"</string>
     <string name="api_settings_advanced">"Extended Information"</string>
     <string name="api_settings_allowed_keys">"Allowed Keys"</string>
     <string name="api_settings_settings">"Settings"</string>
-- 
cgit v1.2.3