account service: cleanup

Change-Id: If52973853b588e290acdb37b40e4fade5a1f9fb8

ring-android/app/src/main/java/cx/ring/client/HomeActivity.kt

@@ -633,7 +633,7 @@ class HomeActivity : AppCompatActivity(), NavigationBarView.OnItemSelectedListen
         } else {
             val intent = Intent(this@HomeActivity, AccountWizardActivity::class.java)
             startActivity(intent)
-            mBinding!!.spinnerToolbar.setSelection(mAccountService.currentAccountIndex)
+            mBinding!!.spinnerToolbar.setSelection(0)
         }
     }
 

ring-android/libjamiclient/src/main/kotlin/net/jami/utils/SwigNativeConverter.kt

@@ -23,18 +23,12 @@ import net.jami.daemon.*
 import java.util.ArrayList
 
 object SwigNativeConverter {
-    fun toSwig(creds: List<Map<String, String>>): VectMap {
-        val toReturn = VectMap()
-        toReturn.reserve(creds.size.toLong())
-        for (aTodecode in creds) {
-            toReturn.add(StringMap.toSwig(aTodecode))
+    fun toSwig(creds: List<Map<String, String>>): VectMap =
+        creds.mapTo(VectMap().apply { reserve(creds.size.toLong()) }) {
+            StringMap.toSwig(it)
         }
-        return toReturn
-    }
 
-    fun toJava(vector: StringVect): ArrayList<String> {
-        return ArrayList(vector)
-    }
+    fun toJava(vector: StringVect): ArrayList<String> = ArrayList(vector)
 
     fun toJava(vector: MessageVect): ArrayList<Message> {
         val size = vector.size