From 9e584003ef834f20b3e085f2140bb936492771bb Mon Sep 17 00:00:00 2001
From: Merbin J Anselm <merbinjanselm@gmail.com>
Date: Fri, 7 Jun 2019 21:08:37 +0530
Subject: [PATCH] Fixes bug where Lock Screen would show "Cast" slider and
 IllegalArgument crash in some devices

---
 .idea/modules.xml                             |  1 -
 app/build.gradle                              | 22 +++++-
 app/src/main/AndroidManifest.xml              | 24 ++++++
 .../torchie/main/TorchieManager.java          | 19 +++++
 .../main/manager/wakelock/WakeLock.java       | 26 ++++++-
 .../torchie/receiver/RockerReceiver.java      | 75 +++++++++++++++++++
 .../torchie/service/TorchieQuick.java         | 20 ++++-
 7 files changed, 182 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/java/in/blogspot/anselmbros/torchie/receiver/RockerReceiver.java

diff --git a/.idea/modules.xml b/.idea/modules.xml
index 9380290..65aa193 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -4,7 +4,6 @@
     <modules>
       <module fileurl="file://$PROJECT_DIR$/Torchie-Android.iml" filepath="$PROJECT_DIR$/Torchie-Android.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 4c06168..9ccdef5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -70,6 +70,24 @@
  *     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+/*
+ *     Copyright (C) 2017 Merbin J Anselm <merbinjanselm@gmail.com>
+ *
+ *     This program is free software; you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation; either version 2 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License along
+ *     with this program; if not, write to the Free Software Foundation, Inc.,
+ *     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 /*
  *     Copyright (C) 2016  Merbin J Anselm <merbinjanselm@gmail.com>
  *
@@ -102,8 +120,8 @@ android {
         applicationId "in.blogspot.anselmbros.torchie"
         minSdkVersion 15
         targetSdkVersion 28
-        versionCode 33
-        versionName "3.2"
+        versionCode 34
+        versionName "3.2.1"
     }
     buildTypes {
         release {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 81562b5..f7cd3df 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -35,6 +35,24 @@
   ~     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   -->
 
+<!--
+  ~     Copyright (C) 2017 Merbin J Anselm <merbinjanselm@gmail.com>
+  ~
+  ~     This program is free software; you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation; either version 2 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     This program is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License along
+  ~     with this program; if not, write to the Free Software Foundation, Inc.,
+  ~     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  -->
+
 <!--
   ~     Copyright (C) 2016  Merbin J Anselm <merbinjanselm@gmail.com>
   ~
@@ -125,6 +143,12 @@
                 <action android:name="android.intent.action.BOOT_COMPLETED"/>
             </intent-filter>
         </receiver>
+
+        <receiver android:name=".receiver.RockerReceiver">
+            <intent-filter>
+                <action android:name="android.intent.action.MEDIA_BUTTON" />
+            </intent-filter>
+        </receiver>
     </application>
 
 </manifest>
diff --git a/app/src/main/java/in/blogspot/anselmbros/torchie/main/TorchieManager.java b/app/src/main/java/in/blogspot/anselmbros/torchie/main/TorchieManager.java
index d127199..cbe1456 100644
--- a/app/src/main/java/in/blogspot/anselmbros/torchie/main/TorchieManager.java
+++ b/app/src/main/java/in/blogspot/anselmbros/torchie/main/TorchieManager.java
@@ -34,6 +34,24 @@
  *     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+/*
+ *     Copyright (C) 2017 Merbin J Anselm <merbinjanselm@gmail.com>
+ *
+ *     This program is free software; you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation; either version 2 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License along
+ *     with this program; if not, write to the Free Software Foundation, Inc.,
+ *     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 /*
  *     Copyright (C) 2016  Merbin J Anselm <merbinjanselm@gmail.com>
  *
@@ -199,6 +217,7 @@ private void onScreenOff() {
 
     private void onScreenLock() {
         DeviceManager.getInstance(this.mContext).setVolumeKeyDeviceEnabled(SettingsUtils.isScreenLockEnabled(this.mContext));
+        WakeLockManager.getInstance().release();
         if (isLegacyDevice()) {
             DeviceManager.getInstance(this.mContext).setVolumeKeyDeviceType(VolumeKeyRocker.TYPE);
             if (SettingsUtils.isScreenLockEnabled(this.mContext)) {
diff --git a/app/src/main/java/in/blogspot/anselmbros/torchie/main/manager/wakelock/WakeLock.java b/app/src/main/java/in/blogspot/anselmbros/torchie/main/manager/wakelock/WakeLock.java
index 97903c1..cf30168 100644
--- a/app/src/main/java/in/blogspot/anselmbros/torchie/main/manager/wakelock/WakeLock.java
+++ b/app/src/main/java/in/blogspot/anselmbros/torchie/main/manager/wakelock/WakeLock.java
@@ -34,6 +34,24 @@
  *     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+/*
+ *     Copyright (C) 2017 Merbin J Anselm <merbinjanselm@gmail.com>
+ *
+ *     This program is free software; you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation; either version 2 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License along
+ *     with this program; if not, write to the Free Software Foundation, Inc.,
+ *     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 /*
  *     Copyright (C) 2016  Merbin J Anselm <merbinjanselm@gmail.com>
  *
@@ -54,11 +72,15 @@
 
 package in.blogspot.anselmbros.torchie.main.manager.wakelock;
 
+import android.content.ComponentName;
 import android.content.Context;
 import android.support.v4.media.session.MediaSessionCompat;
 import android.support.v4.media.session.PlaybackStateCompat;
 
 import androidx.media.VolumeProviderCompat;
+
+import in.blogspot.anselmbros.torchie.receiver.RockerReceiver;
+
 /**
  * Created by Merbin J Anselm on 05-Feb-17.
  */
@@ -79,7 +101,8 @@ public WakeLock() {
     public void acquire(Context context, VolumeProviderCompat volumeProvider) {
         if (!this.isWakelockHeld && this.isEnabled) {
             if (this.mMediaSession == null) {
-                this.mMediaSession = new MediaSessionCompat(context, TYPE);
+                ComponentName mediaReceiver = new ComponentName(context, RockerReceiver.class.getName());
+                this.mMediaSession = new MediaSessionCompat(context, TYPE, mediaReceiver, null);
 
                 this.mMediaSession.setFlags(MediaSessionCompat.FLAG_HANDLES_MEDIA_BUTTONS |
                         MediaSessionCompat.FLAG_HANDLES_TRANSPORT_CONTROLS);
@@ -96,6 +119,7 @@ public void acquire(Context context, VolumeProviderCompat volumeProvider) {
     public void release() {
         if (this.isWakelockHeld && this.isEnabled) {
             if (this.mMediaSession != null) {
+                this.mMediaSession.setActive(false);
                 this.mMediaSession.release();
                 this.mMediaSession = null;
                 this.isWakelockHeld = false;
diff --git a/app/src/main/java/in/blogspot/anselmbros/torchie/receiver/RockerReceiver.java b/app/src/main/java/in/blogspot/anselmbros/torchie/receiver/RockerReceiver.java
new file mode 100644
index 0000000..e058970
--- /dev/null
+++ b/app/src/main/java/in/blogspot/anselmbros/torchie/receiver/RockerReceiver.java
@@ -0,0 +1,75 @@
+/*
+ *     Copyright (C) 2017 Merbin J Anselm <merbinjanselm@gmail.com>
+ *
+ *     This program is free software; you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation; either version 2 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License along
+ *     with this program; if not, write to the Free Software Foundation, Inc.,
+ *     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/*
+ *     Copyright (C) 2017 Merbin J Anselm <merbinjanselm@gmail.com>
+ *
+ *     This program is free software; you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation; either version 2 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License along
+ *     with this program; if not, write to the Free Software Foundation, Inc.,
+ *     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+package in.blogspot.anselmbros.torchie.receiver;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.view.KeyEvent;
+
+import in.blogspot.anselmbros.torchie.service.TorchieQuick;
+
+public class RockerReceiver extends BroadcastReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        if (Intent.ACTION_MEDIA_BUTTON.equals(intent.getAction())) {
+            final KeyEvent event = intent.getParcelableExtra(Intent.EXTRA_KEY_EVENT);
+            if (event != null && event.getAction() == KeyEvent.ACTION_DOWN) {
+                switch (event.getKeyCode()) {
+                    case KeyEvent.KEYCODE_VOLUME_UP:
+                        if (this.isTorchieQuickServiceRunning()) {
+                            TorchieQuick.getInstance().setVolumeValues(1);
+                        }
+                        break;
+                    case KeyEvent.KEYCODE_VOLUME_DOWN:
+                        if (this.isTorchieQuickServiceRunning()) {
+                            TorchieQuick.getInstance().setVolumeValues(-1);
+                        }
+                        break;
+                    default:
+                        if (this.isTorchieQuickServiceRunning()) {
+                            TorchieQuick.getInstance().setVolumeValues(0);
+                        }
+                }
+            }
+        }
+    }
+
+    private boolean isTorchieQuickServiceRunning() {
+        return TorchieQuick.getInstance() != null;
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/in/blogspot/anselmbros/torchie/service/TorchieQuick.java b/app/src/main/java/in/blogspot/anselmbros/torchie/service/TorchieQuick.java
index 8f96859..d5b4b5d 100644
--- a/app/src/main/java/in/blogspot/anselmbros/torchie/service/TorchieQuick.java
+++ b/app/src/main/java/in/blogspot/anselmbros/torchie/service/TorchieQuick.java
@@ -16,6 +16,24 @@
  *     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+/*
+ *     Copyright (C) 2017 Merbin J Anselm <merbinjanselm@gmail.com>
+ *
+ *     This program is free software; you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation; either version 2 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License along
+ *     with this program; if not, write to the Free Software Foundation, Inc.,
+ *     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 /*
  *     Copyright (C) 2016  Merbin J Anselm <merbinjanselm@gmail.com>
  *
@@ -143,7 +161,7 @@ public boolean onUnbind(Intent intent) {
     protected boolean onKeyEvent(KeyEvent event) {
         super.onKeyEvent(event);
         if ((event.getKeyCode() == KeyEvent.KEYCODE_VOLUME_DOWN) || (event.getKeyCode() == KeyEvent.KEYCODE_VOLUME_UP)) { //Filters ONLY the Volume Button key events
-            return TorchieManager.getInstance(this).setVolumeKeyEvent(new VolumeKeyEvent(event));
+            TorchieManager.getInstance(this).setVolumeKeyEvent(new VolumeKeyEvent(event));
         }
         return false;
     }