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

use check icon for saving in all activities

Browse Source
This commit is contained in:
Juha Heinanen
2018-05-28 12:01:33 +03:00
parent b9992cc340
commit 3670332ed4
5 changed files with 62 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,8 +29,7 @@ class AccountActivity : AppCompatActivity() {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_account)
val b = intent.extras
acc = Account.find(MainActivity.uas, b.getString("accp"))!!
acc = Account.find(MainActivity.uas, intent.extras.getString("accp"))!!
aor = acc.aor
setTitle(aor.replace("sip:", ""))
@ -122,6 +121,8 @@ class AccountActivity : AppCompatActivity() {
override fun onOptionsItemSelected(item: MenuItem): Boolean {
val i = Intent(this, MainActivity::class.java)
if (item.itemId == R.id.checkIcon) {
val dn = displayName.text.toString().trim()
@ -257,19 +258,19 @@ class AccountActivity : AppCompatActivity() {
UserAgent.ua_register(Account.findUA(acc.aor)!!.uap)
}
}
setResult(RESULT_OK, intent)
setResult(RESULT_OK, i)
finish()
return true
} else if (item.itemId == android.R.id.home) {
Log.d("Baresip", "Back array was pressed at Account")
intent.putExtra("action", "cancel")
i.putExtra("action", "cancel")
if (acc.regint > 0) {
Log.d("Baresip", "Registering ${acc.aor}")
UserAgent.ua_register(Account.findUA(acc.aor)!!.uap)
}
setResult(RESULT_OK, intent)
setResult(RESULT_OK, i)
finish()
return true

60
app/src/main/kotlin/com/tutpro/baresip/EditConfigActivity.kt
View File

@ -1,5 +1,6 @@
package com.tutpro.baresip
import android.app.Activity
import android.content.Intent
import android.os.Bundle
import android.support.v7.app.AppCompatActivity
@ -63,41 +64,44 @@ class EditConfigActivity : AppCompatActivity() {
override fun onCreateOptionsMenu(menu: Menu): Boolean {
super.onCreateOptionsMenu(menu)
val inflater = menuInflater
inflater.inflate(R.menu.edit_menu, menu)
inflater.inflate(R.menu.check_icon, menu)
return true
}
override fun onOptionsItemSelected(item: MenuItem): Boolean {
val i = Intent(this, MainActivity::class.java)
when (item.itemId) {
R.id.save -> {
try {
val fOut = FileOutputStream(file!!.absoluteFile, false)
val fWriter = OutputStreamWriter(fOut)
val res = editText!!.text.toString()
try {
fWriter.write(res)
fWriter.close()
fOut.close()
} catch (e: java.io.IOException) {
Log.e("Baresip", "Failed to write config file: " + e.toString())
}
} catch (e: java.io.FileNotFoundException) {
Log.e("Baresip", "Failed to find config file: " + e.toString())
val i = Intent(this, MainActivity::class.java)
if (item.itemId == R.id.checkIcon) {
try {
val fOut = FileOutputStream(file!!.absoluteFile, false)
val fWriter = OutputStreamWriter(fOut)
val res = editText!!.text.toString()
try {
fWriter.write(res)
fWriter.close()
fOut.close()
} catch (e: java.io.IOException) {
Log.e("Baresip", "Failed to write config file: " + e.toString())
}
Log.d("Baresip", "Updated config file")
setResult(RESULT_OK, i)
finish()
return true
} catch (e: java.io.FileNotFoundException) {
Log.e("Baresip", "Failed to find config file: " + e.toString())
}
R.id.cancel, android.R.id.home -> {
setResult(RESULT_CANCELED, i)
finish()
return true
}
else -> return super.onOptionsItemSelected(item)
}
Log.d("Baresip", "Updated config file")
setResult(RESULT_OK, i)
finish()
return true
} else if (item.itemId == android.R.id.home) {
Log.d("Baresip", "Back array was pressed at Edit Config")
setResult(Activity.RESULT_CANCELED, i)
finish()
return true
} else return super.onOptionsItemSelected(item)
}
}

45
app/src/main/kotlin/com/tutpro/baresip/EditContactsActivity.kt
View File

@ -1,5 +1,6 @@
package com.tutpro.baresip
import android.app.Activity
import android.content.Intent
import android.os.Bundle
import android.support.v7.app.AppCompatActivity
@ -34,33 +35,33 @@ class EditContactsActivity : AppCompatActivity() {
override fun onCreateOptionsMenu(menu: Menu): Boolean {
super.onCreateOptionsMenu(menu)
val inflater = menuInflater
inflater.inflate(R.menu.edit_menu, menu)
inflater.inflate(R.menu.check_icon, menu)
return true
}
override fun onOptionsItemSelected(item: MenuItem): Boolean {
val i = Intent(this, MainActivity::class.java)
when (item.itemId) {
R.id.save -> {
val path = applicationContext.filesDir.absolutePath + "/contacts"
val file = File(path)
Utils.putFileContents(file, editText!!.text.toString())
Log.d("Baresip", "Updated contacts file")
MainActivity.contacts_remove()
updateContactsAndNames(path)
// MainActivity.calleeAdapter.notifyDataSetChanged(); does not work
setResult(RESULT_OK, i)
finish()
return true
}
R.id.cancel, android.R.id.home -> {
i.putExtra("action", "cancel")
setResult(RESULT_OK, i)
finish()
return true
}
else -> return super.onOptionsItemSelected(item)
}
if (item.itemId == R.id.checkIcon) {
val path = applicationContext.filesDir.absolutePath + "/contacts"
val file = File(path)
Utils.putFileContents(file, editText!!.text.toString())
Log.d("Baresip", "Updated contacts file")
MainActivity.contacts_remove()
updateContactsAndNames(path)
setResult(RESULT_OK, i)
finish()
return true
} else if (item.itemId == android.R.id.home) {
Log.d("Baresip", "Back array was pressed at Contacts")
setResult(Activity.RESULT_CANCELED, i)
finish()
return true
} else return super.onOptionsItemSelected(item)
}
companion object {

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

@ -73,7 +73,7 @@ class HistoryActivity : AppCompatActivity() {
override fun onOptionsItemSelected(item: MenuItem): Boolean {
when (item.itemId) {
android.R.id.home -> {
Log.d("Baresip", "Back array was pressed")
Log.d("Baresip", "Back array was pressed at History")
val i = Intent()
setResult(Activity.RESULT_CANCELED, i)
finish()

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

@ -487,7 +487,6 @@ class MainActivity : AppCompatActivity() {
}
EDIT_CONTACTS_CODE, ABOUT_CODE -> {
Log.d("Baresip", "Back arrow or Cancel pressed at request: $requestCode")
}
}
}