bitPickups/android-audio-recorder
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'audiorecorder-3.0.33'

Browse source
This commit is contained in:
Alexey Kuznetsov 2017-08-10 16:36:33 +03:00
commit 3ec05448ee
2 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/build.gradle
View file

@ -8,8 +8,8 @@ android {
applicationId "com.github.axet.audiorecorder"
minSdkVersion 9
targetSdkVersion 23
versionCode 197
versionName "3.0.32"
versionCode 198
versionName "3.0.33"
}
signingConfigs {
release {
@ -43,5 +43,5 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12'
compile 'com.github.axet:android-audio-library:1.0.30' // compile project(':android-audio-library')
compile 'com.github.axet:android-audio-library:1.0.31' // compile project(':android-audio-library')
}

13
app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java
View file

@ -867,29 +867,32 @@ public class RecordingActivity extends AppCompatActivity {
encoder = new FileEncoder(this, in, e);
RecordingService.startService(this, storage.getDocumentName(targetUri), thread != null, encoder != null);
RecordingService.startService(this, Storage.getDocumentName(targetUri), thread != null, encoder != null);
final ProgressDialog d = new ProgressDialog(this);
d.setTitle(R.string.encoding_title);
d.setMessage(".../" + storage.getDocumentName(targetUri));
d.setMessage(".../" + Storage.getDocumentName(targetUri));
d.setMax(100);
d.setCancelable(false);
d.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
d.setIndeterminate(false);
d.show();
final Runnable suc = new Runnable() {
final Runnable save = new Runnable() {
@Override
public void run() {
if (Build.VERSION.SDK_INT >= 21 && s.startsWith(ContentResolver.SCHEME_CONTENT)) { // for non SCHEME we write dirrectlry to storage
ContentResolver resolver = getContentResolver();
try {
Uri root = Storage.getDocumentTreeUri(targetUri);
resolver.takePersistableUriPermission(root, Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
String d = Storage.getDocumentName(targetUri);
String ee = storage.getExt(targetUri);
Uri docUri = DocumentsContract.buildDocumentUriUsingTree(targetUri, DocumentsContract.getTreeDocumentId(targetUri));
String mime = MimeTypeMap.getSingleton().getMimeTypeFromExtension(ee);
Uri childrenUri = DocumentsContract.createDocument(resolver, docUri, mime, d);
if (childrenUri == null)
throw new IOException("unable to create document " + d);
InputStream is = new FileInputStream(out);
OutputStream os = resolver.openOutputStream(childrenUri);
IOUtils.copy(is, os);
@ -934,7 +937,7 @@ public class RecordingActivity extends AppCompatActivity {
}, new Runnable() {
@Override
public void run() { // success
Thread thread = new Thread(suc); // network on main thread for SAF network
Thread thread = new Thread(save); // network on main thread for SAF network
thread.start();
}
}, new Runnable() {