From a82d52a8544a7dd55a8ee69df2134ca75c43624d Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Wed, 17 May 2017 22:03:14 +0200 Subject: work around for brokens ROMs that expose file uris as notification sound --- .../pixart/messenger/services/NotificationService.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'src/main/java/de/pixart/messenger/services') diff --git a/src/main/java/de/pixart/messenger/services/NotificationService.java b/src/main/java/de/pixart/messenger/services/NotificationService.java index e351bbb89..917bc9c30 100644 --- a/src/main/java/de/pixart/messenger/services/NotificationService.java +++ b/src/main/java/de/pixart/messenger/services/NotificationService.java @@ -22,6 +22,7 @@ import android.util.DisplayMetrics; import android.util.Log; import android.util.Pair; +import java.io.File; import java.io.FileNotFoundException; import java.util.ArrayList; import java.util.Calendar; @@ -40,6 +41,7 @@ import de.pixart.messenger.entities.Account; import de.pixart.messenger.entities.Contact; import de.pixart.messenger.entities.Conversation; import de.pixart.messenger.entities.Message; +import de.pixart.messenger.persistance.FileBackend; import de.pixart.messenger.ui.ConversationActivity; import de.pixart.messenger.ui.EditAccountActivity; import de.pixart.messenger.ui.ManageAccountActivity; @@ -300,7 +302,12 @@ public class NotificationService { mBuilder.setVibrate(new long[]{0}); } if (ringtone != null) { - mBuilder.setSound(Uri.parse(ringtone)); + Uri uri = Uri.parse(ringtone); + try { + mBuilder.setSound(fixRingtoneUri(uri)); + } catch (SecurityException e) { + Log.d(Config.LOGTAG, "unable to use custom notification sound " + uri.toString()); + } } } if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { @@ -314,6 +321,14 @@ public class NotificationService { } } + private Uri fixRingtoneUri(Uri uri) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && "file".equals(uri.getScheme())) { + return FileBackend.getUriForFile(mXmppConnectionService, new File(uri.getPath())); + } else { + return uri; + } + } + private Builder buildMultipleConversation() { final Builder mBuilder = new NotificationCompat.Builder( mXmppConnectionService); -- cgit v1.2.3