From e3a9e6f8d8aeae290a24cd22f8b1f3ac251c3400 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Tue, 15 Aug 2017 15:24:48 +0300 Subject: [PATCH 1/2] fix url crash --- app/build.gradle | 2 +- .../activities/RecordingActivity.java | 16 ++-------------- .../audiorecorder/services/RecordingService.java | 8 ++++---- 3 files changed, 7 insertions(+), 19 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a603652..35c967a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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.31' // compile project(':android-audio-library') + compile 'com.github.axet:android-audio-library:1.0.33' // compile project(':android-audio-library') } 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 cf290df..f9e754e 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 @@ -886,20 +886,8 @@ public class RecordingActivity extends AppCompatActivity { 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); - is.close(); - os.close(); - Storage.delete(out); // delete tmp encoding file - } catch (IOException e) { + storage.move(out, root, Storage.getDocumentPath(targetUri)); + } catch (RuntimeException e) { Storage.delete(out); // delete tmp encoding file try { storage.delete(targetUri); // delete SAF encoding file diff --git a/app/src/main/java/com/github/axet/audiorecorder/services/RecordingService.java b/app/src/main/java/com/github/axet/audiorecorder/services/RecordingService.java index 56307bf..ca6fd78 100644 --- a/app/src/main/java/com/github/axet/audiorecorder/services/RecordingService.java +++ b/app/src/main/java/com/github/axet/audiorecorder/services/RecordingService.java @@ -61,11 +61,11 @@ public class RecordingService extends Service { final SharedPreferences shared = PreferenceManager.getDefaultSharedPreferences(context); String f = shared.getString(MainApplication.PREFERENCE_TARGET, ""); String d; - Uri u = Uri.parse(f); - String s = u.getScheme(); - if (s.equals(ContentResolver.SCHEME_CONTENT)) { + if (f.startsWith(ContentResolver.SCHEME_CONTENT)) { + Uri u = Uri.parse(f); d = Storage.getDocumentName(u); - } else if (s.equals(ContentResolver.SCHEME_FILE)) { + } else if (f.startsWith(ContentResolver.SCHEME_FILE)) { + Uri u = Uri.parse(f); File file = new File(u.getPath()); d = file.getName(); } else { From 2106e9493538aee264c01722f39abdf7ef5f16c5 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Tue, 15 Aug 2017 15:24:53 +0300 Subject: [PATCH 2/2] Bump version audiorecorder-3.0.35 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 35c967a..6667d93 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "com.github.axet.audiorecorder" minSdkVersion 9 targetSdkVersion 23 - versionCode 199 - versionName "3.0.34" + versionCode 200 + versionName "3.0.35" } signingConfigs { release {