Mercurial > 510Connectbot

changeset 130:2a0b10fd128d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
host editor database values override summary text only if non-empty
author Carl Byington <carl@five-ten-sg.com>
date Thu, 19 Jun 2014 09:56:25 -0700
parents 50e1dead04a1
children adf9ca45675b
files src/com/five_ten_sg/connectbot/HostEditorActivity.java
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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);
         }
     }