fix: permission related issues

you-apps · Apr 7, 2024 · 302b910 · 302b910
1 parent adc5de9
commit 302b910
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 19 deletions.
diff --git a/app/src/main/java/com/bnyro/recorder/canvas_overlay/CanvasOverlay.kt b/app/src/main/java/com/bnyro/recorder/canvas_overlay/CanvasOverlay.kt
@@ -94,7 +94,7 @@ class CanvasOverlay(context: Context) {
             y = 0
         }
 
-    init {
+    fun show() {
         hideCanvas()
         try {
             if (canvasView.windowToken == null && canvasView.parent == null) {

diff --git a/app/src/main/java/com/bnyro/recorder/services/AudioRecorderTile.kt b/app/src/main/java/com/bnyro/recorder/services/AudioRecorderTile.kt
@@ -2,6 +2,7 @@ package com.bnyro.recorder.services
 
 import android.app.PendingIntent
 import android.content.Intent
+import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
 import android.os.Build
 import android.service.quicksettings.TileService
 import androidx.annotation.RequiresApi
@@ -14,6 +15,9 @@ class AudioRecorderTile : TileService() {
         super.onClick()
         val intent = Intent(this, MainActivity::class.java)
             .putExtra(MainActivity.EXTRA_ACTION_KEY, RecorderType.AUDIO.name)
+            .apply {
+                flags = FLAG_ACTIVITY_NEW_TASK
+            }
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
             startActivityAndCollapse(
                 PendingIntent.getActivity(

diff --git a/app/src/main/java/com/bnyro/recorder/services/ScreenRecorderTile.kt b/app/src/main/java/com/bnyro/recorder/services/ScreenRecorderTile.kt
@@ -14,6 +14,9 @@ class ScreenRecorderTile : TileService() {
         super.onClick()
         val intent = Intent(this, MainActivity::class.java)
             .putExtra(MainActivity.EXTRA_ACTION_KEY, RecorderType.VIDEO.name)
+            .apply {
+                flags = Intent.FLAG_ACTIVITY_NEW_TASK
+            }
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
             startActivityAndCollapse(

diff --git a/app/src/main/java/com/bnyro/recorder/ui/MainActivity.kt b/app/src/main/java/com/bnyro/recorder/ui/MainActivity.kt
@@ -81,7 +81,9 @@ class MainActivity : ComponentActivity() {
         if (initialRecorderType == RecorderType.AUDIO) {
             recorderModel.startAudioRecorder(this)
         } else if (initialRecorderType == RecorderType.VIDEO) {
-            launcher.launch(mProjectionManager.createScreenCaptureIntent())
+            if (recorderModel.hasScreenRecordingPermissions(this)) {
+                launcher.launch(mProjectionManager.createScreenCaptureIntent())
+            }
         }
         intent.removeExtra(EXTRA_ACTION_KEY)
     }

diff --git a/app/src/main/java/com/bnyro/recorder/ui/models/RecorderModel.kt b/app/src/main/java/com/bnyro/recorder/ui/models/RecorderModel.kt
@@ -6,12 +6,10 @@ import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
 import android.content.ServiceConnection
-import android.net.Uri
 import android.os.Build
 import android.os.Handler
 import android.os.IBinder
 import android.os.Looper
-import android.provider.Settings
 import androidx.activity.result.ActivityResult
 import androidx.annotation.RequiresApi
 import androidx.compose.runtime.getValue
@@ -31,7 +29,6 @@ import com.bnyro.recorder.util.PermissionHelper
 import com.bnyro.recorder.util.Preferences
 
 class RecorderModel : ViewModel() {
-    private val audioPermission = arrayOf(Manifest.permission.RECORD_AUDIO)
     private val supportsOverlay = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
 
     var recorderState by mutableStateOf(RecorderState.IDLE)
@@ -52,6 +49,7 @@ class RecorderModel : ViewModel() {
                 recorderState = it
             }
             (recorderService as? ScreenRecorderService)?.prepare(activityResult!!)
+            if (supportsOverlay) canvasOverlay?.show()
             recorderService?.start()
         }
 
@@ -73,7 +71,12 @@ class RecorderModel : ViewModel() {
 
     @SuppressLint("NewApi")
     fun startAudioRecorder(context: Context) {
-        if (!PermissionHelper.checkPermissions(context, audioPermission)) return
+        val audioPermission = mutableListOf(Manifest.permission.RECORD_AUDIO)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            audioPermission.add(Manifest.permission.POST_NOTIFICATIONS)
+        }
+
+        if (!PermissionHelper.checkPermissions(context, audioPermission.toTypedArray())) return
 
         val serviceIntent =
             if (Preferences.prefs.getBoolean(Preferences.losslessRecorderKey, false)) {
@@ -152,19 +155,6 @@ class RecorderModel : ViewModel() {
 
     @SuppressLint("NewApi")
     fun hasScreenRecordingPermissions(context: Context): Boolean {
-        val overlayEnabled = Preferences.prefs.getBoolean(
-            Preferences.showOverlayAnnotationToolKey,
-            false
-        )
-        if (supportsOverlay && overlayEnabled && !Settings.canDrawOverlays(context)) {
-            val intent = Intent(
-                Settings.ACTION_MANAGE_OVERLAY_PERMISSION,
-                Uri.parse("package:" + context.packageName)
-            )
-            context.startActivity(intent)
-            return false
-        }
-
         val requiredPermissions = arrayListOf<String>()
 
         val recordAudio =
-Original file line number
+Diff line change
@@ Expand Up / @@ -94,7 +94,7 @@ class CanvasOverlay(context: Context) { @@
                 y = 0
             }
-        init {
+        fun show() {
             hideCanvas()
             try {
                 if (canvasView.windowToken == null && canvasView.parent == null) {
@@ Expand Down @@