From 67c6a1ba273adb3c5a752c6a3fcc85d9ae216855 Mon Sep 17 00:00:00 2001 From: Sunik Kupfer Date: Wed, 26 Feb 2025 15:40:35 +0100 Subject: [PATCH] Remove remaining notification related code --- .../bitfire/cert4android/NotificationUtils.kt | 43 ------------------- .../bitfire/cert4android/demo/MainActivity.kt | 16 ------- 2 files changed, 59 deletions(-) delete mode 100644 lib/src/main/java/at/bitfire/cert4android/NotificationUtils.kt diff --git a/lib/src/main/java/at/bitfire/cert4android/NotificationUtils.kt b/lib/src/main/java/at/bitfire/cert4android/NotificationUtils.kt deleted file mode 100644 index cc960f7..0000000 --- a/lib/src/main/java/at/bitfire/cert4android/NotificationUtils.kt +++ /dev/null @@ -1,43 +0,0 @@ -/*************************************************************************************************** - * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details. - **************************************************************************************************/ - -package at.bitfire.cert4android - -import android.Manifest -import android.app.NotificationChannel -import android.app.NotificationManager -import android.content.Context -import android.content.pm.PackageManager -import android.os.Build -import androidx.core.app.ActivityCompat -import androidx.core.app.NotificationManagerCompat - -object NotificationUtils { - - const val CHANNEL_CERTIFICATES = "cert4android" - - const val ID_CERT_DECISION = 88809 - - - /** - * Checks whether the notifications permission is granted. - */ - fun notificationsPermitted(context: Context) = - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { - ActivityCompat.checkSelfPermission(context, Manifest.permission.POST_NOTIFICATIONS) == PackageManager.PERMISSION_GRANTED - } else - true - - - fun createChannels(context: Context): NotificationManagerCompat { - val nm = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager - - if (Build.VERSION.SDK_INT >= 26) - nm.createNotificationChannel(NotificationChannel(CHANNEL_CERTIFICATES, - context.getString(R.string.certificate_notification_connection_security), NotificationManager.IMPORTANCE_HIGH)) - - return NotificationManagerCompat.from(context) - } - -} \ No newline at end of file diff --git a/sample-app/src/main/java/at/bitfire/cert4android/demo/MainActivity.kt b/sample-app/src/main/java/at/bitfire/cert4android/demo/MainActivity.kt index 3802994..3b9e4e6 100644 --- a/sample-app/src/main/java/at/bitfire/cert4android/demo/MainActivity.kt +++ b/sample-app/src/main/java/at/bitfire/cert4android/demo/MainActivity.kt @@ -1,11 +1,8 @@ package at.bitfire.cert4android.demo -import android.Manifest import android.annotation.SuppressLint import android.app.Application -import android.content.pm.PackageManager import android.net.SSLCertificateSocketFactory -import android.os.Build import android.os.Bundle import android.util.Log import androidx.activity.ComponentActivity @@ -31,7 +28,6 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import androidx.compose.ui.window.DialogProperties -import androidx.core.app.ActivityCompat import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.MutableLiveData import androidx.lifecycle.viewModelScope @@ -56,18 +52,6 @@ class MainActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - - if (Build.VERSION.SDK_INT >= 33 && ActivityCompat.checkSelfPermission( - this, - Manifest.permission.POST_NOTIFICATIONS - ) != PackageManager.PERMISSION_GRANTED - ) - ActivityCompat.requestPermissions( - this, - arrayOf(Manifest.permission.POST_NOTIFICATIONS), - 0 - ) - setContent { Cert4Android.theme { @Composable