From 34e9e8e7a12c90ec9c512dad48b2f212a2c2a99d Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Tue, 27 Mar 2018 17:17:18 +0200 Subject: [PATCH] Fixed picking file from download on Samsung s8 with Oreo --- src/android/org/linphone/LinphoneUtils.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/android/org/linphone/LinphoneUtils.java b/src/android/org/linphone/LinphoneUtils.java index 11b038af2..b924f1fd8 100644 --- a/src/android/org/linphone/LinphoneUtils.java +++ b/src/android/org/linphone/LinphoneUtils.java @@ -756,10 +756,16 @@ public final class LinphoneUtils { else if ("com.android.providers.downloads.documents".equals(uri.getAuthority())) { final String id = DocumentsContract.getDocumentId(uri); - final Uri contentUri = ContentUris.withAppendedId( - Uri.parse("content://downloads/public_downloads"), Long.valueOf(id)); + try { + final Uri contentUri = ContentUris.withAppendedId( + Uri.parse("content://downloads/public_downloads"), Long.valueOf(id)); - return getDataColumn(context, contentUri, null, null); + return getDataColumn(context, contentUri, null, null); + } catch (NumberFormatException nfe) { + if (id.startsWith("raw:")) { + return id.substring(4); + } + } } // MediaProvider else if ("com.android.providers.media.documents".equals(uri.getAuthority())) {