From d8ad6e15c9c8d76a94610b845837ce355ab26b9d Mon Sep 17 00:00:00 2001 From: Juha Heinanen Date: Tue, 7 Sep 2021 09:06:00 +0300 Subject: [PATCH] Avoid some lint warnings --- app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt | 2 +- app/src/main/kotlin/com/tutpro/baresip/Api.kt | 2 +- .../kotlin/com/tutpro/baresip/BootCompletedReceiver.kt | 8 +++++++- app/src/main/kotlin/com/tutpro/baresip/CallHistory.kt | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt index 1d253aa6..59052b23 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt @@ -56,7 +56,7 @@ class AccountActivity : AppCompatActivity() { private var save = false private var uaIndex= -1 - val scope = CoroutineScope(Job() + Dispatchers.Main) + private val scope = CoroutineScope(Job() + Dispatchers.Main) override fun onCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/kotlin/com/tutpro/baresip/Api.kt b/app/src/main/kotlin/com/tutpro/baresip/Api.kt index f6d5247f..a7df7cbe 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/Api.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/Api.kt @@ -6,7 +6,7 @@ object Api { const val AF_INET = 2 const val AF_INET6 = 10 const val VIDMODE_OFF = 0 - const val VIDMODE_ON = 1 + // const val VIDMODE_ON = 1 const val ANSWERMODE_MANUAL = 0 const val ANSWERMODE_AUTO = 2 const val DTMFMODE_RTP_EVENT = 0 diff --git a/app/src/main/kotlin/com/tutpro/baresip/BootCompletedReceiver.kt b/app/src/main/kotlin/com/tutpro/baresip/BootCompletedReceiver.kt index 17b4cf47..17bf8956 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/BootCompletedReceiver.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/BootCompletedReceiver.kt @@ -1,5 +1,6 @@ package com.tutpro.baresip +import android.annotation.SuppressLint import android.app.NotificationChannel import android.app.NotificationManager import android.app.PendingIntent @@ -17,6 +18,7 @@ class BootCompletedReceiver : BroadcastReceiver() { private val START_NOTIFICATION_IN = 105 + @SuppressLint("UnspecifiedImmutableFlag") override fun onReceive(context: Context, intent: Intent) { Log.i(TAG, "BootCompletedReceiver received intent ${intent.action}") @@ -43,7 +45,11 @@ class BootCompletedReceiver : BroadcastReceiver() { val channel = NotificationChannel("default", "default", NotificationManager.IMPORTANCE_DEFAULT) nm.createNotificationChannel(channel) - val pi = PendingIntent.getActivity(context, 0, i, PendingIntent.FLAG_ONE_SHOT) + val pi = if (Build.VERSION.SDK_INT >= 23) + PendingIntent.getActivity(context, 0, i, + PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_ONE_SHOT) + else + PendingIntent.getActivity(context, 0, i, PendingIntent.FLAG_ONE_SHOT) with(NotificationCompat.Builder(context, "default")) { setSmallIcon(R.drawable.ic_stat) setContentTitle(context.getString(R.string.app_name)) diff --git a/app/src/main/kotlin/com/tutpro/baresip/CallHistory.kt b/app/src/main/kotlin/com/tutpro/baresip/CallHistory.kt index 361f6972..7ac3d352 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/CallHistory.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/CallHistory.kt @@ -31,7 +31,7 @@ class CallHistory(val aor: String, val peerUri: String, val direction: String, while (it.hasNext()) if (it.next().aor == aor) it.remove() } - fun aorHistorySize(aor: String): Int { + private fun aorHistorySize(aor: String): Int { return BaresipService.callHistory.filter { it.aor == aor }.count() }