Merge pull request #495 from breser/issue469

Merge Fix issue #469: Hide "Clear Passphrase" if passphrase is disabled.

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;
   }