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

- Getting rid of compiler warnings.

Browse Source
This commit is contained in:
Juha Heinanen
2020-04-10 12:12:13 +03:00
parent 8124c98e76
commit 457df09497
6 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt
View File

@ -47,7 +47,7 @@ class AccountActivity : AppCompatActivity() {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_account)
accp = intent.getStringExtra("accp")
accp = intent.getStringExtra("accp")!!
Utils.addActivity("account,$accp")
acc = Account.find(accp)!!

8
app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt
View File

@ -76,10 +76,13 @@ class AccountsActivity : AppCompatActivity() {
}
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data)
when (requestCode) {
ACCOUNT_CODE -> {
if (resultCode == Activity.RESULT_OK) {
val aor = data!!.getStringExtra("aor")
val aor = data!!.getStringExtra("aor")!!
val ua = UserAgent.uas()[UserAgent.findAorIndex(aor)!!]
if (aorPasswords.containsKey(aor) && aorPasswords[aor] == "")
askPassword(String.format(getString(R.string.account_password),
@ -87,6 +90,7 @@ class AccountsActivity : AppCompatActivity() {
}
}
}
}
private fun askPassword(title: String, ua: UserAgent) {
@ -97,7 +101,7 @@ class AccountsActivity : AppCompatActivity() {
false)
val input = viewInflated.findViewById(R.id.password) as EditText
val checkBox = viewInflated.findViewById(R.id.checkbox) as CheckBox
checkBox.setOnCheckedChangeListener { buttonView, isChecked ->
checkBox.setOnCheckedChangeListener { _, isChecked ->
if (isChecked)
input.transformationMethod = HideReturnsTransformationMethod()
else

2
app/src/main/kotlin/com/tutpro/baresip/ChatsActivity.kt
View File

@ -184,6 +184,8 @@ class ChatsActivity: AppCompatActivity() {
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data)
if (requestCode == MainActivity.CHAT_CODE) {
if (resultCode == Activity.RESULT_OK) {
clAdapter.clear()

4
app/src/main/kotlin/com/tutpro/baresip/ContactActivity.kt
View File

@ -55,7 +55,7 @@ class ContactActivity : AppCompatActivity() {
nameView.setText("")
nameView.hint = getString(R.string.contact_name)
nameView.setSelection(nameView.text.length)
val uri = intent.getStringExtra("uri")
val uri = intent.getStringExtra("uri")!!
if (uri == "") {
uriView.setText("")
uriView.hint = getString(R.string.sip_uri)
@ -124,6 +124,8 @@ class ContactActivity : AppCompatActivity() {
override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) {
super.onActivityResult(requestCode, resultCode, resultData)
if (requestCode == READ_REQUEST_CODE && resultCode == Activity.RESULT_OK) {
resultData?.data?.also { uri ->
try {

2
app/src/main/kotlin/com/tutpro/baresip/ContactsActivity.kt
View File

@ -51,6 +51,8 @@ class ContactsActivity : AppCompatActivity() {
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data)
if (resultCode == RESULT_OK) clAdapter.notifyDataSetChanged()
}

28
app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
View File

@ -92,8 +92,8 @@ class MainActivity : AppCompatActivity() {
serviceEventReceiver = object : BroadcastReceiver() {
override fun onReceive(context: Context, intent: Intent) {
handleServiceEvent(intent.getStringExtra("event"),
intent.getStringArrayListExtra("params"))
handleServiceEvent(intent.getStringExtra("event")!!,
intent.getStringArrayListExtra("params")!!)
}
}
LocalBroadcastManager.getInstance(this).registerReceiver(serviceEventReceiver,
@ -462,7 +462,7 @@ class MainActivity : AppCompatActivity() {
Toast.LENGTH_SHORT).show()
return
}
val uap = intent.getStringExtra("uap")
val uap = intent.getStringExtra("uap")!!
val ua = UserAgent.find(uap)
if (ua == null) {
Log.w("Baresip", "handleIntent 'call' did not find ua $uap")
@ -472,10 +472,10 @@ class MainActivity : AppCompatActivity() {
(ua != UserAgent.uas()[aorSpinner.selectedItemPosition]))
spinToAor(ua.account.aor)
resumeAction = action
resumeUri = intent.getStringExtra("peer")
resumeUri = intent.getStringExtra("peer")!!
}
"call show", "call answer" -> {
val callp = intent.getStringExtra("callp")
val callp = intent.getStringExtra("callp")!!
val call = Call.find(callp)
if (call == null) {
Log.w("Baresip", "handleIntent '$action' did not find call $callp")
@ -489,7 +489,7 @@ class MainActivity : AppCompatActivity() {
resumeCall = call
}
"transfer show", "transfer accept" -> {
val callp = intent.getStringExtra("callp")
val callp = intent.getStringExtra("callp")!!
val call = Call.find(callp)
if (call == null) {
Log.w("Baresip", "handleIntent '$action' did not find call $callp")
@ -498,10 +498,10 @@ class MainActivity : AppCompatActivity() {
}
resumeAction = action
resumeCall = call
resumeUri = intent.getStringExtra("uri")
resumeUri = intent.getStringExtra("uri")!!
}
"message", "message show", "message reply" -> {
val uap = intent.getStringExtra("uap")
val uap = intent.getStringExtra("uap")!!
val ua = UserAgent.find(uap)
if (ua == null) {
Log.w("Baresip", "onNewIntent did not find ua $uap")
@ -512,7 +512,7 @@ class MainActivity : AppCompatActivity() {
spinToAor(ua.account.aor)
resumeAction = action
resumeUap = uap
resumeUri = intent.getStringExtra("peer")
resumeUri = intent.getStringExtra("peer")!!
}
}
}
@ -953,7 +953,7 @@ class MainActivity : AppCompatActivity() {
false)
val input = viewInflated.findViewById(R.id.password) as EditText
val checkBox = viewInflated.findViewById(R.id.checkbox) as CheckBox
checkBox.setOnCheckedChangeListener { buttonView, isChecked ->
checkBox.setOnCheckedChangeListener { _, isChecked ->
if (isChecked)
input.transformationMethod = HideReturnsTransformationMethod()
else
@ -997,7 +997,7 @@ class MainActivity : AppCompatActivity() {
false)
val input = viewInflated.findViewById(R.id.password) as EditText
val checkBox = viewInflated.findViewById(R.id.checkbox) as CheckBox
checkBox.setOnCheckedChangeListener { buttonView, isChecked ->
checkBox.setOnCheckedChangeListener { _, isChecked ->
if (isChecked)
input.transformationMethod = HideReturnsTransformationMethod()
else
@ -1096,6 +1096,8 @@ class MainActivity : AppCompatActivity() {
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data)
when (requestCode) {
ACCOUNTS_CODE -> {
@ -1116,7 +1118,7 @@ class MainActivity : AppCompatActivity() {
}
ACCOUNT_CODE -> {
val aor = data!!.getStringExtra("aor")
val aor = data!!.getStringExtra("aor")!!
spinToAor(aor)
val ua = Account.findUa(aor)!!
updateIcons(ua.account)
@ -1150,7 +1152,7 @@ class MainActivity : AppCompatActivity() {
val acc = UserAgent.uas()[aorSpinner.selectedItemPosition].account
if (resultCode == RESULT_OK) {
if (data != null) {
val peerUri = data.getStringExtra("peer_uri")
val peerUri = data.getStringExtra("peer_uri")!!
callUri.setText(Utils.friendlyUri(ContactsActivity.contactName(peerUri),
Utils.aorDomain(Utils.aorDomain(acc.aor))))
}