From 8f54b59a318b80422ddba1e9fedfbca4dacd9154 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 11 Sep 2022 18:59:39 +0200 Subject: [PATCH] use the helper function for checking notification permission --- .../activities/BackgroundRecordActivity.kt | 5 ++--- .../voicerecorder/fragments/RecorderFragment.kt | 16 +++++----------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/voicerecorder/activities/BackgroundRecordActivity.kt b/app/src/main/kotlin/com/simplemobiletools/voicerecorder/activities/BackgroundRecordActivity.kt index 329ce34..bab6c51 100644 --- a/app/src/main/kotlin/com/simplemobiletools/voicerecorder/activities/BackgroundRecordActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/voicerecorder/activities/BackgroundRecordActivity.kt @@ -2,7 +2,6 @@ package com.simplemobiletools.voicerecorder.activities import android.content.Intent import com.simplemobiletools.commons.extensions.toast -import com.simplemobiletools.commons.helpers.PERMISSION_POST_NOTIFICATIONS import com.simplemobiletools.voicerecorder.R import com.simplemobiletools.voicerecorder.services.RecorderService @@ -14,8 +13,8 @@ class BackgroundRecordActivity : SimpleActivity() { override fun onResume() { super.onResume() if (intent.action == RECORD_INTENT_ACTION) { - handlePermission(PERMISSION_POST_NOTIFICATIONS) { - if (it) { + handleNotificationPermission { granted -> + if (granted) { Intent(this@BackgroundRecordActivity, RecorderService::class.java).apply { try { if (RecorderService.isRunning) { diff --git a/app/src/main/kotlin/com/simplemobiletools/voicerecorder/fragments/RecorderFragment.kt b/app/src/main/kotlin/com/simplemobiletools/voicerecorder/fragments/RecorderFragment.kt index 2e7eba3..68a9f42 100644 --- a/app/src/main/kotlin/com/simplemobiletools/voicerecorder/fragments/RecorderFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/voicerecorder/fragments/RecorderFragment.kt @@ -8,9 +8,7 @@ import android.os.Looper import android.util.AttributeSet import com.simplemobiletools.commons.activities.BaseSimpleActivity import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.PERMISSION_POST_NOTIFICATIONS import com.simplemobiletools.commons.helpers.isNougatPlus -import com.simplemobiletools.commons.helpers.isTiramisuPlus import com.simplemobiletools.voicerecorder.R import com.simplemobiletools.voicerecorder.helpers.* import com.simplemobiletools.voicerecorder.models.Events @@ -49,16 +47,12 @@ class RecorderFragment(context: Context, attributeSet: AttributeSet) : MyViewPag updateRecordingDuration(0) toggle_recording_button.setOnClickListener { - if (isTiramisuPlus()) { - (context as? BaseSimpleActivity)?.handlePermission(PERMISSION_POST_NOTIFICATIONS) { - if (it) { - toggleRecording() - } else { - context.toast(R.string.no_post_notifications_permissions) - } + (context as? BaseSimpleActivity)?.handleNotificationPermission { granted -> + if (granted) { + toggleRecording() + } else { + context.toast(R.string.no_post_notifications_permissions) } - } else { - toggleRecording() } }