1 files changed, 5 insertions, 54 deletions

diff --git a/src/net/hoopajoo/android/SoftKeys/ConfigureExtra.java b/src/net/hoopajoo/android/SoftKeys/ConfigureExtra.java
index 85bd35a..51f9fa6 100644
--- a/src/net/hoopajoo/android/SoftKeys/ConfigureExtra.java
+++ b/src/net/hoopajoo/android/SoftKeys/ConfigureExtra.java
@@ -44,7 +44,6 @@ import android.widget.Button;
 import android.widget.Spinner;
 
 public class ConfigureExtra extends Activity implements OnClickListener {    
-    /** Called when the activity is first created. */
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -52,17 +51,7 @@ public class ConfigureExtra extends Activity implements OnClickListener {
 
         SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences( this );
 
-        List<CustomKey> items = new ArrayList<CustomKey>();
-        
-        items.add( new CustomKey( 0, "NONE" ) );
-        items.add( new CustomKey( -1, "SLEEP" ) );
-        
-        for( int cnt = 1; cnt < 100; cnt++ ) {
-            String name = K.keyIdToName( cnt );
-            if( name != null ) {
-                items.add( new CustomKey( cnt, name ) );
-            }
-        }
+        List<CustomKey> items = CustomKey.getCustomKeyList();
 
         ArrayAdapter<CustomKey> adapter = new ArrayAdapter<CustomKey>( this, android.R.layout.simple_spinner_item, items );
 
@@ -73,8 +62,8 @@ public class ConfigureExtra extends Activity implements OnClickListener {
                     R.id.extra_custom5, R.id.extra_custom6                    
                 } )  {
             i++;
-            String pref_name = "service_extra_custom" + i + "_keyid";
-            int keycode = settings.getInt( pref_name, 0 );
+            String pref_name = "service_extra_custom_keyid" + i;
+            int keycode = Integer.parseInt( settings.getString( pref_name, "0" ) );
 
             Spinner s = (Spinner)findViewById( id );
             s.setAdapter( adapter );
@@ -103,52 +92,14 @@ public class ConfigureExtra extends Activity implements OnClickListener {
                         R.id.extra_custom5, R.id.extra_custom6                    
                     } )  {
                 i++;
-                String pref_name = "service_extra_custom" + i + "_keyid";
+                String pref_name = "service_extra_custom_keyid" + i;
                 Spinner s = (Spinner)findViewById( id );
                 CustomKey k = (CustomKey)s.getSelectedItem();
-                e.putInt( pref_name, k.mId );
+                e.putString( pref_name, Integer.toString( k.mId ) );
             }
             e.commit();
             ((Globals)getApplication()).restartService();
         }
         this.finish();
     }
-    
-    private class CustomKey {
-        public String mName;
-        public int mId;
-        
-        CustomKey( int id, String name ) {
-            mName = prettyPrint( name );
-            mId = id;
-        }
-        
-        public String toString() {
-            return mName;
-        }
-    }
-    
-    public static String prettyPrint( String n ) {
-        // replace _ with space, initcap
-        String s = n.replace( "_", " " );
-
-        boolean bound = true;
-        StringBuilder r = new StringBuilder();
-        for( int i = 0; i < s.length(); i++ ) {
-            if( bound ) {
-                // cap
-                r.append( Character.toUpperCase( s.charAt( i ) ) );
-                bound = false;
-            }else{
-                r.append( Character.toLowerCase( s.charAt( i ) ) );
-            }
-
-            // check for boundry
-            if( Character.isSpace( s.charAt( i ) ) ) {
-                bound = true;
-            }
-        }
-
-        return r.toString();
-    }    
 }