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, 11 insertions, 15 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java
index 525bc26ca..63a1aade9 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java
@@ -136,7 +136,7 @@ public class EncryptKeyCompletionView extends TokenCompleteTextView
             where += " AND " + KeyRings.USER_ID + " LIKE ?";
 
             return new CursorLoader(getContext(), baseUri, KeyAdapter.PROJECTION, where,
-                    new String[] { "%" + query  + "%" }, null);
+                    new String[]{"%" + query + "%"}, null);
         }
 
         mAdapter.setSearchQuery(null);
@@ -156,7 +156,7 @@ public class EncryptKeyCompletionView extends TokenCompleteTextView
 
     @Override
     public void showDropDown() {
-        if (mAdapter.getCursor().isClosed()) {
+        if (mAdapter == null || mAdapter.getCursor() == null || mAdapter.getCursor().isClosed()) {
             return;
         }
         super.showDropDown();
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 8cf15a75a..61b7c718b 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,7 +26,7 @@ import android.support.v4.app.LoaderManager;
 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;
@@ -42,10 +42,6 @@ import org.sufficientlysecure.keychain.pgp.KeyRing;
 import org.sufficientlysecure.keychain.provider.KeychainContract;
 import org.sufficientlysecure.keychain.util.Log;
 
-import java.util.Calendar;
-import java.util.Date;
-import java.util.TimeZone;
-
 /**
  * Use AppCompatSpinner from AppCompat lib instead of Spinner. Fixes white dropdown icon.
  * Related: http://stackoverflow.com/a/27713090
@@ -164,14 +160,14 @@ 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_TIME
+                                        | 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);