Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/bitfireAT/cert4android.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicki Hirner <hirner@bitfire.at>2018-03-15 19:45:33 +0300
committerRicki Hirner <hirner@bitfire.at>2018-03-15 19:46:47 +0300
commit1b04b43d0e4992ca665b5c52151c17265be3df02 (patch)
tree7584043a458b5bfcf16f4ff9a132a0ec71e0652d
parentc52e83951026edf6de37eb6f3ce36deb6d6c670b (diff)
Use default priority for certificate notifications
-rw-r--r--src/androidTest/kotlin/at/bitfire/cert4android/CustomCertManagerTest.kt (renamed from src/androidTest/java/at/bitfire/cert4android/CustomCertManagerTest.kt)0
-rw-r--r--src/main/kotlin/at/bitfire/cert4android/CertUtils.kt (renamed from src/main/java/at/bitfire/cert4android/CertUtils.kt)0
-rw-r--r--src/main/kotlin/at/bitfire/cert4android/Constants.kt (renamed from src/main/java/at/bitfire/cert4android/Constants.kt)0
-rw-r--r--src/main/kotlin/at/bitfire/cert4android/CustomCertManager.kt (renamed from src/main/java/at/bitfire/cert4android/CustomCertManager.kt)0
-rw-r--r--src/main/kotlin/at/bitfire/cert4android/CustomCertService.kt (renamed from src/main/java/at/bitfire/cert4android/CustomCertService.kt)3
-rw-r--r--src/main/kotlin/at/bitfire/cert4android/NotificationUtils.kt (renamed from src/main/java/at/bitfire/cert4android/NotificationUtils.kt)2
-rw-r--r--src/main/kotlin/at/bitfire/cert4android/TrustCertificateActivity.kt (renamed from src/main/java/at/bitfire/cert4android/TrustCertificateActivity.kt)0
-rw-r--r--src/test/kotlin/at/bitfire/cert4android/CertUtilsTest.kt (renamed from src/test/java/at/bitfire/cert4android/CertUtilsTest.kt)0
8 files changed, 2 insertions, 3 deletions
diff --git a/src/androidTest/java/at/bitfire/cert4android/CustomCertManagerTest.kt b/src/androidTest/kotlin/at/bitfire/cert4android/CustomCertManagerTest.kt
index 02172de..02172de 100644
--- a/src/androidTest/java/at/bitfire/cert4android/CustomCertManagerTest.kt
+++ b/src/androidTest/kotlin/at/bitfire/cert4android/CustomCertManagerTest.kt
diff --git a/src/main/java/at/bitfire/cert4android/CertUtils.kt b/src/main/kotlin/at/bitfire/cert4android/CertUtils.kt
index 5947fa3..5947fa3 100644
--- a/src/main/java/at/bitfire/cert4android/CertUtils.kt
+++ b/src/main/kotlin/at/bitfire/cert4android/CertUtils.kt
diff --git a/src/main/java/at/bitfire/cert4android/Constants.kt b/src/main/kotlin/at/bitfire/cert4android/Constants.kt
index 8686fa0..8686fa0 100644
--- a/src/main/java/at/bitfire/cert4android/Constants.kt
+++ b/src/main/kotlin/at/bitfire/cert4android/Constants.kt
diff --git a/src/main/java/at/bitfire/cert4android/CustomCertManager.kt b/src/main/kotlin/at/bitfire/cert4android/CustomCertManager.kt
index 380d504..380d504 100644
--- a/src/main/java/at/bitfire/cert4android/CustomCertManager.kt
+++ b/src/main/kotlin/at/bitfire/cert4android/CustomCertManager.kt
diff --git a/src/main/java/at/bitfire/cert4android/CustomCertService.kt b/src/main/kotlin/at/bitfire/cert4android/CustomCertService.kt
index a5adbe0..61aee67 100644
--- a/src/main/java/at/bitfire/cert4android/CustomCertService.kt
+++ b/src/main/kotlin/at/bitfire/cert4android/CustomCertService.kt
@@ -72,7 +72,7 @@ class CustomCertService: Service() {
try {
FileInputStream(keyStoreFile).use { trustedKeyStore.load(it, null) }
} catch(e: Exception) {
- Constants.log.log(Level.INFO, "No persistent key store (yet), creating in-memory key store", e)
+ Constants.log.log(Level.INFO, "No persistent key store (yet), creating in-memory key store. This is not an error!", e)
try {
trustedKeyStore.load(null, null)
} catch(e: Exception) {
@@ -225,7 +225,6 @@ class CustomCertService: Service() {
.setContentText(this@CustomCertService.getString(R.string.certificate_notification_user_interaction))
.setSubText(cert.subjectDN.name)
.setCategory(NotificationCompat.CATEGORY_SERVICE)
- .setPriority(NotificationCompat.PRIORITY_HIGH)
.setContentIntent(PendingIntent.getActivity(this@CustomCertService, id, decisionIntent, PendingIntent.FLAG_UPDATE_CURRENT))
.setDeleteIntent(PendingIntent.getService(this@CustomCertService, id, rejectIntent, PendingIntent.FLAG_UPDATE_CURRENT))
.build()
diff --git a/src/main/java/at/bitfire/cert4android/NotificationUtils.kt b/src/main/kotlin/at/bitfire/cert4android/NotificationUtils.kt
index ac4914a..d0371f9 100644
--- a/src/main/java/at/bitfire/cert4android/NotificationUtils.kt
+++ b/src/main/kotlin/at/bitfire/cert4android/NotificationUtils.kt
@@ -23,7 +23,7 @@ object NotificationUtils {
if (Build.VERSION.SDK_INT >= 26)
nm.createNotificationChannel(NotificationChannel(CHANNEL_CERTIFICATES,
- context.getString(R.string.certificate_notification_connection_security), NotificationManager.IMPORTANCE_HIGH))
+ context.getString(R.string.certificate_notification_connection_security), NotificationManager.IMPORTANCE_DEFAULT))
return NotificationManagerCompat.from(context)
}
diff --git a/src/main/java/at/bitfire/cert4android/TrustCertificateActivity.kt b/src/main/kotlin/at/bitfire/cert4android/TrustCertificateActivity.kt
index cec7b42..cec7b42 100644
--- a/src/main/java/at/bitfire/cert4android/TrustCertificateActivity.kt
+++ b/src/main/kotlin/at/bitfire/cert4android/TrustCertificateActivity.kt
diff --git a/src/test/java/at/bitfire/cert4android/CertUtilsTest.kt b/src/test/kotlin/at/bitfire/cert4android/CertUtilsTest.kt
index 1e9e7a0..1e9e7a0 100644
--- a/src/test/java/at/bitfire/cert4android/CertUtilsTest.kt
+++ b/src/test/kotlin/at/bitfire/cert4android/CertUtilsTest.kt