From 64d96a10d76c9ec2d22ee2e3a58a2b182cae3ad5 Mon Sep 17 00:00:00 2001 From: Juha Heinanen Date: Wed, 8 May 2019 13:53:32 +0300 Subject: [PATCH] - Removed unnecessary string conversions. --- app/src/main/kotlin/com/tutpro/baresip/AboutActivity.kt | 3 +-- app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt | 2 +- app/src/main/kotlin/com/tutpro/baresip/ChatActivity.kt | 2 +- app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt | 4 ++-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/src/main/kotlin/com/tutpro/baresip/AboutActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/AboutActivity.kt index 85c668ce..3f37d86e 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/AboutActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/AboutActivity.kt @@ -14,8 +14,7 @@ class AboutActivity : AppCompatActivity() { super.onCreate(savedInstanceState) setContentView(R.layout.activity_about) val aboutText = findViewById(R.id.aboutText) as TextView - aboutText.text = String.format(getText(R.string.about_text).toString(), - BuildConfig.VERSION_NAME) + aboutText.text = String.format(getString(R.string.about_text), BuildConfig.VERSION_NAME) aboutText.setTextColor(Color.BLACK) } diff --git a/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt index e1e6d2ae..d81f2c22 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt @@ -430,7 +430,7 @@ class AccountActivity : AppCompatActivity() { } findViewById(R.id.DefaultTitle) as TextView -> { Utils.alertView(this, getString(R.string.default_account), - getText(R.string.default_account_help).toString()) + getString(R.string.default_account_help)) } } } diff --git a/app/src/main/kotlin/com/tutpro/baresip/ChatActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/ChatActivity.kt index 4668ac57..f24a38eb 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/ChatActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/ChatActivity.kt @@ -100,7 +100,7 @@ class ChatActivity : AppCompatActivity() { } val builder = AlertDialog.Builder(this@ChatActivity, R.style.Theme_AppCompat) if (ContactsActivity.contactName(peerUri) == peerUri) - builder.setMessage(String.format(getText(R.string.long_message_question).toString(), + builder.setMessage(String.format(getString(R.string.long_message_question), chatPeer)) .setPositiveButton(getString(R.string.cancel), dialogClickListener) .setNegativeButton(getString(R.string.delete_message), dialogClickListener) diff --git a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt index cb6317f9..ebb8f186 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt @@ -602,8 +602,8 @@ class MainActivity : AppCompatActivity() { "registering failed" -> { uaAdapter.notifyDataSetChanged() Toast.makeText(applicationContext, - String.format(getText(R.string.registering_failed).toString(), - aor) + ": ${ev[1]}", + String.format(getString(R.string.registering_failed), aor) + + ": ${ev[1]}", Toast.LENGTH_LONG).show() } "call ringing" -> {