From 1daea51cfb9ad0a32e7c1e925bd196d0650e1876 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Mon, 20 Jul 2015 17:29:41 -0700
Subject: [PATCH] Switch to "home as up" button on new contact selection
 activity.

Fixes #3687
// FREEBIE
---
 .../securesms/NewConversationActivity.java    | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/src/org/thoughtcrime/securesms/NewConversationActivity.java b/src/org/thoughtcrime/securesms/NewConversationActivity.java
index f3a711288d..7218db15c7 100644
--- a/src/org/thoughtcrime/securesms/NewConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/NewConversationActivity.java
@@ -17,7 +17,11 @@
 package org.thoughtcrime.securesms;
 
 import android.content.Intent;
+import android.os.Bundle;
+import android.view.MenuItem;
+import android.view.View;
 
+import org.thoughtcrime.securesms.crypto.MasterSecret;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.ThreadDatabase;
 import org.thoughtcrime.securesms.recipients.RecipientFactory;
@@ -33,6 +37,14 @@ public class NewConversationActivity extends ContactSelectionActivity {
 
   private static final String TAG = NewConversationActivity.class.getSimpleName();
 
+  @Override
+  public void onCreate(Bundle bundle, MasterSecret masterSecret) {
+    super.onCreate(bundle, masterSecret);
+
+    action.setVisibility(View.GONE);
+    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+  }
+
   @Override
   public void onContactSelected(String number) {
     Recipients recipients = RecipientFactory.getRecipientsFromString(this, number, true);
@@ -54,4 +66,15 @@ public class NewConversationActivity extends ContactSelectionActivity {
     }
   }
 
+  @Override
+  public boolean onOptionsItemSelected(MenuItem item) {
+    super.onOptionsItemSelected(item);
+
+    switch (item.getItemId()) {
+      case android.R.id.home: super.onBackPressed(); return true;
+    }
+
+    return false;
+  }
+
 }