From cf7556e8491c6ccbeb99afedc16c9106a4fd127b Mon Sep 17 00:00:00 2001
From: Anonymous Raccoon <32224410+AnonymusRaccoon@users.noreply.github.com>
Date: Thu, 27 Sep 2018 20:03:13 +0200
Subject: [PATCH] Release v2.0.

---
 MusicApp/Assets/Version.txt                      |  4 ++--
 MusicApp/Properties/AndroidManifest.xml          |  2 +-
 MusicApp/Resources/Portable Class/MusicPlayer.cs | 13 ++++++++++++-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/MusicApp/Assets/Version.txt b/MusicApp/Assets/Version.txt
index 2023a08..5f526e9 100644
--- a/MusicApp/Assets/Version.txt
+++ b/MusicApp/Assets/Version.txt
@@ -1,2 +1,2 @@
-Version: 1.9.0
-Link: https://github.com/AnonymusRaccoon/MusicApp/releases/download/1.9/MusicApp.v.1.9.apk
+Version: 2.0.0
+Link: https://github.com/AnonymusRaccoon/MusicApp/releases/download/2.0/MusicApp.v.2.0.apk
diff --git a/MusicApp/Properties/AndroidManifest.xml b/MusicApp/Properties/AndroidManifest.xml
index b495017..5a853ea 100644
--- a/MusicApp/Properties/AndroidManifest.xml
+++ b/MusicApp/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.musicapp.android" android:installLocation="preferExternal" android:versionCode="11" android:versionName="1.9">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.musicapp.android" android:installLocation="preferExternal" android:versionCode="12" android:versionName="2.0">
 	<uses-sdk android:minSdkVersion="21" />
 	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
diff --git a/MusicApp/Resources/Portable Class/MusicPlayer.cs b/MusicApp/Resources/Portable Class/MusicPlayer.cs
index 730a9da..c6a0d7d 100644
--- a/MusicApp/Resources/Portable Class/MusicPlayer.cs	
+++ b/MusicApp/Resources/Portable Class/MusicPlayer.cs	
@@ -43,6 +43,7 @@ namespace MusicApp.Resources.Portable_Class
         public MediaSessionCompat mediaSession;
         public AudioManager audioManager;
         public NotificationManager notificationManager;
+        private bool noisyRegistered;
         public static bool isRunning = false;
         public static string title;
         private static bool parsing = false;
@@ -169,6 +170,7 @@ namespace MusicApp.Resources.Portable_Class
                 noisyReceiver = new AudioStopper();
 
             RegisterReceiver(noisyReceiver, new IntentFilter(AudioManager.ActionAudioBecomingNoisy));
+            noisyRegistered = true;
         }
 
         public void ChangeVolume(float volume)
@@ -1092,7 +1094,11 @@ namespace MusicApp.Resources.Portable_Class
                 player.PlayWhenReady = false;
                 StopForeground(false);
 
-                UnregisterReceiver(noisyReceiver);
+                if (!ShouldResumePlayback)
+                {
+                    UnregisterReceiver(noisyReceiver);
+                    noisyRegistered = false;
+                }
 
                 FrameLayout smallPlayer = MainActivity.instance.FindViewById<FrameLayout>(Resource.Id.smallPlayer);
                 smallPlayer.FindViewById<ImageButton>(Resource.Id.spPlay).SetImageResource(Resource.Drawable.ic_play_arrow_black_24dp);
@@ -1122,6 +1128,7 @@ namespace MusicApp.Resources.Portable_Class
                     noisyReceiver = new AudioStopper();
 
                 RegisterReceiver(noisyReceiver, new IntentFilter(AudioManager.ActionAudioBecomingNoisy));
+                noisyRegistered = true;
 
                 FrameLayout smallPlayer = MainActivity.instance.FindViewById<FrameLayout>(Resource.Id.smallPlayer);
                 smallPlayer.FindViewById<ImageButton>(Resource.Id.spPlay).SetImageResource(Resource.Drawable.ic_pause_black_24dp);
@@ -1179,6 +1186,10 @@ namespace MusicApp.Resources.Portable_Class
 
         public void Stop()
         {
+            if(noisyRegistered)
+                UnregisterReceiver(noisyReceiver);
+
+            noisyRegistered = false;
             isRunning = false;
             title = null;
             parsing = false;