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

Avoid some Studio warnings

Browse Source
This commit is contained in:
Juha Heinanen
2021-05-12 17:00:34 +03:00
parent 358cf77a54
commit 60d7a5918a
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt
+8 -7
View File
@@ -22,8 +22,6 @@ import kotlin.collections.ArrayList
class AccountActivity : AppCompatActivity() { class AccountActivity : AppCompatActivity() {
private val TAG = "Baresip"
private lateinit var binding: ActivityAccountBinding private lateinit var binding: ActivityAccountBinding
private lateinit var acc: Account private lateinit var acc: Account
private lateinit var ua: UserAgent private lateinit var ua: UserAgent
@@ -108,11 +106,11 @@ class AccountActivity : AppCompatActivity() {
val config = try { val config = try {
URL(url).readText() URL(url).readText()
} catch (e: java.lang.Exception) { } catch (e: java.lang.Exception) {
Log.d("Baresip", "Network request failed") Log.d(TAG, "Network request failed")
null null
} }
if (config != null && !ctx.isFinishing) { if (config != null && !ctx.isFinishing) {
Log.d("Baresip", "Got account config $config") Log.d(TAG, "Got account config '$config'")
val acc = Account(acc.accp) val acc = Account(acc.accp)
val parserFactory: XmlPullParserFactory = XmlPullParserFactory.newInstance() val parserFactory: XmlPullParserFactory = XmlPullParserFactory.newInstance()
val parser: XmlPullParser = parserFactory.newPullParser() val parser: XmlPullParser = parserFactory.newPullParser()
@@ -398,7 +396,7 @@ class AccountActivity : AppCompatActivity() {
if (acc.authUser != "") { if (acc.authUser != "") {
if (!MainActivity.aorPasswords.containsKey(aor)) { if (!MainActivity.aorPasswords.containsKey(aor)) {
setAuthPass(acc, "") setAuthPass(acc, "")
MainActivity.aorPasswords.put(aor, "") MainActivity.aorPasswords[aor] = ""
} }
} else { } else {
if (acc.authPass != "") { if (acc.authPass != "") {
@@ -412,12 +410,12 @@ class AccountActivity : AppCompatActivity() {
var uri: String var uri: String
if (outbound1.text.toString().trim() != "") { if (outbound1.text.toString().trim() != "") {
uri = outbound1.text.toString().trim().replace(" ", "") uri = outbound1.text.toString().trim().replace(" ", "")
if (!uri.startsWith("sip:")) uri = "sip:" + uri if (!uri.startsWith("sip:")) uri = "sip:$uri"
ob.add(uri) ob.add(uri)
} }
if (outbound2.text.toString().trim() != "") { if (outbound2.text.toString().trim() != "") {
uri = outbound2.text.toString().trim().replace(" ", "") uri = outbound2.text.toString().trim().replace(" ", "")
if (!uri.startsWith("sip:")) uri = "sip:" + uri if (!uri.startsWith("sip:")) uri = "sip:$uri"
ob.add(uri) ob.add(uri)
} }
if (ob != acc.outbound) { if (ob != acc.outbound) {
@@ -734,4 +732,7 @@ class AccountActivity : AppCompatActivity() {
return Utils.checkHostPortParams(uri.substring(4)) return Utils.checkHostPortParams(uri.substring(4))
} }
companion object {
private const val TAG = "Baresip"
}
} }