# HG changeset patch
# User Carl Byington <carl@five-ten-sg.com>
# Date 1403196985 25200
# Node ID 2a0b10fd128d2eed7ca3264e57f88cd07b192d29
# Parent  50e1dead04a124a7e2a72c8b2ae9340b022e4d9a
host editor database values override summary text only if non-empty

diff -r 50e1dead04a1 -r 2a0b10fd128d src/com/five_ten_sg/connectbot/HostEditorActivity.java
--- a/src/com/five_ten_sg/connectbot/HostEditorActivity.java	Thu Jun 19 09:42:41 2014 -0700
+++ b/src/com/five_ten_sg/connectbot/HostEditorActivity.java	Thu Jun 19 09:56:25 2014 -0700
@@ -55,7 +55,6 @@
         protected final long id;
 
         protected Map<String, String> values = new HashMap<String, String>();
-        protected Map<String, CharSequence> summaries = new HashMap<String, CharSequence>();
 
         public CursorPreferenceHack(String table, long id) {
             this.table = table;
@@ -215,6 +214,7 @@
 
     private CursorPreferenceHack pref;
     private ServiceConnection connection;
+    private Map<String, CharSequence> summaries = new HashMap<String, CharSequence>();
 
     private HostBean host;
     private boolean enableSSHFeatures;
@@ -325,7 +325,7 @@
             Preference pref = this.findPreference(key);
             if (pref == null) continue;
             if (pref instanceof CheckBoxPreference) continue;
-            CharSequence value = this.pref.getSummary(key, "");
+            CharSequence value = pref.getSummary();
             summaries.put(key, value);
         }
     }