From 5d75f11cbcb49deccb7ed2c954400187189c15bd Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Mon, 21 May 2018 17:19:03 -0400
Subject: [PATCH] Bump version to 4.20.0.

---
 build.gradle                                         |  4 ++--
 .../thoughtcrime/securesms/ConversationActivity.java | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index e8c37bfec4..9f4917d2d6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -257,8 +257,8 @@ android {
     }
 
     defaultConfig {
-        versionCode 357
-        versionName "4.19.3"
+        versionCode 358
+        versionName "4.20.0"
 
         minSdkVersion 14
         targetSdkVersion 25
diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index e91c03fbc3..da39c131a0 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -428,12 +428,12 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       break;
     case PICK_CONTACT:
       // TODO(greyson): Re-enable shared contact sending after receiving has been enabled for a few releases
-      addAttachmentContactInfo(data.getData());
-//      if (isSecureText && !isSmsForced()) {
-//        openContactShareEditor(data.getData());
-//      } else {
-//        addAttachmentContactInfo(data.getData());
-//      }
+//      addAttachmentContactInfo(data.getData());
+      if (isSecureText && !isSmsForced()) {
+        openContactShareEditor(data.getData());
+      } else {
+        addAttachmentContactInfo(data.getData());
+      }
       break;
     case GET_CONTACT_DETAILS:
       sendSharedContact(data.getParcelableArrayListExtra(ContactShareEditActivity.KEY_CONTACTS));