mirror of https://github.com/M66B/FairEmail.git
Prevent crash
This commit is contained in:
parent
ac65abebb2
commit
c440309c78
|
@ -1675,11 +1675,10 @@ class Core {
|
||||||
if (light)
|
if (light)
|
||||||
builder.setLights(Color.GREEN, 1000, 1000);
|
builder.setLights(Color.GREEN, 1000, 1000);
|
||||||
|
|
||||||
if (sound == null) {
|
Uri uri = (sound == null ? null : Uri.parse(sound));
|
||||||
Uri uri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION);
|
if (uri == null || "file".equals(uri.getScheme()))
|
||||||
builder.setSound(uri);
|
uri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION);
|
||||||
} else
|
builder.setSound(uri);
|
||||||
builder.setSound(Uri.parse(sound));
|
|
||||||
|
|
||||||
builder.setOnlyAlertOnce(true);
|
builder.setOnlyAlertOnce(true);
|
||||||
} else
|
} else
|
||||||
|
|
|
@ -828,6 +828,8 @@ public class FragmentOptions extends FragmentBase implements SharedPreferences.O
|
||||||
if (resultCode == RESULT_OK) {
|
if (resultCode == RESULT_OK) {
|
||||||
Uri uri = data.getParcelableExtra(RingtoneManager.EXTRA_RINGTONE_PICKED_URI);
|
Uri uri = data.getParcelableExtra(RingtoneManager.EXTRA_RINGTONE_PICKED_URI);
|
||||||
Log.i("Selected ringtone=" + uri);
|
Log.i("Selected ringtone=" + uri);
|
||||||
|
if (uri != null && "file".equals(uri.getScheme()))
|
||||||
|
uri = null;
|
||||||
|
|
||||||
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
|
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
|
||||||
if (uri == null)
|
if (uri == null)
|
||||||
|
|
Loading…
Reference in New Issue