From 31df20ffe54c6abc300a6847fbbab9a7c50d47ff Mon Sep 17 00:00:00 2001
From: Prathamesh More <prathameshmm02@gmail.com>
Date: Wed, 6 Jul 2022 14:43:06 +0530
Subject: [PATCH] Partially fix Lockscreen controls

---
 app/src/main/AndroidManifest.xml                         | 4 +++-
 .../monkey/retromusic/activities/LockScreenActivity.kt   | 9 ++++-----
 .../code/name/monkey/retromusic/service/MusicService.kt  | 4 ++--
 app/src/normal/res/values/donottranslate.xml             | 4 ++++
 4 files changed, 13 insertions(+), 8 deletions(-)
 create mode 100644 app/src/normal/res/values/donottranslate.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 987f89181..4ff34f0fb 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -22,6 +22,7 @@
         android:name="android.permission.WRITE_SETTINGS"
         tools:ignore="ProtectedPermissions" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
     <uses-permission
         android:name="android.permission.BLUETOOTH_CONNECT"
         android:usesPermissionFlags="neverForLocation"
@@ -125,7 +126,8 @@
         <activity android:name=".activities.PermissionActivity" />
         <activity
             android:name=".activities.LockScreenActivity"
-            android:launchMode="singleTop"
+            android:excludeFromRecents="true"
+            android:launchMode="singleTask"
             android:showOnLockScreen="true" />
         <activity
             android:name=".fragments.backup.RestoreActivity"
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/LockScreenActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/LockScreenActivity.kt
index 454cfedb1..b4e86ab87 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/LockScreenActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/LockScreenActivity.kt
@@ -84,12 +84,11 @@ class LockScreenActivity : AbsMusicServiceActivity() {
     private fun lockScreenInit() {
         if (VersionUtils.hasOreoMR1()) {
             setShowWhenLocked(true)
-            val keyguardManager = getSystemService<KeyguardManager>()
-            keyguardManager?.requestDismissKeyguard(this, null)
+            //setTurnScreenOn(true)
         } else {
-            this.window.addFlags(
-                WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD or
-                        WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED
+            window.addFlags(
+                WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED
+              //          or WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON
             )
         }
     }
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt b/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt
index 994b824f1..2d4ca51d5 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt
@@ -197,7 +197,7 @@ class MusicService : MediaBrowserServiceCompat(),
         override fun onReceive(context: Context, intent: Intent) {
             if (isLockScreen && isPlaying) {
                 val lockIntent = Intent(context, LockScreenActivity::class.java)
-                lockIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP)
+                lockIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK)
                 startActivity(lockIntent)
             }
         }
@@ -279,7 +279,7 @@ class MusicService : MediaBrowserServiceCompat(),
         uiThreadHandler = Handler(Looper.getMainLooper())
         registerReceiver(widgetIntentReceiver, IntentFilter(APP_WIDGET_UPDATE))
         registerReceiver(updateFavoriteReceiver, IntentFilter(FAVORITE_STATE_CHANGED))
-        registerReceiver(lockScreenReceiver, IntentFilter(Intent.ACTION_SCREEN_OFF))
+        registerReceiver(lockScreenReceiver, IntentFilter(Intent.ACTION_SCREEN_ON))
         sessionToken = mediaSession?.sessionToken
         notificationManager = getSystemService()
         initNotification()
diff --git a/app/src/normal/res/values/donottranslate.xml b/app/src/normal/res/values/donottranslate.xml
new file mode 100644
index 000000000..fbaac7992
--- /dev/null
+++ b/app/src/normal/res/values/donottranslate.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="download_policy">always</string>
+</resources>
\ No newline at end of file