From 0e6773b4b70595808db42b1129b6f072edb93a39 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Thu, 12 Jun 2014 11:58:24 -0700
Subject: [PATCH] Remove directory refresh preference.

This is present on the contact screen now, so there's no longer
any need for it here.
---
 res/xml/preferences.xml                             |  3 ---
 .../securesms/ApplicationPreferencesActivity.java   | 13 +------------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 0a5229b26d..692fdc32b2 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -170,9 +170,6 @@
         <Preference android:key="pref_mms_preferences"
                     android:title="@string/preferences__advanced_mms_access_point_names"/>
 
-        <Preference android:key="pref_update_directory"
-                    android:title="@string/preferences__refresh_push_directory"/>
-
         <Preference android:key="pref_submit_debug_logs"
                     android:title="@string/preferences__submit_debug_log"/>
 
diff --git a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java b/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
index 6c503bd7e5..10c737d748 100644
--- a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
+++ b/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
@@ -26,8 +26,8 @@ import android.content.SharedPreferences;
 import android.media.Ringtone;
 import android.media.RingtoneManager;
 import android.net.Uri;
-import android.os.Build;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Bundle;
 import android.preference.CheckBoxPreference;
 import android.preference.EditTextPreference;
@@ -54,7 +54,6 @@ import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
 import org.thoughtcrime.securesms.push.PushServiceSocketFactory;
 import org.thoughtcrime.securesms.service.KeyCachingService;
 import org.thoughtcrime.securesms.util.Dialogs;
-import org.thoughtcrime.securesms.util.DirectoryHelper;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.MemoryCleaner;
@@ -122,8 +121,6 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredSherlockPr
       .setOnPreferenceChangeListener(new ListSummaryListener());
     this.findPreference(TextSecurePreferences.RINGTONE_PREF)
       .setOnPreferenceChangeListener(new RingtoneSummaryListener());
-    this.findPreference(UPDATE_DIRECTORY_PREF)
-        .setOnPreferenceClickListener(new DirectoryUpdateListener());
     this.findPreference(SUBMIT_DEBUG_LOG_PREF)
         .setOnPreferenceClickListener(new SubmitDebugLogListener());
     this.findPreference(OUTGOING_SMS_PREF)
@@ -548,14 +545,6 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredSherlockPr
     }
   }
 
-  private class DirectoryUpdateListener implements Preference.OnPreferenceClickListener {
-    @Override
-    public boolean onPreferenceClick(Preference preference) {
-      DirectoryHelper.refreshDirectoryWithProgressDialog(ApplicationPreferencesActivity.this);
-      return true;
-    }
-  }
-
   private class SubmitDebugLogListener implements Preference.OnPreferenceClickListener {
     @Override
     public boolean onPreferenceClick(Preference preference) {