Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-05 16:43:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Allow silent sound for rules

Browse Source
This commit is contained in:
M66B
2022-11-23 08:49:14 +01:00
parent 14cf8fcf66
commit 09d954d044
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/eu/faircode/email/EntityRule.java
View File

@@ -588,9 +588,6 @@ public class EntityRule {
case TYPE_DELETE:
return;
case TYPE_SOUND:
String uri = jargs.optString("uri");
if (TextUtils.isEmpty(uri))
throw new IllegalArgumentException(context.getString(R.string.title_rule_select_sound));
return;
case TYPE_LOCAL_ONLY:
return;
@@ -1113,21 +1110,21 @@ public class EntityRule {
}
private boolean onActionSound(Context context, EntityMessage message, JSONObject jargs) throws JSONException {
Log.i("Speaking name=" + name);
if (message.ui_seen)
return false;
Uri uri = Uri.parse(jargs.getString("uri"));
Uri uri = (jargs.has("uri") ? Uri.parse(jargs.getString("uri")) : null);
boolean alarm = jargs.getBoolean("alarm");
int duration = jargs.optInt("duration", MediaPlayerHelper.DEFAULT_ALARM_DURATION);
Log.i("Sound uri=" + uri + " alarm=" + alarm + " duration=" + duration);
DB db = DB.getInstance(context);
message.ui_silent = true;
db.message().setMessageUiSilent(message.id, message.ui_silent);
MediaPlayerHelper.queue(context, uri, alarm, duration);
if (uri != null)
MediaPlayerHelper.queue(context, uri, alarm, duration);
return true;
}

1
app/src/main/java/eu/faircode/email/FragmentRule.java
View File

@@ -696,6 +696,7 @@ public class FragmentRule extends FragmentBase {
Intent intent = new Intent(RingtoneManager.ACTION_RINGTONE_PICKER);
intent.putExtra(RingtoneManager.EXTRA_RINGTONE_TYPE, RingtoneManager.TYPE_ALL);
intent.putExtra(RingtoneManager.EXTRA_RINGTONE_TITLE, getString(R.string.title_advanced_sound));
intent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_SILENT, true);
intent.putExtra(RingtoneManager.EXTRA_RINGTONE_EXISTING_URI, sound);
startActivityForResult(Helper.getChooser(getContext(), intent), REQUEST_SOUND);
}