bugfix: notifications for API 33

Lennoard · Lennoard · commit 20326daf4bcd · 2023-08-19T12:02:47.000-03:00
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -6,6 +6,7 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <application
         android:name=".SysctlGuiApp"
@@ -96,9 +97,6 @@
         <service
             android:name=".services.StartUpService"
             android:permission="android.permission.BIND_JOB_SERVICE" />
-        <service
-            android:name=".services.LegacyStartUpService"
-            android:permission="android.permission.BIND_JOB_SERVICE" />
         <service
             android:name=".widgets.FavoritesWidgetService"
             android:permission="android.permission.BIND_REMOTEVIEWS" />
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/receivers/BootReceiver.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/receivers/BootReceiver.kt
@@ -8,7 +8,6 @@ import com.androidvip.sysctlgui.services.StartUpService
 class BootReceiver : BroadcastReceiver() {
     override fun onReceive(context: Context?, intent: Intent?) {
         if (intent?.action == Intent.ACTION_BOOT_COMPLETED) {
-
             context?.let {
                 StartUpService.start(context)
             }
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/services/LegacyStartUpService.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/services/LegacyStartUpService.kt
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/services/StartUpService.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/services/StartUpService.kt
@@ -6,11 +6,9 @@ import android.app.job.JobService
 import android.content.Context
 import android.content.Intent
 import android.os.Build
-import androidx.annotation.RequiresApi
 import com.androidvip.sysctlgui.services.base.BaseStartUpService
 import java.lang.ref.WeakReference
 
-@RequiresApi(Build.VERSION_CODES.LOLLIPOP)
 class StartUpService : JobService(), BaseStartUpService.ServiceHandler {
 
     override fun onStartJob(params: JobParameters?): Boolean {
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/services/base/BaseStartUpService.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/services/base/BaseStartUpService.kt
@@ -1,10 +1,13 @@
 package com.androidvip.sysctlgui.services.base
 
+import android.Manifest
 import android.app.Notification
 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.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import com.androidvip.sysctlgui.R
@@ -13,6 +16,8 @@ import com.androidvip.sysctlgui.domain.repository.AppPrefs
 import com.androidvip.sysctlgui.domain.usecase.ApplyParamsUseCase
 import com.androidvip.sysctlgui.domain.usecase.GetUserParamsUseCase
 import com.topjohnwu.superuser.Shell
+import java.lang.ref.WeakReference
+import kotlin.coroutines.CoroutineContext
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -24,8 +29,6 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
-import java.lang.ref.WeakReference
-import kotlin.coroutines.CoroutineContext
 
 class BaseStartUpService(
     private var weakContext: WeakReference<Context?>,
@@ -67,7 +70,10 @@ class BaseStartUpService(
     private inline fun showNotificationAndThen(crossinline onShow: () -> Unit) {
         val context = weakContext.get() ?: return
         val resources = context.resources
-        val builder: NotificationCompat.Builder = NotificationCompat.Builder(context, NOTIFICATION_ID)
+        val builder: NotificationCompat.Builder = NotificationCompat.Builder(
+            context,
+            NOTIFICATION_ID
+        )
             .setSmallIcon(R.drawable.app_icon_foreground)
             .setContentTitle(resources.getString(R.string.notification_start_up_title))
             .setPriority(NotificationCompat.PRIORITY_DEFAULT)
@@ -82,7 +88,9 @@ class BaseStartUpService(
                 resources.getString(R.string.notification_start_up_channel_name),
                 NotificationManager.IMPORTANCE_DEFAULT
             ).apply {
-                description = resources.getString(R.string.notification_start_up_channel_description)
+                description = resources.getString(
+                    R.string.notification_start_up_channel_description
+                )
                 notificationManager.createNotificationChannel(this)
             }
         }
@@ -104,14 +112,30 @@ class BaseStartUpService(
                     for (i in startupDelay downTo 0) {
                         if (i == 0) {
                             builder.setProgress(0, 0, true)
-                            builder.setContentTitle(context.getString(R.string.notification_start_up_title))
-                            builder.setContentText(context.getString(R.string.notification_start_up_description))
-
-                            notify(SERVICE_ID, builder.build())
+                            builder.setContentTitle(
+                                context.getString(R.string.notification_start_up_title)
+                            )
+                            builder.setContentText(
+                                context.getString(R.string.notification_start_up_description)
+                            )
+
+                            if (ActivityCompat.checkSelfPermission(
+                                    context,
+                                    Manifest.permission.POST_NOTIFICATIONS
+                                ) == PackageManager.PERMISSION_GRANTED ||
+                                Build.VERSION.SDK_INT <= Build.VERSION_CODES.TIRAMISU
+                            ) {
+                                notify(SERVICE_ID, builder.build())
+                            }
                             handler?.onStartForeground(SERVICE_ID, builder.build())
                             onShow()
                         } else {
-                            builder.setContentTitle(context.getString(R.string.notification_start_up_description_delay, i))
+                            builder.setContentTitle(
+                                context.getString(
+                                    R.string.notification_start_up_description_delay,
+                                    i
+                                )
+                            )
                             builder.setProgress(startupDelay, delayCount, false)
                             notify(SERVICE_ID, builder.build())
                             delay(1100)
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/base/BaseAppCompatActivity.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/base/BaseAppCompatActivity.kt
@@ -12,7 +12,7 @@ import org.koin.android.ext.android.inject
  * TODO: Temporary until 100% compose
  */
 abstract class BaseAppCompatActivity : AppCompatActivity() {
-    private val prefs by inject<AppPrefs>()
+    protected val prefs by inject<AppPrefs>()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainActivity.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainActivity.kt
@@ -1,7 +1,13 @@
 package com.androidvip.sysctlgui.ui.main
 
+import android.app.NotificationManager
+import android.content.Context
+import android.os.Build
 import android.os.Bundle
+import android.os.Handler
 import android.view.MenuItem
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.core.os.postDelayed
 import androidx.core.view.WindowCompat
 import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.ui.AppBarConfiguration
@@ -14,6 +20,9 @@ import com.androidvip.sysctlgui.ui.base.BaseAppCompatActivity
 class MainActivity : BaseAppCompatActivity() {
     private lateinit var binding: ActivityMain2Binding
 
+    private val notificationPermissionLauncher =
+        registerForActivityResult(ActivityResultContracts.RequestPermission()) { _ -> }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         WindowCompat.setDecorFitsSystemWindows(window, false)
@@ -22,6 +31,10 @@ class MainActivity : BaseAppCompatActivity() {
         setContentView(binding.root)
         setSupportActionBar(binding.toolbar)
 
+        Handler(mainLooper).postDelayed(1000) {
+            checkNotificationPermission()
+        }
+
         setUpNavigation()
         navigateFromIntent()
     }
@@ -71,6 +84,16 @@ class MainActivity : BaseAppCompatActivity() {
         }
     }
 
+    private fun checkNotificationPermission() {
+        val manager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) return
+        if (prefs.askedForNotificationPermission || !prefs.runOnStartUp) return
+        if (manager.areNotificationsEnabled()) return
+
+        notificationPermissionLauncher.launch(android.Manifest.permission.POST_NOTIFICATIONS)
+        prefs.askedForNotificationPermission = true
+    }
+
     private val navHost: NavHostFragment
         get() = supportFragmentManager.findFragmentById(R.id.navHostFragment) as NavHostFragment
 
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/SettingsFragment.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/settings/SettingsFragment.kt
@@ -1,6 +1,10 @@
 package com.androidvip.sysctlgui.ui.settings
 
+import android.app.NotificationManager
+import android.content.Context
+import android.os.Build
 import android.os.Bundle
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.lifecycle.lifecycleScope
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
@@ -18,6 +22,9 @@ class SettingsFragment : PreferenceFragmentCompat(), Preference.OnPreferenceChan
     private val prefs: AppPrefs by inject()
     private val rootUtils: RootUtils by inject()
 
+    private val notificationPermissionLauncher =
+        registerForActivityResult(ActivityResultContracts.RequestPermission()) { _ -> }
+
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         setPreferencesFromResource(R.xml.preferences, rootKey)
 
@@ -62,6 +69,7 @@ class SettingsFragment : PreferenceFragmentCompat(), Preference.OnPreferenceChan
         when (preference.key) {
             Consts.Prefs.RUN_ON_START_UP -> {
                 StartUpServiceToggle.toggleStartUpService(requireContext(), newValue == true)
+                askForNotificationPermission()
             }
 
             Consts.Prefs.COMMIT_MODE -> {
@@ -96,4 +104,17 @@ class SettingsFragment : PreferenceFragmentCompat(), Preference.OnPreferenceChan
 
         return true
     }
+
+    private fun askForNotificationPermission() {
+        val manager = requireContext().getSystemService(Context.NOTIFICATION_SERVICE)
+            as NotificationManager
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            if (!manager.areNotificationsEnabled()) {
+                notificationPermissionLauncher.launch(
+                    android.Manifest.permission.POST_NOTIFICATIONS
+                )
+            }
+        }
+    }
 }
diff --git a/common/utils/src/main/kotlin/com/androidvip/sysctlgui/utils/Consts.kt b/common/utils/src/main/kotlin/com/androidvip/sysctlgui/utils/Consts.kt
@@ -21,5 +21,6 @@ object Consts {
         const val MIGRATION_COMPLETED = "migration_completed"
         const val FORCE_DARK_THEME = "force_dark_theme"
         const val DYNAMIC_COLORS = "dynamic_colors"
+        const val ASKED_NOTIFICATION_PERMISSION = "asked_notification_permission"
     }
 }
diff --git a/data/src/main/java/com/androidvip/sysctlgui/data/repository/AppPrefsImpl.kt b/data/src/main/java/com/androidvip/sysctlgui/data/repository/AppPrefsImpl.kt
@@ -32,7 +32,7 @@ class AppPrefsImpl(private val prefs: SharedPreferences) : AppPrefs {
             prefs.edit { putBoolean(Consts.Prefs.USE_BUSYBOX, value) }
         }
     override var runOnStartUp: Boolean
-        get() = prefs.getBoolean(Consts.Prefs.RUN_ON_START_UP, true)
+        get() = prefs.getBoolean(Consts.Prefs.RUN_ON_START_UP, false)
         set(value) {
             prefs.edit { putBoolean(Consts.Prefs.RUN_ON_START_UP, value) }
         }
@@ -52,7 +52,7 @@ class AppPrefsImpl(private val prefs: SharedPreferences) : AppPrefs {
             prefs.edit { putBoolean(Consts.Prefs.MIGRATION_COMPLETED, value) }
         }
     override var forceDark: Boolean
-        get() = prefs.getBoolean(Consts.Prefs.FORCE_DARK_THEME, true)
+        get() = prefs.getBoolean(Consts.Prefs.FORCE_DARK_THEME, false)
         set(value) {
             prefs.edit { putBoolean(Consts.Prefs.FORCE_DARK_THEME, value) }
         }
@@ -61,4 +61,9 @@ class AppPrefsImpl(private val prefs: SharedPreferences) : AppPrefs {
         set(value) {
             prefs.edit { putBoolean(Consts.Prefs.DYNAMIC_COLORS, value) }
         }
+    override var askedForNotificationPermission: Boolean
+        get() = prefs.getBoolean(Consts.Prefs.ASKED_NOTIFICATION_PERMISSION, false)
+        set(value) {
+            prefs.edit { putBoolean(Consts.Prefs.ASKED_NOTIFICATION_PERMISSION, value) }
+        }
 }
diff --git a/domain/src/main/java/com/androidvip/sysctlgui/domain/repository/AppPrefs.kt b/domain/src/main/java/com/androidvip/sysctlgui/domain/repository/AppPrefs.kt
@@ -12,4 +12,5 @@ interface AppPrefs {
     var migrationCompleted: Boolean
     var forceDark: Boolean
     var dynamicColors: Boolean
+    var askedForNotificationPermission: Boolean
 }

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@ import com.androidvip.sysctlgui.services.StartUpService`
`8`	`8`	`class BootReceiver : BroadcastReceiver() {`
`9`	`9`	`override fun onReceive(context: Context?, intent: Intent?) {`
`10`	`10`	`if (intent?.action == Intent.ACTION_BOOT_COMPLETED) {`
`11`		`-`
`12`	`11`	`context?.let {`
`13`	`12`	`StartUpService.start(context)`
`14`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,5 +21,6 @@ object Consts {`
`21`	`21`	`const val MIGRATION_COMPLETED = "migration_completed"`
`22`	`22`	`const val FORCE_DARK_THEME = "force_dark_theme"`
`23`	`23`	`const val DYNAMIC_COLORS = "dynamic_colors"`
	`24`	`+ const val ASKED_NOTIFICATION_PERMISSION = "asked_notification_permission"`
`24`	`25`	`}`
`25`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class AppPrefsImpl(private val prefs: SharedPreferences) : AppPrefs {`
`32`	`32`	`prefs.edit { putBoolean(Consts.Prefs.USE_BUSYBOX, value) }`
`33`	`33`	`}`
`34`	`34`	`override var runOnStartUp: Boolean`
`35`		`- get() = prefs.getBoolean(Consts.Prefs.RUN_ON_START_UP, true)`
	`35`	`+ get() = prefs.getBoolean(Consts.Prefs.RUN_ON_START_UP, false)`
`36`	`36`	`set(value) {`
`37`	`37`	`prefs.edit { putBoolean(Consts.Prefs.RUN_ON_START_UP, value) }`
`38`	`38`	`}`
`@@ -52,7 +52,7 @@ class AppPrefsImpl(private val prefs: SharedPreferences) : AppPrefs {`
`52`	`52`	`prefs.edit { putBoolean(Consts.Prefs.MIGRATION_COMPLETED, value) }`
`53`	`53`	`}`
`54`	`54`	`override var forceDark: Boolean`
`55`		`- get() = prefs.getBoolean(Consts.Prefs.FORCE_DARK_THEME, true)`
	`55`	`+ get() = prefs.getBoolean(Consts.Prefs.FORCE_DARK_THEME, false)`
`56`	`56`	`set(value) {`
`57`	`57`	`prefs.edit { putBoolean(Consts.Prefs.FORCE_DARK_THEME, value) }`
`58`	`58`	`}`
`@@ -61,4 +61,9 @@ class AppPrefsImpl(private val prefs: SharedPreferences) : AppPrefs {`
`61`	`61`	`set(value) {`
`62`	`62`	`prefs.edit { putBoolean(Consts.Prefs.DYNAMIC_COLORS, value) }`
`63`	`63`	`}`
	`64`	`+ override var askedForNotificationPermission: Boolean`
	`65`	`+ get() = prefs.getBoolean(Consts.Prefs.ASKED_NOTIFICATION_PERMISSION, false)`
	`66`	`+ set(value) {`
	`67`	`+ prefs.edit { putBoolean(Consts.Prefs.ASKED_NOTIFICATION_PERMISSION, value) }`
	`68`	`+ }`
`64`	`69`	`}`