diff --git a/app/src/main/kotlin/com/tutpro/baresip/AboutActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/AboutActivity.kt index cb84663e..124e4dfa 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/AboutActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/AboutActivity.kt @@ -33,8 +33,7 @@ class AboutActivity : AppCompatActivity() { when (item.itemId) { android.R.id.home -> { BaresipService.activities.remove("about") - val i = Intent() - setResult(Activity.RESULT_CANCELED, i) + setResult(Activity.RESULT_CANCELED, Intent()) finish() } } diff --git a/app/src/main/kotlin/com/tutpro/baresip/AccountListAdapter.kt b/app/src/main/kotlin/com/tutpro/baresip/AccountListAdapter.kt index d80f4287..3bcac956 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/AccountListAdapter.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/AccountListAdapter.kt @@ -1,6 +1,5 @@ package com.tutpro.baresip -import android.app.Activity import android.content.Context import android.content.Intent import android.os.Bundle diff --git a/app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt index 905afbc7..1009cd6e 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt @@ -147,8 +147,7 @@ class AccountsActivity : AppCompatActivity() { override fun onBackPressed() { BaresipService.activities.remove("accounts,$aor") - val i = Intent() - setResult(Activity.RESULT_CANCELED, i) + setResult(Activity.RESULT_CANCELED, Intent()) finish() } diff --git a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt index e849513b..1285cae2 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt @@ -411,8 +411,7 @@ class BaresipService: Service() { if (am.isBluetoothScoOn) am.stopBluetoothSco() cleanService() if (isServiceRunning) { - val broadcastIntent = Intent("com.tutpro.baresip.Restart") - sendBroadcast(broadcastIntent) + sendBroadcast(Intent("com.tutpro.baresip.Restart")) } } diff --git a/app/src/main/kotlin/com/tutpro/baresip/CallsActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/CallsActivity.kt index 12fae4b6..11644bf7 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/CallsActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/CallsActivity.kt @@ -203,8 +203,7 @@ class CallsActivity : AppCompatActivity() { } private fun returnResult() { - val i = Intent() - setResult(Activity.RESULT_CANCELED, i) + setResult(Activity.RESULT_CANCELED, Intent()) finish() } diff --git a/app/src/main/kotlin/com/tutpro/baresip/ChatActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/ChatActivity.kt index 9dd78b8c..c8f1fef4 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/ChatActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/ChatActivity.kt @@ -259,8 +259,7 @@ class ChatActivity : AppCompatActivity() { } private fun returnResult(code: Int) { - val i = Intent() - setResult(code, i) + setResult(code, Intent()) finish() } diff --git a/app/src/main/kotlin/com/tutpro/baresip/ChatsActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/ChatsActivity.kt index a2d306b3..abfe58c5 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/ChatsActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/ChatsActivity.kt @@ -218,8 +218,7 @@ class ChatsActivity: AppCompatActivity() { } private fun returnResult() { - val i = Intent() - setResult(Activity.RESULT_CANCELED, i) + setResult(Activity.RESULT_CANCELED, Intent()) finish() } diff --git a/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt index d418848a..b9d489c7 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt @@ -388,8 +388,7 @@ class ConfigActivity : AppCompatActivity() { android.R.id.home -> { BaresipService.activities.remove("config") - val intent = Intent(this, MainActivity::class.java) - setResult(Activity.RESULT_CANCELED, intent) + setResult(Activity.RESULT_CANCELED, Intent(this, MainActivity::class.java)) finish() } @@ -437,8 +436,7 @@ class ConfigActivity : AppCompatActivity() { override fun onBackPressed() { BaresipService.activities.remove("config") - val intent = Intent(this, MainActivity::class.java) - setResult(Activity.RESULT_CANCELED, intent) + setResult(Activity.RESULT_CANCELED, Intent(this, MainActivity::class.java)) finish() super.onBackPressed() @@ -471,8 +469,7 @@ class ConfigActivity : AppCompatActivity() { getString(R.string.tls_ca_file_help)) } binding.AudioTitle -> { - val i = Intent(this, AudioActivity::class.java) - startActivity(i) + startActivity(Intent(this, AudioActivity::class.java)) } binding.VolumeTitle -> { Utils.alertView(this, getString(R.string.default_call_volume), diff --git a/app/src/main/kotlin/com/tutpro/baresip/ContactActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/ContactActivity.kt index a1cf44a1..5a095d44 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/ContactActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/ContactActivity.kt @@ -283,8 +283,7 @@ class ContactActivity : AppCompatActivity() { android.R.id.home -> { BaresipService.activities.remove("contact,$newContact,$uOrI") - val i = Intent(this, MainActivity::class.java) - setResult(Activity.RESULT_CANCELED, i) + setResult(Activity.RESULT_CANCELED, Intent(this, MainActivity::class.java)) finish() } @@ -314,8 +313,7 @@ class ContactActivity : AppCompatActivity() { override fun onBackPressed() { BaresipService.activities.remove("contact,$newContact,$uOrI") - val i = Intent(this, MainActivity::class.java) - setResult(Activity.RESULT_CANCELED, i) + setResult(Activity.RESULT_CANCELED, Intent(this, MainActivity::class.java)) finish() super.onBackPressed() diff --git a/app/src/main/kotlin/com/tutpro/baresip/ContactsActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/ContactsActivity.kt index a88dcbee..a1b059ff 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/ContactsActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/ContactsActivity.kt @@ -70,8 +70,7 @@ class ContactsActivity : AppCompatActivity() { android.R.id.home -> { BaresipService.activities.remove("contacts,$aor") - val i = Intent() - setResult(Activity.RESULT_OK, i) + setResult(Activity.RESULT_OK, Intent()) finish() } } @@ -83,8 +82,7 @@ class ContactsActivity : AppCompatActivity() { override fun onBackPressed() { BaresipService.activities.remove("contacts,$aor") - val i = Intent() - setResult(Activity.RESULT_OK, i) + setResult(Activity.RESULT_OK, Intent()) finish() } diff --git a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt index d948b2a6..fd16570d 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt @@ -420,13 +420,13 @@ class MainActivity : AppCompatActivity() { val dialogClickListener = DialogInterface.OnClickListener { _, which -> when (which) { DialogInterface.BUTTON_POSITIVE -> { - val callIntent = Intent(this, MainActivity::class.java) - callIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or + val i = Intent(this, MainActivity::class.java) + i.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_CLEAR_TOP - callIntent.putExtra("action", "call") - callIntent.putExtra("uap", ua.uap) - callIntent.putExtra("peer", acc.vmUri) - startActivity(callIntent) + i.putExtra("action", "call") + i.putExtra("uap", ua.uap) + i.putExtra("peer", acc.vmUri) + startActivity(i) } DialogInterface.BUTTON_NEGATIVE -> { } @@ -1150,8 +1150,6 @@ class MainActivity : AppCompatActivity() { override fun onOptionsItemSelected(item: MenuItem): Boolean { - val i: Intent - when (item.itemId) { R.id.speakerIcon -> { @@ -1167,7 +1165,7 @@ class MainActivity : AppCompatActivity() { } R.id.accounts -> { - i = Intent(this, AccountsActivity::class.java) + val i = Intent(this, AccountsActivity::class.java) val b = Bundle() b.putString("aor", aorSpinner.tag.toString()) i.putExtras(b) @@ -1199,8 +1197,7 @@ class MainActivity : AppCompatActivity() { } R.id.about -> { - i = Intent(this, AboutActivity::class.java) - startActivity(i) + startActivity(Intent(this, AboutActivity::class.java)) } R.id.restart, R.id.quit -> { @@ -1739,8 +1736,7 @@ class MainActivity : AppCompatActivity() { configRequest.launch(Intent(this, ConfigActivity::class.java)) } "audio" -> { - val i = Intent(this, AudioActivity::class.java) - startActivity(i) + startActivity(Intent(this, AudioActivity::class.java)) } "accounts" -> { val i = Intent(this, AccountsActivity::class.java)