From e00914c97752f232d7b5236369ee095ec8dcfbe2 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Tue, 25 Jun 2013 10:48:18 -0700
Subject: [PATCH] Fix QR Code Regression.

---
 .../thoughtcrime/securesms/VerifyIdentityActivity.java   | 9 ---------
 src/org/thoughtcrime/securesms/VerifyKeysActivity.java   | 1 +
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java b/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java
index 7bb2673d0..86c9baf2e 100644
--- a/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java
+++ b/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java
@@ -57,15 +57,6 @@ public class VerifyIdentityActivity extends KeyScanningActivity {
     super.onDestroy();
   }
 
-  @Override
-  public boolean onOptionsItemSelected(MenuItem item) {
-    switch (item.getItemId()) {
-      case android.R.id.home: finish(); return true;
-    }
-
-    return false;
-  }
-
   private void initializeLocalIdentityKey() {
     if (!IdentityKeyUtil.hasIdentityKey(this)) {
       localIdentityFingerprint.setText(R.string.VerifyIdentityActivity_you_do_not_have_an_identity_key);
diff --git a/src/org/thoughtcrime/securesms/VerifyKeysActivity.java b/src/org/thoughtcrime/securesms/VerifyKeysActivity.java
index 0d18ca0f4..1da01cd93 100644
--- a/src/org/thoughtcrime/securesms/VerifyKeysActivity.java
+++ b/src/org/thoughtcrime/securesms/VerifyKeysActivity.java
@@ -46,6 +46,7 @@ public class VerifyKeysActivity extends KeyScanningActivity {
   @Override
   protected void onCreate(Bundle state) {
     super.onCreate(state);
+    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
     setContentView(R.layout.verify_keys_activity);
 
     initializeResources();