From 866370b7b1fecd247be67073e8c7811a7523c99d Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Sun, 30 Jun 2019 19:06:21 +0300 Subject: [PATCH 1/5] add more sort options --- .../activities/MainActivity.java | 29 ++++++++++--------- app/src/main/res/menu/menu_main.xml | 28 ++++++++++++++++-- 2 files changed, 40 insertions(+), 17 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 71bcb99..d848b98 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 @@ -178,27 +178,28 @@ public class MainActivity extends AppCompatThemeActivity { } }); + recordings.onCreateOptionsMenu(menu); + return true; } @Override public boolean onOptionsItemSelected(MenuItem item) { - int id = item.getItemId(); - - if (id == R.id.action_settings) { - startActivity(new Intent(this, SettingsActivity.class)); + if (recordings.onOptionsItemSelected(this, item)) return true; - } - if (id == R.id.action_about) { - AboutPreferenceCompat.showDialog(this, R.raw.about); - return true; - } - - if (id == R.id.action_show_folder) { - Intent intent = item.getIntent(); - startActivity(intent); - return true; + final SharedPreferences shared = PreferenceManager.getDefaultSharedPreferences(this); + switch (item.getItemId()) { + case R.id.action_settings: + startActivity(new Intent(this, SettingsActivity.class)); + return true; + case R.id.action_about: + AboutPreferenceCompat.showDialog(this, R.raw.about); + return true; + case R.id.action_show_folder: + Intent intent = item.getIntent(); + startActivity(intent); + return true; } return super.onOptionsItemSelected(item); diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml index 2fe9746..d43d689 100644 --- a/app/src/main/res/menu/menu_main.xml +++ b/app/src/main/res/menu/menu_main.xml @@ -5,22 +5,44 @@ + + + + + + + + + + From 8744b75c95d729dc2276d909119d4cf2340c710f Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Mon, 1 Jul 2019 22:15:02 +0300 Subject: [PATCH 2/5] cleanups --- .../audiorecorder/activities/MainActivity.java | 1 - .../activities/RecordingActivity.java | 3 +-- .../axet/audiorecorder/app/AudioApplication.java | 14 +++++++++++++- 3 files changed, 14 insertions(+), 4 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 d848b98..060080b 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 @@ -188,7 +188,6 @@ public class MainActivity extends AppCompatThemeActivity { if (recordings.onOptionsItemSelected(this, item)) return true; - final SharedPreferences shared = PreferenceManager.getDefaultSharedPreferences(this); switch (item.getItemId()) { case R.id.action_settings: startActivity(new Intent(this, SettingsActivity.class)); 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 c738a76..c93debd 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 @@ -506,9 +506,8 @@ public class RecordingActivity extends AppCompatThemeActivity { start = false; stopRecording(getString(R.string.recording_status_pause)); } - if (a != null && a.equals(ERROR)) { + if (a != null && a.equals(ERROR)) muted = new ErrorDialog(this, intent.getStringExtra("msg")).setTitle(intent.getStringExtra("title")).show(); - } } @Override diff --git a/app/src/main/java/com/github/axet/audiorecorder/app/AudioApplication.java b/app/src/main/java/com/github/axet/audiorecorder/app/AudioApplication.java index 12bd475..8475715 100644 --- a/app/src/main/java/com/github/axet/audiorecorder/app/AudioApplication.java +++ b/app/src/main/java/com/github/axet/audiorecorder/app/AudioApplication.java @@ -399,7 +399,7 @@ public class AudioApplication extends com.github.axet.audiolibrary.app.MainAppli else edit.putString(AudioApplication.PREFERENCE_ENCODING, FormatFLAC.EXT); } - edit.putInt(PREFERENCE_VERSION, 3); + edit.putInt(PREFERENCE_VERSION, 4); edit.commit(); break; case 0: @@ -412,6 +412,9 @@ public class AudioApplication extends com.github.axet.audiolibrary.app.MainAppli case 2: version_2_to_3(); break; + case 3: + version_3_to_4(); + break; } } @@ -468,4 +471,13 @@ public class AudioApplication extends com.github.axet.audiolibrary.app.MainAppli edit.putInt(PREFERENCE_VERSION, 3); edit.commit(); } + + @SuppressLint("RestrictedApi") + void version_3_to_4() { + SharedPreferences shared = PreferenceManager.getDefaultSharedPreferences(this); + SharedPreferences.Editor edit = shared.edit(); + edit.remove(PREFERENCE_SORT); + edit.putInt(PREFERENCE_VERSION, 4); + edit.commit(); + } } From dd01db48d8af4bd11c2e294f112f8cac4e447cb9 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Tue, 2 Jul 2019 23:05:04 +0300 Subject: [PATCH 3/5] fix possible null crash --- .../java/com/github/axet/audiorecorder/app/Recordings.java | 3 --- .../com/github/axet/audiorecorder/services/TileService.java | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/github/axet/audiorecorder/app/Recordings.java b/app/src/main/java/com/github/axet/audiorecorder/app/Recordings.java index 53ebb15..a4b54c4 100644 --- a/app/src/main/java/com/github/axet/audiorecorder/app/Recordings.java +++ b/app/src/main/java/com/github/axet/audiorecorder/app/Recordings.java @@ -5,14 +5,11 @@ import android.net.Uri; import android.support.v7.widget.RecyclerView; import android.util.Log; import android.view.View; -import android.widget.ListView; import android.widget.TextView; import com.github.axet.androidlibrary.widgets.ErrorDialog; import com.github.axet.audiorecorder.R; -import java.util.ArrayList; - public class Recordings extends com.github.axet.audiolibrary.app.Recordings { public View progressEmpty; public TextView progressText; diff --git a/app/src/main/java/com/github/axet/audiorecorder/services/TileService.java b/app/src/main/java/com/github/axet/audiorecorder/services/TileService.java index 37bc4c0..f6fc58b 100644 --- a/app/src/main/java/com/github/axet/audiorecorder/services/TileService.java +++ b/app/src/main/java/com/github/axet/audiorecorder/services/TileService.java @@ -38,6 +38,8 @@ public class TileService extends android.service.quicksettings.TileService { void updateTile() { Tile tile = getQsTile(); + if (tile == null) + return; // some broken devices has tile == null within onStartListening() if (AudioApplication.from(this).recording != null) { tile.setIcon(Icon.createWithResource(this, R.drawable.ic_stop_black_24dp)); tile.setLabel(getString(R.string.tile_stop_recording)); From 328a0a63d541a2da1348300fa3465471b75549a3 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Wed, 3 Jul 2019 21:13:26 +0300 Subject: [PATCH 4/5] update libs --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index ceaed27..e5dcc50 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -53,6 +53,6 @@ android { dependencies { testImplementation 'junit:junit:4.12' - implementation 'com.github.axet:android-audio-library:1.0.159' // implementation project(':android-audio-library') + implementation 'com.github.axet:android-audio-library:1.0.162' // implementation project(':android-audio-library') assets('com.google.android.exoplayer:exoplayer:2.7.3') { exclude group: 'com.android.support' } } From b31abf779d1c48747566cced1adbd6de1d6f10e8 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Wed, 3 Jul 2019 21:13:44 +0300 Subject: [PATCH 5/5] Bump version audiorecorder-3.3.0 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index e5dcc50..44e396d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { applicationId "com.github.axet.audiorecorder" minSdkVersion 9 targetSdkVersion 26 - versionCode 324 - versionName "3.2.66" + versionCode 325 + versionName "3.3.0" } signingConfigs { release {