diff --git a/app/src/main/java/me/lucky/wasted/AppNotificationManager.kt b/app/src/main/java/me/lucky/wasted/AppNotificationManager.kt deleted file mode 100644 index de946cf..0000000 --- a/app/src/main/java/me/lucky/wasted/AppNotificationManager.kt +++ /dev/null @@ -1,25 +0,0 @@ -package me.lucky.wasted - -import android.app.NotificationChannel -import android.app.NotificationManager -import android.content.Context -import android.os.Build - -class AppNotificationManager(private val ctx: Context) { - companion object { - const val CHANNEL_DEFAULT_ID = "default" - } - - private val manager = ctx.getSystemService(NotificationManager::class.java) - - fun createNotificationChannels() { - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return - manager?.createNotificationChannel( - NotificationChannel( - CHANNEL_DEFAULT_ID, - ctx.getString(R.string.notification_channel_default_name), - NotificationManager.IMPORTANCE_LOW, - ) - ) - } -} diff --git a/app/src/main/java/me/lucky/wasted/ForegroundService.kt b/app/src/main/java/me/lucky/wasted/ForegroundService.kt index 585fe0e..fde767d 100644 --- a/app/src/main/java/me/lucky/wasted/ForegroundService.kt +++ b/app/src/main/java/me/lucky/wasted/ForegroundService.kt @@ -45,7 +45,7 @@ class ForegroundService : Service() { super.onStartCommand(intent, flags, startId) startForeground( NOTIFICATION_ID, - NotificationCompat.Builder(this, AppNotificationManager.CHANNEL_DEFAULT_ID) + NotificationCompat.Builder(this, NotificationManager.CHANNEL_DEFAULT_ID) .setContentTitle(getString(R.string.foreground_service_notification_title)) .setSmallIcon(android.R.drawable.ic_delete) .setPriority(NotificationCompat.PRIORITY_LOW) diff --git a/app/src/main/java/me/lucky/wasted/MainActivity.kt b/app/src/main/java/me/lucky/wasted/MainActivity.kt index c01ab32..980cf7f 100644 --- a/app/src/main/java/me/lucky/wasted/MainActivity.kt +++ b/app/src/main/java/me/lucky/wasted/MainActivity.kt @@ -56,7 +56,7 @@ open class MainActivity : AppCompatActivity() { private fun init() { prefs = Preferences(this) admin = DeviceAdminManager(this) - AppNotificationManager(this).createNotificationChannels() + NotificationManager(this).createNotificationChannels() if (prefs.code == "") prefs.code = makeCode() updateCodeColorState() if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) hideESIM() diff --git a/app/src/main/java/me/lucky/wasted/NotificationManager.kt b/app/src/main/java/me/lucky/wasted/NotificationManager.kt new file mode 100644 index 0000000..5becc0b --- /dev/null +++ b/app/src/main/java/me/lucky/wasted/NotificationManager.kt @@ -0,0 +1,20 @@ +package me.lucky.wasted + +import android.content.Context +import androidx.core.app.NotificationChannelCompat +import androidx.core.app.NotificationManagerCompat + +class NotificationManager(ctx: Context) { + companion object { + const val CHANNEL_DEFAULT_ID = "default" + } + + private val manager = NotificationManagerCompat.from(ctx) + + fun createNotificationChannels() { + manager.createNotificationChannel(NotificationChannelCompat.Builder( + CHANNEL_DEFAULT_ID, + NotificationManagerCompat.IMPORTANCE_LOW, + ).build()) + } +} diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index e8a4df0..726b285 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -19,7 +19,6 @@ Стереть при неактивности Стереть данные когда устройство не разблокируется N дней. Дней - Дефолт OK Стереть данные при неактивности Не удалось запланировать сервис стирания данных diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bde7c2e..ea87cad 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -19,7 +19,6 @@ Wipe on inactivity Wipe a device when it was not unlocked for N days. Days - Default OK Wipe a device on inactivity Failed to schedule a wipe job