From 19801aa98fa143df87b60d90d0690b82f45d1188 Mon Sep 17 00:00:00 2001
From: Alexey Kuznetsov <axet@me.com>
Date: Thu, 8 Mar 2018 17:09:26 +0300
Subject: [PATCH 1/2] fix lock screen conrols

---
 .../audiorecorder/activities/MainActivity.java     | 14 +++++++++++---
 .../activities/RecordingActivity.java              | 12 ++++++++++--
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/github/axet/audiorecorder/activities/MainActivity.java b/app/src/main/java/com/github/axet/audiorecorder/activities/MainActivity.java
index c6a0393..286c72d 100644
--- a/app/src/main/java/com/github/axet/audiorecorder/activities/MainActivity.java
+++ b/app/src/main/java/com/github/axet/audiorecorder/activities/MainActivity.java
@@ -63,7 +63,8 @@ public class MainActivity extends AppCompatThemeActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        showLocked(getWindow());
+        final SharedPreferences shared = PreferenceManager.getDefaultSharedPreferences(this);
+
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
 
         setContentView(R.layout.activity_main);
@@ -81,6 +82,7 @@ public class MainActivity extends AppCompatThemeActivity {
             @Override
             public void onClick(View view) {
                 recordings.select(-1);
+                finish();
                 RecordingActivity.startActivity(MainActivity.this, false);
             }
         });
@@ -100,7 +102,6 @@ public class MainActivity extends AppCompatThemeActivity {
 
         RecordingService.startIfPending(this);
 
-        final SharedPreferences shared = PreferenceManager.getDefaultSharedPreferences(this);
         receiver = new ScreenReceiver() {
             @Override
             public void onReceive(Context context, Intent intent) {
@@ -116,6 +117,7 @@ public class MainActivity extends AppCompatThemeActivity {
 
     void checkPending() {
         if (storage.recordingPending()) {
+            finish();
             RecordingActivity.startActivity(MainActivity.this, true);
             return;
         }
@@ -192,6 +194,13 @@ public class MainActivity extends AppCompatThemeActivity {
         super.onResume();
         Log.d(TAG, "onResume");
 
+        final SharedPreferences shared = PreferenceManager.getDefaultSharedPreferences(this);
+
+        if (shared.getBoolean(MainApplication.PREFERENCE_CONTROLS, false))
+            showLocked(getWindow());
+        else
+            getWindow().clearFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
+
         invalidateOptionsMenu(); // update storage folder intent
 
         try {
@@ -200,7 +209,6 @@ public class MainActivity extends AppCompatThemeActivity {
             Error(e);
         }
 
-        final SharedPreferences shared = PreferenceManager.getDefaultSharedPreferences(this);
         final String last = shared.getString(MainApplication.PREFERENCE_LAST, "");
         Runnable done = new Runnable() {
             @Override
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 fdc88cb..a091f4b 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
@@ -110,6 +110,7 @@ public class RecordingActivity extends AppCompatThemeActivity {
     Storage storage;
     Sound sound;
     RecordingReceiver receiver;
+    ScreenReceiver screen;
     Handler handler = new Handler();
 
     ShortBuffer dbBuffer = null;
@@ -201,8 +202,7 @@ public class RecordingActivity extends AppCompatThemeActivity {
         super.onCreate(savedInstanceState);
 
         showLocked(getWindow());
-        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON |
-                WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
 
         setContentView(R.layout.activity_recording);
 
@@ -220,6 +220,9 @@ public class RecordingActivity extends AppCompatThemeActivity {
         samplesUpdate = (int) (pitch.getPitchTime() * sampleRate / 1000.0);
         samplesUpdateStereo = samplesUpdate * Sound.getChannels(this);
 
+        screen = new ScreenReceiver();
+        screen.registerReceiver(this);
+
         receiver = new RecordingReceiver();
         receiver.filter.addAction(PAUSE_BUTTON);
         receiver.filter.addAction(ACTION_FINISH_RECORDING);
@@ -668,6 +671,11 @@ public class RecordingActivity extends AppCompatThemeActivity {
         receiver.stopBluetooth();
         headset(false, false);
 
+        if (screen != null) {
+            screen.close();
+            screen = null;
+        }
+
         if (receiver != null) {
             receiver.close();
             receiver = null;

From b300703bbc1b1c81e02a635528853287bbd2dbae Mon Sep 17 00:00:00 2001
From: Alexey Kuznetsov <axet@me.com>
Date: Thu, 8 Mar 2018 17:09:33 +0300
Subject: [PATCH 2/2] Bump version audiorecorder-3.1.22

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

diff --git a/app/build.gradle b/app/build.gradle
index df54807..f1dfa17 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "com.github.axet.audiorecorder"
         minSdkVersion 9
         targetSdkVersion 23 // 24+ file:// unable to open
-        versionCode 252
-        versionName "3.1.21"
+        versionCode 253
+        versionName "3.1.22"
     }
     signingConfigs {
         release {