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

WaveFileOutputContext: Moved content of init-method into constuctor, 

create mFile for Version>=Q only if deleteFile-method is called
pull/3/head
Olga Miller 2020-06-25 22:45:35 +02:00
rodzic 7de496bb69
commit e0ca7e9eff
1 zmienionych plików z 14 dodań i 25 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -36,6 +36,11 @@ public class WaveFileOutputContext {
public WaveFileOutputContext(ContentResolver contentResolver, String fileName) {
mContentResolver = contentResolver;
mFileName = fileName;
mValues = getContentValues(fileName);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
mUri = mContentResolver.insert(MediaStore.Audio.Media.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY), mValues);
else
mFile = new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MUSIC), mFileName);
}
public String getFileName() {
@ -43,33 +48,16 @@ public class WaveFileOutputContext {
}
public OutputStream createWaveOutputStream() {
if (init()) {
try {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
return mContentResolver.openOutputStream(mUri);
else
return new FileOutputStream(mFile);
} catch (Exception ignore) {
}
try {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
return mContentResolver.openOutputStream(mUri);
else
return new FileOutputStream(mFile);
} catch (Exception ignore) {
}
return null;
}
private boolean init() {
mValues = getContentValues(mFileName);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
mUri = mContentResolver.insert(MediaStore.Audio.Media.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY), mValues);
if (mUri != null) {
String path = mUri.getPath();
if (path != null)
mFile = new File(path);
}
} else {
mFile = new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MUSIC), mFileName);
}
return mUri != null;
}
private ContentValues getContentValues(String fileName) {
ContentValues values = new ContentValues();
values.put(MediaStore.Audio.Media.MIME_TYPE, "audio/wav");
@ -102,8 +90,9 @@ public class WaveFileOutputContext {
public void deleteFile() {
try {
if (mFile != null)
mFile.delete();
if (mFile == null)
mFile = new File(mUri.getPath());
mFile.delete();
} catch (Exception ignore) {
}
}