mirror
/
SSTVEncoder2
kopia lustrzana https://github.com/olgamiller/SSTVEncoder2
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

WaveFileOutputContext: Moved creation of ContentValues into a separate method, 

moved MediaStore.Audio.Media.ALBUM to Version<Q
pull/3/head
Olga Miller 2020-06-25 22:38:29 +02:00
rodzic 384fb0e7a2
commit 7de496bb69
1 zmienionych plików z 16 dodań i 9 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

25
app/src/main/java/om/sstvencoder/Output/WaveFileOutputContext.java
Wyświetl plik

@ -56,14 +56,8 @@ public class WaveFileOutputContext {
} }
private boolean init() { private boolean init() {
String album = "SSTV Encoder"; mValues = getContentValues(mFileName);
mValues = new ContentValues();
mValues.put(MediaStore.Audio.Media.ALBUM, album);
mValues.put(MediaStore.Audio.Media.MIME_TYPE, "audio/wav");
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
mValues.put(MediaStore.Audio.Media.DISPLAY_NAME, mFileName);
mValues.put(MediaStore.Audio.Media.RELATIVE_PATH, (new File(Environment.DIRECTORY_MUSIC, album)).getPath());
mValues.put(MediaStore.Audio.Media.IS_PENDING, 1);
mUri = mContentResolver.insert(MediaStore.Audio.Media.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY), mValues); mUri = mContentResolver.insert(MediaStore.Audio.Media.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY), mValues);
if (mUri != null) { if (mUri != null) {
String path = mUri.getPath(); String path = mUri.getPath();
@ -72,12 +66,25 @@ public class WaveFileOutputContext {
} }
} else { } else {
mFile = new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MUSIC), mFileName); mFile = new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MUSIC), mFileName);
mValues.put(MediaStore.Audio.Media.TITLE, mFileName);
mValues.put(MediaStore.Audio.Media.IS_MUSIC, true);
} }
return mUri != null; return mUri != null;
} }
private ContentValues getContentValues(String fileName) {
ContentValues values = new ContentValues();
values.put(MediaStore.Audio.Media.MIME_TYPE, "audio/wav");
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
values.put(MediaStore.Audio.Media.DISPLAY_NAME, fileName);
values.put(MediaStore.Audio.Media.RELATIVE_PATH, (new File(Environment.DIRECTORY_MUSIC, "SSTV Encoder")).getPath());
values.put(MediaStore.Audio.Media.IS_PENDING, 1);
} else {
values.put(MediaStore.Audio.Media.ALBUM, "SSTV Encoder");
values.put(MediaStore.Audio.Media.TITLE, fileName);
values.put(MediaStore.Audio.Media.IS_MUSIC, true);
}
return values;
}
public void clear() { public void clear() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
if (mUri != null && mValues != null) { if (mUri != null && mValues != null) {