mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Export notification channel audio attributes

This commit is contained in:
M66B 2024-02-02 16:57:45 +01:00
parent 197bdf521f
commit 615f1e7a6a
1 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/src/main/java/eu/faircode/email/NotificationHelper.java
View File

@ -31,6 +31,7 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.graphics.Color; import android.graphics.Color;
import android.media.AudioAttributes;
import android.media.Ringtone; import android.media.Ringtone;
import android.media.RingtoneManager; import android.media.RingtoneManager;
import android.net.Uri; import android.net.Uri;
@ -284,9 +285,16 @@ class NotificationHelper {
jchannel.put("badge", channel.canShowBadge()); jchannel.put("badge", channel.canShowBadge());
Uri sound = channel.getSound(); Uri sound = channel.getSound();
if (sound != null) if (sound != null) {
jchannel.put("sound", sound.toString()); jchannel.put("sound", sound.toString());
// audio attributes AudioAttributes attr = channel.getAudioAttributes();
try {
jchannel.put("sound_content_type", attr.getContentType());
jchannel.put("sound_usage", attr.getUsage());
} catch (Throwable ex) {
Log.e(ex);
}
}
jchannel.put("light", channel.shouldShowLights()); jchannel.put("light", channel.shouldShowLights());
// color // color
@ -329,9 +337,25 @@ class NotificationHelper {
if (jchannel.has("sound") && !jchannel.isNull("sound")) if (jchannel.has("sound") && !jchannel.isNull("sound"))
try { try {
Uri uri = Uri.parse(jchannel.getString("sound")); Uri uri = Uri.parse(jchannel.getString("sound"));
AudioAttributes attr;
try {
AudioAttributes.Builder builder = new AudioAttributes.Builder();
if (jchannel.has("sound_content_type"))
builder.setContentType(jchannel.getInt("sound_content_type"));
else
builder.setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION);
if (jchannel.has("sound_usage"))
builder.setUsage(jchannel.getInt("sound_usage"));
else
builder.setUsage(AudioAttributes.USAGE_NOTIFICATION);
attr = builder.build();
} catch (Throwable ex) {
Log.e(ex);
attr = Notification.AUDIO_ATTRIBUTES_DEFAULT;
}
Ringtone ringtone = RingtoneManager.getRingtone(context, uri); Ringtone ringtone = RingtoneManager.getRingtone(context, uri);
if (ringtone != null) if (ringtone != null)
channel.setSound(uri, Notification.AUDIO_ATTRIBUTES_DEFAULT); channel.setSound(uri, attr);
} catch (Throwable ex) { } catch (Throwable ex) {
Log.e(ex); Log.e(ex);
} }