From 149671095b4c0c4270b7234120a27c6c26fd93ad Mon Sep 17 00:00:00 2001
From: Ben Reser <ben@reser.org>
Date: Wed, 18 Dec 2013 20:15:21 -0800
Subject: [PATCH] Fix issue #469: Hide "Clear Passphrase" if passphrase is
 disabled.

---
 src/org/thoughtcrime/securesms/ConversationListActivity.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/org/thoughtcrime/securesms/ConversationListActivity.java b/src/org/thoughtcrime/securesms/ConversationListActivity.java
index 520b14c90..030983e60 100644
--- a/src/org/thoughtcrime/securesms/ConversationListActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationListActivity.java
@@ -35,6 +35,7 @@ import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.MemoryCleaner;
 import org.thoughtcrime.securesms.util.Util;
+import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.whispersystems.textsecure.crypto.MasterSecret;
 
 import java.util.ArrayList;
@@ -100,6 +101,8 @@ public class ConversationListActivity extends PassphraseRequiredSherlockFragment
 
     inflater.inflate(R.menu.text_secure_normal, menu);
 
+    menu.findItem(R.id.menu_clear_passphrase).setVisible(!TextSecurePreferences.isPasswordDisabled(this));
+
     super.onPrepareOptionsMenu(menu);
     return true;
   }