jp/baresip-studio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Intent related code cleanups

Browse Source
This commit is contained in:
Juha Heinanen
2021-06-14 14:50:52 +03:00
parent ea7915b970
commit 66d1efa63a
11 changed files with 22 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/tutpro/baresip/AboutActivity.kt
+1 -2
View File
@@ -33,8 +33,7 @@ class AboutActivity : AppCompatActivity() {
when (item.itemId) { when (item.itemId) {
android.R.id.home -> { android.R.id.home -> {
BaresipService.activities.remove("about") BaresipService.activities.remove("about")
val i = Intent() setResult(Activity.RESULT_CANCELED, Intent())
setResult(Activity.RESULT_CANCELED, i)
finish() finish()
} }
} }
app/src/main/kotlin/com/tutpro/baresip/AccountListAdapter.kt
-1
View File
@@ -1,6 +1,5 @@
package com.tutpro.baresip package com.tutpro.baresip
import android.app.Activity
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.os.Bundle import android.os.Bundle
app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt
+1 -2
View File
@@ -147,8 +147,7 @@ class AccountsActivity : AppCompatActivity() {
override fun onBackPressed() { override fun onBackPressed() {
BaresipService.activities.remove("accounts,$aor") BaresipService.activities.remove("accounts,$aor")
val i = Intent() setResult(Activity.RESULT_CANCELED, Intent())
setResult(Activity.RESULT_CANCELED, i)
finish() finish()
} }
app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
+1 -2
View File
@@ -411,8 +411,7 @@ class BaresipService: Service() {
if (am.isBluetoothScoOn) am.stopBluetoothSco() if (am.isBluetoothScoOn) am.stopBluetoothSco()
cleanService() cleanService()
if (isServiceRunning) { if (isServiceRunning) {
val broadcastIntent = Intent("com.tutpro.baresip.Restart") sendBroadcast(Intent("com.tutpro.baresip.Restart"))
sendBroadcast(broadcastIntent)
} }
} }
app/src/main/kotlin/com/tutpro/baresip/CallsActivity.kt
+1 -2
View File
@@ -203,8 +203,7 @@ class CallsActivity : AppCompatActivity() {
} }
private fun returnResult() { private fun returnResult() {
val i = Intent() setResult(Activity.RESULT_CANCELED, Intent())
setResult(Activity.RESULT_CANCELED, i)
finish() finish()
} }
app/src/main/kotlin/com/tutpro/baresip/ChatActivity.kt
+1 -2
View File
@@ -259,8 +259,7 @@ class ChatActivity : AppCompatActivity() {
} }
private fun returnResult(code: Int) { private fun returnResult(code: Int) {
val i = Intent() setResult(code, Intent())
setResult(code, i)
finish() finish()
} }
app/src/main/kotlin/com/tutpro/baresip/ChatsActivity.kt
+1 -2
View File
@@ -218,8 +218,7 @@ class ChatsActivity: AppCompatActivity() {
} }
private fun returnResult() { private fun returnResult() {
val i = Intent() setResult(Activity.RESULT_CANCELED, Intent())
setResult(Activity.RESULT_CANCELED, i)
finish() finish()
} }
app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt
+3 -6
View File
@@ -388,8 +388,7 @@ class ConfigActivity : AppCompatActivity() {
android.R.id.home -> { android.R.id.home -> {
BaresipService.activities.remove("config") BaresipService.activities.remove("config")
val intent = Intent(this, MainActivity::class.java) setResult(Activity.RESULT_CANCELED, Intent(this, MainActivity::class.java))
setResult(Activity.RESULT_CANCELED, intent)
finish() finish()
} }
@@ -437,8 +436,7 @@ class ConfigActivity : AppCompatActivity() {
override fun onBackPressed() { override fun onBackPressed() {
BaresipService.activities.remove("config") BaresipService.activities.remove("config")
val intent = Intent(this, MainActivity::class.java) setResult(Activity.RESULT_CANCELED, Intent(this, MainActivity::class.java))
setResult(Activity.RESULT_CANCELED, intent)
finish() finish()
super.onBackPressed() super.onBackPressed()
@@ -471,8 +469,7 @@ class ConfigActivity : AppCompatActivity() {
getString(R.string.tls_ca_file_help)) getString(R.string.tls_ca_file_help))
} }
binding.AudioTitle -> { binding.AudioTitle -> {
val i = Intent(this, AudioActivity::class.java) startActivity(Intent(this, AudioActivity::class.java))
startActivity(i)
} }
binding.VolumeTitle -> { binding.VolumeTitle -> {
Utils.alertView(this, getString(R.string.default_call_volume), Utils.alertView(this, getString(R.string.default_call_volume),
app/src/main/kotlin/com/tutpro/baresip/ContactActivity.kt
+2 -4
View File
@@ -283,8 +283,7 @@ class ContactActivity : AppCompatActivity() {
android.R.id.home -> { android.R.id.home -> {
BaresipService.activities.remove("contact,$newContact,$uOrI") BaresipService.activities.remove("contact,$newContact,$uOrI")
val i = Intent(this, MainActivity::class.java) setResult(Activity.RESULT_CANCELED, Intent(this, MainActivity::class.java))
setResult(Activity.RESULT_CANCELED, i)
finish() finish()
} }
@@ -314,8 +313,7 @@ class ContactActivity : AppCompatActivity() {
override fun onBackPressed() { override fun onBackPressed() {
BaresipService.activities.remove("contact,$newContact,$uOrI") BaresipService.activities.remove("contact,$newContact,$uOrI")
val i = Intent(this, MainActivity::class.java) setResult(Activity.RESULT_CANCELED, Intent(this, MainActivity::class.java))
setResult(Activity.RESULT_CANCELED, i)
finish() finish()
super.onBackPressed() super.onBackPressed()
app/src/main/kotlin/com/tutpro/baresip/ContactsActivity.kt
+2 -4
View File
@@ -70,8 +70,7 @@ class ContactsActivity : AppCompatActivity() {
android.R.id.home -> { android.R.id.home -> {
BaresipService.activities.remove("contacts,$aor") BaresipService.activities.remove("contacts,$aor")
val i = Intent() setResult(Activity.RESULT_OK, Intent())
setResult(Activity.RESULT_OK, i)
finish() finish()
} }
} }
@@ -83,8 +82,7 @@ class ContactsActivity : AppCompatActivity() {
override fun onBackPressed() { override fun onBackPressed() {
BaresipService.activities.remove("contacts,$aor") BaresipService.activities.remove("contacts,$aor")
val i = Intent() setResult(Activity.RESULT_OK, Intent())
setResult(Activity.RESULT_OK, i)
finish() finish()
} }
app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
+9 -13
View File
@@ -420,13 +420,13 @@ class MainActivity : AppCompatActivity() {
val dialogClickListener = DialogInterface.OnClickListener { _, which -> val dialogClickListener = DialogInterface.OnClickListener { _, which ->
when (which) { when (which) {
DialogInterface.BUTTON_POSITIVE -> { DialogInterface.BUTTON_POSITIVE -> {
val callIntent = Intent(this, MainActivity::class.java) val i = Intent(this, MainActivity::class.java)
callIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or i.flags = Intent.FLAG_ACTIVITY_NEW_TASK or
Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_CLEAR_TOP Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_CLEAR_TOP
callIntent.putExtra("action", "call") i.putExtra("action", "call")
callIntent.putExtra("uap", ua.uap) i.putExtra("uap", ua.uap)
callIntent.putExtra("peer", acc.vmUri) i.putExtra("peer", acc.vmUri)
startActivity(callIntent) startActivity(i)
} }
DialogInterface.BUTTON_NEGATIVE -> { DialogInterface.BUTTON_NEGATIVE -> {
} }
@@ -1150,8 +1150,6 @@ class MainActivity : AppCompatActivity() {
override fun onOptionsItemSelected(item: MenuItem): Boolean { override fun onOptionsItemSelected(item: MenuItem): Boolean {
val i: Intent
when (item.itemId) { when (item.itemId) {
R.id.speakerIcon -> { R.id.speakerIcon -> {
@@ -1167,7 +1165,7 @@ class MainActivity : AppCompatActivity() {
} }
R.id.accounts -> { R.id.accounts -> {
i = Intent(this, AccountsActivity::class.java) val i = Intent(this, AccountsActivity::class.java)
val b = Bundle() val b = Bundle()
b.putString("aor", aorSpinner.tag.toString()) b.putString("aor", aorSpinner.tag.toString())
i.putExtras(b) i.putExtras(b)
@@ -1199,8 +1197,7 @@ class MainActivity : AppCompatActivity() {
} }
R.id.about -> { R.id.about -> {
i = Intent(this, AboutActivity::class.java) startActivity(Intent(this, AboutActivity::class.java))
startActivity(i)
} }
R.id.restart, R.id.quit -> { R.id.restart, R.id.quit -> {
@@ -1739,8 +1736,7 @@ class MainActivity : AppCompatActivity() {
configRequest.launch(Intent(this, ConfigActivity::class.java)) configRequest.launch(Intent(this, ConfigActivity::class.java))
} }
"audio" -> { "audio" -> {
val i = Intent(this, AudioActivity::class.java) startActivity(Intent(this, AudioActivity::class.java))
startActivity(i)
} }
"accounts" -> { "accounts" -> {
val i = Intent(this, AccountsActivity::class.java) val i = Intent(this, AccountsActivity::class.java)