From e9fa2f5918797e80a05743f7a58f02bae908e280 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Mon, 7 Mar 2022 08:38:58 +0300 Subject: [PATCH] add getSource method --- .../activities/RecordingActivity.java | 14 +------------- .../audiorecorder/app/AudioApplication.java | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 13 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 c16c279..9dd57b7 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 @@ -928,19 +928,7 @@ public class RecordingActivity extends AppCompatThemeActivity { boolean startRecording() { try { - final SharedPreferences shared = PreferenceManager.getDefaultSharedPreferences(this); - String source = shared.getString(AudioApplication.PREFERENCE_SOURCE, AudioApplication.PREFERENCE_SOURCE_MIC); - int user; - 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(AudioApplication.PREFERENCE_SOURCE_INTERNAL)) { - user = Sound.SOURCE_INTERNAL_AUDIO; - } else { - user = MediaRecorder.AudioSource.MIC; - } + int user = AudioApplication.from(this).getSource(); if (user == Sound.SOURCE_INTERNAL_AUDIO && !recording.sound.permitted()) { Sound.showInternalAudio(this, RESULT_INTERNAL); return false; 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 f4140d7..892b009 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 @@ -5,6 +5,7 @@ import android.app.PendingIntent; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; +import android.media.MediaRecorder; import android.os.Build; import android.support.v7.preference.PreferenceManager; import android.util.Log; @@ -14,6 +15,7 @@ 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.app.Sound; import com.github.axet.audiolibrary.encoders.FormatFLAC; import com.github.axet.audiolibrary.encoders.FormatM4A; import com.github.axet.audiolibrary.encoders.FormatOGG; @@ -145,4 +147,21 @@ public class AudioApplication extends com.github.axet.audiolibrary.app.MainAppli edit.putInt(PREFERENCE_VERSION, 4); edit.commit(); } + + public int getSource() { + final SharedPreferences shared = android.preference.PreferenceManager.getDefaultSharedPreferences(this); + String source = shared.getString(AudioApplication.PREFERENCE_SOURCE, AudioApplication.PREFERENCE_SOURCE_MIC); + int user; + 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(AudioApplication.PREFERENCE_SOURCE_INTERNAL)) { + user = Sound.SOURCE_INTERNAL_AUDIO; + } else { + user = MediaRecorder.AudioSource.MIC; + } + return user; + } }