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

- Specify explicitly which visibility constant is used in each case.

Browse Source
This commit is contained in:
Juha Heinanen
2020-04-22 08:43:58 +03:00
parent b88eab3df9
commit dc64dbf913
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
+6 -8
View File
@@ -3,7 +3,6 @@ package com.tutpro.baresip
import android.Manifest import android.Manifest
import android.annotation.TargetApi import android.annotation.TargetApi
import android.app.* import android.app.*
import android.app.Notification.VISIBILITY_PUBLIC
import android.app.PendingIntent.getActivity import android.app.PendingIntent.getActivity
import android.bluetooth.BluetoothAdapter import android.bluetooth.BluetoothAdapter
import android.bluetooth.BluetoothHeadset import android.bluetooth.BluetoothHeadset
@@ -17,7 +16,6 @@ import androidx.core.app.NotificationCompat
import android.view.View import android.view.View
import android.widget.RemoteViews import android.widget.RemoteViews
import androidx.localbroadcastmanager.content.LocalBroadcastManager import androidx.localbroadcastmanager.content.LocalBroadcastManager
import androidx.core.app.NotificationCompat.VISIBILITY_PRIVATE
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import android.provider.Settings import android.provider.Settings
import android.telephony.TelephonyManager import android.telephony.TelephonyManager
@@ -615,7 +613,7 @@ class BaresipService: Service() {
.setContentText(caller) .setContentText(caller)
if (Build.VERSION.SDK_INT < 26) { if (Build.VERSION.SDK_INT < 26) {
nb.setVibrate(LongArray(0)) nb.setVibrate(LongArray(0))
.setVisibility(VISIBILITY_PRIVATE) .setVisibility(NotificationCompat.VISIBILITY_PRIVATE)
.setPriority(Notification.PRIORITY_HIGH) .setPriority(Notification.PRIORITY_HIGH)
} }
val answerIntent = Intent(this, BaresipService::class.java) val answerIntent = Intent(this, BaresipService::class.java)
@@ -698,7 +696,7 @@ class BaresipService: Service() {
.setContentText(target) .setContentText(target)
if (Build.VERSION.SDK_INT < 26) { if (Build.VERSION.SDK_INT < 26) {
nb.setVibrate(LongArray(0)) nb.setVibrate(LongArray(0))
.setVisibility(VISIBILITY_PRIVATE) .setVisibility(NotificationCompat.VISIBILITY_PRIVATE)
.setPriority(Notification.PRIORITY_HIGH) .setPriority(Notification.PRIORITY_HIGH)
} }
val acceptIntent = Intent(this, BaresipService::class.java) val acceptIntent = Intent(this, BaresipService::class.java)
@@ -807,7 +805,7 @@ class BaresipService: Service() {
.setContentText(text) .setContentText(text)
if (Build.VERSION.SDK_INT < 26) { if (Build.VERSION.SDK_INT < 26) {
nb.setVibrate(LongArray(0)) nb.setVibrate(LongArray(0))
.setVisibility(VISIBILITY_PRIVATE) .setVisibility(NotificationCompat.VISIBILITY_PRIVATE)
.setPriority(Notification.PRIORITY_HIGH) .setPriority(Notification.PRIORITY_HIGH)
} }
val replyIntent = Intent(this, BaresipService::class.java) val replyIntent = Intent(this, BaresipService::class.java)
@@ -879,11 +877,11 @@ class BaresipService: Service() {
if (Build.VERSION.SDK_INT >= 26) { if (Build.VERSION.SDK_INT >= 26) {
val defaultChannel = NotificationChannel(DEFAULT_CHANNEL_ID, "Default", val defaultChannel = NotificationChannel(DEFAULT_CHANNEL_ID, "Default",
NotificationManager.IMPORTANCE_LOW) NotificationManager.IMPORTANCE_LOW)
defaultChannel.lockscreenVisibility = VISIBILITY_PUBLIC defaultChannel.lockscreenVisibility = Notification.VISIBILITY_PUBLIC
nm.createNotificationChannel(defaultChannel) nm.createNotificationChannel(defaultChannel)
val highChannel = NotificationChannel(HIGH_CHANNEL_ID, "High", val highChannel = NotificationChannel(HIGH_CHANNEL_ID, "High",
NotificationManager.IMPORTANCE_HIGH) NotificationManager.IMPORTANCE_HIGH)
highChannel.lockscreenVisibility = VISIBILITY_PUBLIC highChannel.lockscreenVisibility = Notification.VISIBILITY_PUBLIC
highChannel.enableVibration(true) highChannel.enableVibration(true)
nm.createNotificationChannel(highChannel) nm.createNotificationChannel(highChannel)
} }
@@ -894,7 +892,7 @@ class BaresipService: Service() {
.setAction(Intent.ACTION_MAIN) .setAction(Intent.ACTION_MAIN)
.addCategory(Intent.CATEGORY_LAUNCHER) .addCategory(Intent.CATEGORY_LAUNCHER)
val pi = getActivity(this, STATUS_REQ_CODE, intent, 0) val pi = getActivity(this, STATUS_REQ_CODE, intent, 0)
snb.setVisibility(VISIBILITY_PUBLIC) snb.setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
.setSmallIcon(R.drawable.ic_stat) .setSmallIcon(R.drawable.ic_stat)
.setContentIntent(pi) .setContentIntent(pi)
.setOngoing(true) .setOngoing(true)