Target Android 13

evilcorpltd · Sep 1, 2023 · b3684d8 · b3684d8
1 parent 35d9908
commit b3684d8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/atox/src/main/AndroidManifest.xml b/atox/src/main/AndroidManifest.xml
@@ -4,6 +4,7 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
     <uses-permission android:name="android.permission.RECORD_AUDIO"/>
     <uses-permission android:name="android.permission.WAKE_LOCK" />

diff --git a/atox/src/main/kotlin/ui/contactlist/ContactListFragment.kt b/atox/src/main/kotlin/ui/contactlist/ContactListFragment.kt
@@ -5,6 +5,7 @@
 
 package ltd.evilcorp.atox.ui.contactlist
 
+import android.Manifest
 import android.os.Build
 import android.os.Bundle
 import android.text.method.PasswordTransformationMethod
@@ -36,6 +37,7 @@ import ltd.evilcorp.atox.databinding.ContactListViewItemBinding
 import ltd.evilcorp.atox.databinding.FragmentContactListBinding
 import ltd.evilcorp.atox.databinding.FriendRequestItemBinding
 import ltd.evilcorp.atox.databinding.NavHeaderContactListBinding
+import ltd.evilcorp.atox.hasPermission
 import ltd.evilcorp.atox.truncated
 import ltd.evilcorp.atox.ui.BaseFragment
 import ltd.evilcorp.atox.ui.ReceiveShareDialogFragment
@@ -66,6 +68,10 @@ class ContactListFragment :
     private var _navHeader: NavHeaderContactListBinding? = null
     private val navHeader get() = _navHeader!!
 
+    private val requestPermissionLauncher = registerForActivityResult(
+        ActivityResultContracts.RequestPermission(),
+    ) { _ -> }
+
     private var backupFileNameHint = "something_is_broken.tox"
 
     private var passwordDialog: AlertDialog? = null
@@ -84,6 +90,11 @@ class ContactListFragment :
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?): Unit = binding.run {
         if (!viewModel.isToxRunning()) return@run
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            if (!requireContext().hasPermission(Manifest.permission.POST_NOTIFICATIONS)) {
+                requestPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS)
+            }
+        }
 
         ViewCompat.setOnApplyWindowInsetsListener(view) { _, compat ->
             val insets = compat.getInsets(WindowInsetsCompat.Type.systemBars())

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 sdk-min = "19"
-sdk-target = "31"
+sdk-target = "33"
 
 kotlin = "1.9.10"
 ksp = "1.9.10-1.0.13"