diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ManageSpeedDialActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ManageSpeedDialActivity.kt index 137e481e..c666e8d2 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ManageSpeedDialActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ManageSpeedDialActivity.kt @@ -2,7 +2,6 @@ package com.simplemobiletools.contacts.pro.activities import android.os.Bundle import com.google.gson.Gson -import com.google.gson.reflect.TypeToken import com.simplemobiletools.contacts.pro.R import com.simplemobiletools.contacts.pro.adapters.SpeedDialAdapter import com.simplemobiletools.contacts.pro.dialogs.SelectContactsDialog @@ -21,16 +20,7 @@ class ManageSpeedDialActivity : SimpleActivity(), RemoveSpeedDialListener { super.onCreate(savedInstanceState) setContentView(R.layout.activity_manage_speed_dial) - val speedDialType = object : TypeToken>() {}.type - speedDialValues = Gson().fromJson>(config.speedDial, speedDialType) ?: ArrayList(1) - - for (i in 1..9) { - val speedDial = SpeedDial(i, "", "") - if (speedDialValues.firstOrNull { it.id == i } == null) { - speedDialValues.add(speedDial) - } - } - + speedDialValues = config.getSpeedDialValues() updateAdapter() ContactsHelper(this).getContacts { contacts -> allContacts = contacts diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Config.kt index bf6f15b7..7905d19b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Config.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Config.kt @@ -1,7 +1,10 @@ package com.simplemobiletools.contacts.pro.helpers import android.content.Context +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken import com.simplemobiletools.commons.helpers.BaseConfig +import com.simplemobiletools.contacts.pro.models.SpeedDial class Config(context: Context) : BaseConfig(context) { companion object { @@ -60,4 +63,18 @@ class Config(context: Context) : BaseConfig(context) { var speedDial: String get() = prefs.getString(SPEED_DIAL, "")!! set(speedDial) = prefs.edit().putString(SPEED_DIAL, speedDial).apply() + + fun getSpeedDialValues(): ArrayList { + val speedDialType = object : TypeToken>() {}.type + val speedDialValues = Gson().fromJson>(speedDial, speedDialType) ?: ArrayList(1) + + for (i in 1..9) { + val speedDial = SpeedDial(i, "", "") + if (speedDialValues.firstOrNull { it.id == i } == null) { + speedDialValues.add(speedDial) + } + } + + return speedDialValues + } }