* #24533 New Contact List, with data model
* #23415 general refactoring
diff --git a/src/com/savoirfairelinux/sflphone/account/AudioHandler.java b/src/com/savoirfairelinux/sflphone/account/AudioHandler.java
new file mode 100644
index 0000000..589d7d8
--- /dev/null
+++ b/src/com/savoirfairelinux/sflphone/account/AudioHandler.java
@@ -0,0 +1,28 @@
+package com.savoirfairelinux.sflphone.account;
+
+import java.util.ArrayList;
+
+import android.util.Log;
+
+import com.savoirfairelinux.sflphone.service.IntVect;
+
+public class AudioHandler {
+
+    private static final String TAG = AudioHandler.class.getSimpleName();
+
+    public static ArrayList<Integer> convertSwigToNative(IntVect swigmap) {
+
+        ArrayList<Integer> nativemap = new ArrayList<Integer>();
+
+        Log.w(TAG, "size codecs list " + swigmap.size());
+
+        for (int i = 0; i < swigmap.size(); ++i) {
+
+            Integer t = swigmap.get(i);
+            nativemap.add(t);
+        }
+
+        return nativemap;
+    }
+
+}
diff --git a/src/com/savoirfairelinux/sflphone/account/HistoryHandler.java b/src/com/savoirfairelinux/sflphone/account/HistoryHandler.java
index d10571d..ae5dfd3 100644
--- a/src/com/savoirfairelinux/sflphone/account/HistoryHandler.java
+++ b/src/com/savoirfairelinux/sflphone/account/HistoryHandler.java
@@ -5,24 +5,12 @@
 
 import android.util.Log;
 
-import com.savoirfairelinux.sflphone.R;
 import com.savoirfairelinux.sflphone.service.ServiceConstants;
-import com.savoirfairelinux.sflphone.service.StringMap;
 import com.savoirfairelinux.sflphone.service.VectMap;
 
 public class HistoryHandler {
     private static final String TAG = HistoryHandler.class.getSimpleName();
 
-    public static class PreferenceEntry {
-        public String mKey;
-        public int mLabelId;
-
-        public PreferenceEntry(String key, int labelId) {
-            mKey = key;
-            mLabelId = labelId;
-        }
-    }
-
 
     public static ArrayList<HashMap<String, String>> convertSwigToNative(VectMap swigmap) {