From 384fb0e7a205df3f1fc4fcdeadb167b69de13504 Mon Sep 17 00:00:00 2001 From: Olga Miller Date: Thu, 25 Jun 2020 22:30:35 +0200 Subject: [PATCH] WaveFileOutputContext: Moved ContentResolver.insert for Version=Q) --- .../Output/WaveFileOutputContext.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/om/sstvencoder/Output/WaveFileOutputContext.java b/app/src/main/java/om/sstvencoder/Output/WaveFileOutputContext.java index 74a4a96..d9de0e6 100644 --- a/app/src/main/java/om/sstvencoder/Output/WaveFileOutputContext.java +++ b/app/src/main/java/om/sstvencoder/Output/WaveFileOutputContext.java @@ -72,22 +72,24 @@ public class WaveFileOutputContext { } } else { mFile = new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MUSIC), mFileName); - mValues.put(MediaStore.Audio.Media.DATA, mFile.toString()); mValues.put(MediaStore.Audio.Media.TITLE, mFileName); mValues.put(MediaStore.Audio.Media.IS_MUSIC, true); - mUri = MediaStore.Audio.Media.getContentUriForPath(mFile.getAbsolutePath()); - if (mUri != null) - mContentResolver.insert(mUri, mValues); } return mUri != null; } public void clear() { - if (mUri != null && mValues != null) { - mValues.clear(); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + if (mUri != null && mValues != null) { + mValues.clear(); mValues.put(MediaStore.Audio.Media.IS_PENDING, 0); - mContentResolver.update(mUri, mValues, null, null); + mContentResolver.update(mUri, mValues, null, null); + } + } else { + if (mFile != null && mValues != null) { + mValues.put(MediaStore.Audio.Media.DATA, mFile.toString()); + mUri = mContentResolver.insert(MediaStore.Audio.Media.getContentUriForPath(mFile.getAbsolutePath()), mValues); + } } }