From 5f56b1c9b29b16619b59e952ebd440b3308f1afa Mon Sep 17 00:00:00 2001
From: Alexey Kuznetsov <axet@me.com>
Date: Mon, 30 Dec 2019 18:24:11 +0300
Subject: [PATCH 1/2] cleanups

---
 .../activities/RecordingActivity.java         | 38 ++++++++-----------
 build.gradle                                  |  2 +-
 2 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java b/app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java
index 68cb292..3432d08 100644
--- a/app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java
+++ b/app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java
@@ -3,7 +3,6 @@ package com.github.axet.audiorecorder.activities;
 import android.Manifest;
 import android.app.Activity;
 import android.app.ProgressDialog;
-import android.content.ComponentName;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -18,9 +17,6 @@ import android.os.Handler;
 import android.os.Message;
 import android.preference.PreferenceManager;
 import android.provider.MediaStore;
-import android.support.v4.media.session.MediaButtonReceiver;
-import android.support.v4.media.session.MediaSessionCompat;
-import android.support.v4.media.session.PlaybackStateCompat;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.view.WindowCallbackWrapper;
 import android.telephony.PhoneStateListener;
@@ -42,6 +38,7 @@ import com.github.axet.androidlibrary.animations.MarginBottomAnimation;
 import com.github.axet.androidlibrary.services.FileProvider;
 import com.github.axet.androidlibrary.services.StorageProvider;
 import com.github.axet.androidlibrary.sound.AudioTrack;
+import com.github.axet.androidlibrary.sound.Headset;
 import com.github.axet.androidlibrary.widgets.ErrorDialog;
 import com.github.axet.androidlibrary.widgets.OpenFileDialog;
 import com.github.axet.androidlibrary.widgets.PopupWindowCompat;
@@ -85,7 +82,7 @@ public class RecordingActivity extends AppCompatThemeActivity {
 
     PhoneStateChangeListener pscl = new PhoneStateChangeListener();
     FileEncoder encoder;
-    MediaSessionCompat msc;
+    Headset headset;
     Intent recordSoundIntent = null;
 
     boolean start = true; // do we need to start recording immidiatly?
@@ -293,7 +290,7 @@ public class RecordingActivity extends AppCompatThemeActivity {
                 done.performClick();
                 return;
             }
-            MediaButtonReceiver.handleIntent(msc, intent);
+            Headset.handleIntent(headset, intent);
         }
     }
 
@@ -1077,10 +1074,12 @@ public class RecordingActivity extends AppCompatThemeActivity {
 
     public void headset(boolean b, final boolean recording) {
         if (b) {
-            if (msc == null) {
-                Log.d(TAG, "headset mediabutton on");
-                msc = new MediaSessionCompat(this, TAG, new ComponentName(this, RecordingActivity.RecordingReceiver.class), null);
-                msc.setCallback(new MediaSessionCompat.Callback() {
+            if (headset == null) {
+                headset = new Headset() {
+                    {
+                        actions = Headset.ACTIONS_MAIN;
+                    }
+
                     @Override
                     public void onPlay() {
                         pauseButton();
@@ -1095,21 +1094,14 @@ public class RecordingActivity extends AppCompatThemeActivity {
                     public void onStop() {
                         pauseButton();
                     }
-                });
-                msc.setFlags(MediaSessionCompat.FLAG_HANDLES_MEDIA_BUTTONS | MediaSessionCompat.FLAG_HANDLES_QUEUE_COMMANDS | MediaSessionCompat.FLAG_HANDLES_TRANSPORT_CONTROLS);
-                msc.setActive(true);
-                msc.setPlaybackState(new PlaybackStateCompat.Builder().setState(PlaybackStateCompat.STATE_PLAYING, 0, 1).build()); // bug, when after device reboots we have to set playing state to 'playing' to make mediabutton work
+                };
+                headset.create(this, RecordingActivity.RecordingReceiver.class);
             }
-            PlaybackStateCompat.Builder builder = new PlaybackStateCompat.Builder()
-                    .setActions(PlaybackStateCompat.ACTION_PLAY | PlaybackStateCompat.ACTION_PAUSE | PlaybackStateCompat.ACTION_PLAY_PAUSE |
-                            PlaybackStateCompat.ACTION_STOP)
-                    .setState(recording ? PlaybackStateCompat.STATE_PLAYING : PlaybackStateCompat.STATE_PAUSED, 0, 1);
-            msc.setPlaybackState(builder.build());
+            headset.setState(recording);
         } else {
-            if (msc != null) {
-                Log.d(TAG, "headset mediabutton off");
-                msc.release();
-                msc = null;
+            if (headset != null) {
+                headset.close();
+                headset = null;
             }
         }
     }
diff --git a/build.gradle b/build.gradle
index 772747b..ba75821 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.2'
+        classpath 'com.android.tools.build:gradle:3.5.3'
         classpath 'com.github.axet:gradle-android-dx:0.0.4'
     }
 }

From 1c349356f88296b7d1ff34ccaeecacfa39ab6e30 Mon Sep 17 00:00:00 2001
From: Alexey Kuznetsov <axet@me.com>
Date: Fri, 6 Mar 2020 10:39:27 +0300
Subject: [PATCH 2/2] Bump version audiorecorder-3.3.12

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 7c0c9db..e624480 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "com.github.axet.audiorecorder"
         minSdkVersion 9
         targetSdkVersion 28
-        versionCode 336
-        versionName "3.3.11"
+        versionCode  337
+        versionName  "3.3.12"
     }
     signingConfigs {
         release {