From 2bffcce941a5466957d32c55d2f1050a192aa879 Mon Sep 17 00:00:00 2001
From: Robin Linden <dev@robinlinden.eu>
Date: Thu, 19 Oct 2023 01:37:43 +0200
Subject: [PATCH] Target Android 14

---
 atox/src/main/AndroidManifest.xml          | 8 +++++++-
 atox/src/main/kotlin/ui/AvatarImageView.kt | 4 ++--
 gradle/libs.versions.toml                  | 2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/atox/src/main/AndroidManifest.xml b/atox/src/main/AndroidManifest.xml
index 0ec30ea0..b203b853 100644
--- a/atox/src/main/AndroidManifest.xml
+++ b/atox/src/main/AndroidManifest.xml
@@ -19,7 +19,13 @@
             android:roundIcon="@mipmap/ic_launcher_round"
             android:supportsRtl="true"
             android:theme="@style/AppTheme">
-        <service android:name=".ToxService" android:exported="false"/>
+        <service android:name=".ToxService"
+                android:exported="false"
+                android:foregroundServiceType="specialUse">
+            <property
+                    android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
+                    android:value="serverless peer-to-peer messaging" />
+        </service>
 
         <receiver android:name=".BootReceiver" android:enabled="false" android:exported="false">
             <intent-filter>
diff --git a/atox/src/main/kotlin/ui/AvatarImageView.kt b/atox/src/main/kotlin/ui/AvatarImageView.kt
index 0dc9ee93..324d81b3 100644
--- a/atox/src/main/kotlin/ui/AvatarImageView.kt
+++ b/atox/src/main/kotlin/ui/AvatarImageView.kt
@@ -64,9 +64,9 @@ class AvatarImageView @JvmOverloads constructor(context: Context, attrs: Attribu
         invalidate()
     }
 
-    override fun onDraw(canvas: Canvas?) {
+    override fun onDraw(canvas: Canvas) {
         super.onDraw(canvas)
-        if (canvas == null || !statusIndicatorVisible) return
+        if (!statusIndicatorVisible) return
 
         val size = min(width, height).toFloat()
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3b445b5c..910dc764 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 sdk-min = "19"
-sdk-target = "33"
+sdk-target = "34"
 
 kotlin = "1.9.10"
 ksp = "1.9.10-1.0.13"