From d66ce336ca8778a753e8ea10812be62840a3fe7d Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Tue, 1 Mar 2022 17:03:59 +0300 Subject: [PATCH] add Prefs --- .../axet/audiorecorder/activities/RecordingActivity.java | 6 +++--- .../com/github/axet/audiorecorder/app/AudioApplication.java | 5 +++++ .../axet/audiorecorder/services/BluetoothReceiver.java | 2 +- .../widgets/RecordingSourcePreferenceCompat.java | 4 ++-- 4 files changed, 11 insertions(+), 6 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 ed454d5..c16c279 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 @@ -929,14 +929,14 @@ public class RecordingActivity extends AppCompatThemeActivity { boolean startRecording() { try { final SharedPreferences shared = PreferenceManager.getDefaultSharedPreferences(this); - String source = shared.getString(AudioApplication.PREFERENCE_SOURCE, getString(R.string.source_mic)); + String source = shared.getString(AudioApplication.PREFERENCE_SOURCE, AudioApplication.PREFERENCE_SOURCE_MIC); int user; - if (source.equals(getString(R.string.source_raw))) { + if (source.equals(AudioApplication.PREFERENCE_SOURCE_RAW)) { if (Sound.isUnprocessedSupported(this)) user = MediaRecorder.AudioSource.UNPROCESSED; else user = MediaRecorder.AudioSource.VOICE_RECOGNITION; - } else if (source.equals(this.getString(R.string.source_internal))) { + } else if (source.equals(AudioApplication.PREFERENCE_SOURCE_INTERNAL)) { user = Sound.SOURCE_INTERNAL_AUDIO; } else { user = MediaRecorder.AudioSource.MIC; 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 f466a44..f4140d7 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 @@ -11,6 +11,7 @@ import android.util.Log; import android.view.View; import com.github.axet.androidlibrary.app.NotificationManagerCompat; +import com.github.axet.androidlibrary.app.Prefs; import com.github.axet.androidlibrary.widgets.NotificationChannelCompat; import com.github.axet.androidlibrary.widgets.RemoteNotificationCompat; import com.github.axet.audiolibrary.encoders.FormatFLAC; @@ -26,6 +27,10 @@ public class AudioApplication extends com.github.axet.audiolibrary.app.MainAppli public static final String PREFERENCE_TARGET = "target"; public static final String PREFERENCE_FLY = "fly"; public static final String PREFERENCE_SOURCE = "bluetooth"; + public static final String PREFERENCE_SOURCE_MIC = Prefs.PrefString(R.string.source_mic); + public static final String PREFERENCE_SOURCE_BLUETOOTH = Prefs.PrefString(R.string.source_bluetooth); + public static final String PREFERENCE_SOURCE_RAW = Prefs.PrefString(R.string.source_raw); + public static final String PREFERENCE_SOURCE_INTERNAL = Prefs.PrefString(R.string.source_internal); public static final String PREFERENCE_VERSION = "version"; diff --git a/app/src/main/java/com/github/axet/audiorecorder/services/BluetoothReceiver.java b/app/src/main/java/com/github/axet/audiorecorder/services/BluetoothReceiver.java index ac4c380..c2e6b76 100644 --- a/app/src/main/java/com/github/axet/audiorecorder/services/BluetoothReceiver.java +++ b/app/src/main/java/com/github/axet/audiorecorder/services/BluetoothReceiver.java @@ -139,7 +139,7 @@ public class BluetoothReceiver extends BroadcastReceiver { public boolean isRecordingReady() { final SharedPreferences shared = PreferenceManager.getDefaultSharedPreferences(context); - if (shared.getString(AudioApplication.PREFERENCE_SOURCE, context.getString(R.string.source_mic)).equals(context.getString(R.string.source_bluetooth))) { + if (shared.getString(AudioApplication.PREFERENCE_SOURCE, AudioApplication.PREFERENCE_SOURCE_MIC).equals(AudioApplication.PREFERENCE_SOURCE_BLUETOOTH)) { bluetoothSource = true; if (!startBluetooth()) return false; diff --git a/app/src/main/java/com/github/axet/audiorecorder/widgets/RecordingSourcePreferenceCompat.java b/app/src/main/java/com/github/axet/audiorecorder/widgets/RecordingSourcePreferenceCompat.java index 60c571c..998b0d3 100644 --- a/app/src/main/java/com/github/axet/audiorecorder/widgets/RecordingSourcePreferenceCompat.java +++ b/app/src/main/java/com/github/axet/audiorecorder/widgets/RecordingSourcePreferenceCompat.java @@ -55,8 +55,8 @@ public class RecordingSourcePreferenceCompat extends ListPreference { CharSequence[] values = getEntryValues(); ArrayList tt = new ArrayList<>(); ArrayList vv = new ArrayList<>(); - String raw = getContext().getString(R.string.source_raw); - String internal = getContext().getString(R.string.source_internal); + String raw = AudioApplication.PREFERENCE_SOURCE_RAW; + String internal = AudioApplication.PREFERENCE_SOURCE_INTERNAL; for (int i = 0; i < values.length; i++) { String v = values[i].toString(); String t = text[i].toString();