fix Uri.parse NPE in notifier

Closes #3241
// FREEBIE
pull/1/head
Jake McGinty 9 years ago committed by Moxie Marlinspike
parent a3007c5906
commit fca98c42d5

@ -76,6 +76,7 @@ import me.leolin.shortcutbadger.ShortcutBadger;
*/
public class MessageNotifier {
private static final String TAG = MessageNotifier.class.getSimpleName();
public static final int NOTIFICATION_ID = 1338;
@ -300,10 +301,18 @@ public class MessageNotifier {
String ringtone = TextSecurePreferences.getNotificationRingtone(context);
if (ringtone == null)
if (ringtone == null) {
Log.w(TAG, "ringtone preference was null.");
return;
}
Uri uri = Uri.parse(ringtone);
if (uri == null) {
Log.w(TAG, "couldn't parse ringtone uri " + ringtone);
return;
}
Uri uri = Uri.parse(ringtone);
MediaPlayer player = new MediaPlayer();
player.setAudioStreamType(AudioManager.STREAM_NOTIFICATION);
player.setDataSource(context, uri);

Loading…
Cancel
Save