fenix/Simple-Dialer
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Dialer.git synced 2025-02-19 13:00:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

adding some crashfixes

Browse Source
This commit is contained in:
tibbi 2020-05-14 20:37:14 +02:00
parent 467c661a68
commit 984ed7b647
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/kotlin/com/simplemobiletools/dialer/activities/MainActivity.kt
View File

@ -69,7 +69,7 @@ class MainActivity : SimpleActivity() {
} }
getAllFragments().forEach { getAllFragments().forEach {
it.textColorChanged(configTextColor) it?.textColorChanged(configTextColor)
} }
} }
@ -78,7 +78,7 @@ class MainActivity : SimpleActivity() {
main_tabs_holder.setSelectedTabIndicatorColor(getAdjustedPrimaryColor()) main_tabs_holder.setSelectedTabIndicatorColor(getAdjustedPrimaryColor())
main_tabs_holder.getTabAt(viewpager.currentItem)?.icon?.applyColorFilter(getAdjustedPrimaryColor()) main_tabs_holder.getTabAt(viewpager.currentItem)?.icon?.applyColorFilter(getAdjustedPrimaryColor())
getAllFragments().forEach { getAllFragments().forEach {
it.primaryColorChanged(configPrimaryColor) it?.primaryColorChanged(configPrimaryColor)
} }
} }
@ -177,7 +177,7 @@ class MainActivity : SimpleActivity() {
} }
override fun onMenuItemActionCollapse(item: MenuItem?): Boolean { override fun onMenuItemActionCollapse(item: MenuItem?): Boolean {
contacts_fragment.onSearchClosed() contacts_fragment?.onSearchClosed()
isSearchOpen = false isSearchOpen = false
main_dialpad_button.beVisible() main_dialpad_button.beVisible()
return true return true
@ -244,7 +244,7 @@ class MainActivity : SimpleActivity() {
override fun onPageSelected(position: Int) { override fun onPageSelected(position: Int) {
main_tabs_holder.getTabAt(position)?.select() main_tabs_holder.getTabAt(position)?.select()
getAllFragments().forEach { getAllFragments().forEach {
it.finishActMode() it?.finishActMode()
} }
invalidateOptionsMenu() invalidateOptionsMenu()
} }
@ -306,7 +306,7 @@ class MainActivity : SimpleActivity() {
recents_fragment?.refreshItems() recents_fragment?.refreshItems()
} }
private fun getAllFragments() = arrayListOf(contacts_fragment, favorites_fragment, recents_fragment).toMutableList() as ArrayList<MyViewPagerFragment> private fun getAllFragments() = arrayListOf(contacts_fragment, favorites_fragment, recents_fragment).toMutableList() as ArrayList<MyViewPagerFragment?>
private fun launchAbout() { private fun launchAbout() {
val licenses = LICENSE_GLIDE or LICENSE_INDICATOR_FAST_SCROLL val licenses = LICENSE_GLIDE or LICENSE_INDICATOR_FAST_SCROLL

22
app/src/main/kotlin/com/simplemobiletools/dialer/extensions/Context.kt
View File

@ -15,16 +15,20 @@ val Context.audioManager: AudioManager get() = getSystemService(Context.AUDIO_SE
@SuppressLint("MissingPermission") @SuppressLint("MissingPermission")
fun Context.getAvailableSIMCardLabels(): ArrayList<SIMAccount> { fun Context.getAvailableSIMCardLabels(): ArrayList<SIMAccount> {
val SIMAccounts = ArrayList<SIMAccount>() val SIMAccounts = ArrayList<SIMAccount>()
telecomManager.callCapablePhoneAccounts.forEachIndexed { index, account -> try {
val phoneAccount = telecomManager.getPhoneAccount(account) telecomManager.callCapablePhoneAccounts.forEachIndexed { index, account ->
var label = phoneAccount.label.toString() val phoneAccount = telecomManager.getPhoneAccount(account)
var address = phoneAccount.address.toString() var label = phoneAccount.label.toString()
if (address.startsWith("tel:") && address.substringAfter("tel:").isNotEmpty()) { var address = phoneAccount.address.toString()
address = Uri.decode(address.substringAfter("tel:")) if (address.startsWith("tel:") && address.substringAfter("tel:").isNotEmpty()) {
label += " ($address)" address = Uri.decode(address.substringAfter("tel:"))
label += " ($address)"
}
val SIM = SIMAccount(index + 1, phoneAccount.accountHandle, label, address.substringAfter("tel:"))
SIMAccounts.add(SIM)
} }
val SIM = SIMAccount(index + 1, phoneAccount.accountHandle, label, address.substringAfter("tel:")) } catch (ignored: Exception) {
SIMAccounts.add(SIM)
} }
return SIMAccounts return SIMAccounts
} }