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

mainly network connectivity change improvements

Browse Source
This commit is contained in:
Juha Heinanen
2018-05-27 11:23:26 +03:00
parent 0a1593877e
commit b9992cc340
3 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt
+13 -2
View File
@@ -261,8 +261,19 @@ class AccountActivity : AppCompatActivity() {
finish() finish()
return true return true
} else } else if (item.itemId == android.R.id.home) {
return super.onOptionsItemSelected(item)
Log.d("Baresip", "Back array was pressed at Account")
intent.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)
finish()
return true
} else return super.onOptionsItemSelected(item)
} }
private fun checkDisplayName(dn: String): Boolean { private fun checkDisplayName(dn: String): Boolean {
app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt
+1 -1
View File
@@ -58,7 +58,7 @@ class AccountsActivity : AppCompatActivity() {
android.R.id.home -> { android.R.id.home -> {
Log.d("Baresip", "Back array was pressed at Accounts") Log.d("Baresip", "Back array was pressed at Accounts")
val i = Intent() val i = Intent()
setResult(Activity.RESULT_CANCELED, i) setResult(Activity.RESULT_OK, i)
finish() finish()
} }
} }
app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
+6 -10
View File
@@ -89,10 +89,9 @@ class MainActivity : AppCompatActivity() {
val intentExtras = intent.extras val intentExtras = intent.extras
val info = intentExtras.getParcelable<NetworkInfo>("networkInfo") val info = intentExtras.getParcelable<NetworkInfo>("networkInfo")
Log.d("Baresip", "Got event $info") Log.d("Baresip", "Got event $info")
if (running && (info.state == NetworkInfo.State.CONNECTED)) { //if (running && (info.state == NetworkInfo.State.CONNECTED)) {
Log.d("Baresip", "Registering upon CONNECTED event") // Log.d("Baresip", "Registering upon CONNECTED event")
UserAgent.register(uas) if (running) UserAgent.register(uas)
}
} }
} }
registerReceiver(receiver, intentFilter) registerReceiver(receiver, intentFilter)
@@ -458,11 +457,8 @@ class MainActivity : AppCompatActivity() {
when (requestCode) { when (requestCode) {
ACCOUNTS_CODE -> { ACCOUNTS_CODE -> {
if (resultCode == RESULT_OK)
Log.d("Baresip", "Edit accounts OK")
if (resultCode == RESULT_CANCELED)
Log.d("Baresip", "Edit accounts canceled")
uaAdapter.notifyDataSetChanged() uaAdapter.notifyDataSetChanged()
updateNotification()
} }
EDIT_CONFIG_CODE -> { EDIT_CONFIG_CODE -> {
@@ -704,9 +700,9 @@ class MainActivity : AppCompatActivity() {
layout.addView(answer_row) layout.addView(answer_row)
} }
private fun updateNotification() { fun updateNotification() {
val contentView = RemoteViews(getPackageName(), R.layout.notification) val contentView = RemoteViews(getPackageName(), R.layout.notification)
for (i: Int in 0 .. 3) { for (i: Int in 0 .. 5) {
val resID = resources.getIdentifier("status$i", "id", packageName); val resID = resources.getIdentifier("status$i", "id", packageName);
if (i < images.size) { if (i < images.size) {
contentView.setImageViewResource(resID, images[i]) contentView.setImageViewResource(resID, images[i])