narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

fixups for missed call notifications

Browse source
This commit is contained in:
Daniel Gultsch 2022-08-29 13:01:20 +02:00
parent a6b88ba9e9
commit f8b9e15634
2 changed files with 60 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
src/main/java/eu/siacs/conversations/services/NotificationService.java
View file

@ -103,7 +103,8 @@ public class NotificationService {
private final XmppConnectionService mXmppConnectionService; private final XmppConnectionService mXmppConnectionService;
private final LinkedHashMap<String, ArrayList<Message>> notifications = new LinkedHashMap<>(); private final LinkedHashMap<String, ArrayList<Message>> notifications = new LinkedHashMap<>();
private final HashMap<Conversation, AtomicInteger> mBacklogMessageCounter = new HashMap<>(); private final HashMap<Conversation, AtomicInteger> mBacklogMessageCounter = new HashMap<>();
private final LinkedHashMap<Conversational, MissedCallsInfo> mMissedCalls = new LinkedHashMap<>(); private final LinkedHashMap<Conversational, MissedCallsInfo> mMissedCalls =
new LinkedHashMap<>();
private Conversation mOpenConversation; private Conversation mOpenConversation;
private boolean mIsInForeground; private boolean mIsInForeground;
private long mLastNotification; private long mLastNotification;
@ -224,7 +225,9 @@ public class NotificationService {
ongoingCallsChannel.setGroup("calls"); ongoingCallsChannel.setGroup("calls");
notificationManager.createNotificationChannel(ongoingCallsChannel); notificationManager.createNotificationChannel(ongoingCallsChannel);
final NotificationChannel missedCallsChannel = new NotificationChannel("missed_calls", final NotificationChannel missedCallsChannel =
new NotificationChannel(
"missed_calls",
c.getString(R.string.missed_calls_channel_name), c.getString(R.string.missed_calls_channel_name),
NotificationManager.IMPORTANCE_HIGH); NotificationManager.IMPORTANCE_HIGH);
missedCallsChannel.setShowBadge(true); missedCallsChannel.setShowBadge(true);
@ -413,8 +416,8 @@ public class NotificationService {
return count; return count;
} }
void finishBacklog(boolean notify) { void finishBacklog() {
finishBacklog(notify, null); finishBacklog(false, null);
} }
private void pushToStack(final Message message) { private void pushToStack(final Message message) {
@ -967,7 +970,8 @@ public class NotificationService {
} }
private Builder buildMissedCallsSummary(boolean publicVersion) { private Builder buildMissedCallsSummary(boolean publicVersion) {
final Builder builder = new NotificationCompat.Builder(mXmppConnectionService, "missed_calls"); final Builder builder =
new NotificationCompat.Builder(mXmppConnectionService, "missed_calls");
int totalCalls = 0; int totalCalls = 0;
final StringBuilder names = new StringBuilder(); final StringBuilder names = new StringBuilder();
long lastTime = 0; long lastTime = 0;
@ -982,9 +986,16 @@ public class NotificationService {
if (names.length() >= 2) { if (names.length() >= 2) {
names.delete(names.length() - 2, names.length()); names.delete(names.length() - 2, names.length());
} }
final String title = (totalCalls == 1) ? mXmppConnectionService.getString(R.string.missed_call) : final String title =
(mMissedCalls.size() == 1) ? mXmppConnectionService.getString(R.string.n_missed_calls, totalCalls) : (totalCalls == 1)
mXmppConnectionService.getString(R.string.n_missed_calls_from_m_contacts, totalCalls, mMissedCalls.size()); ? mXmppConnectionService.getString(R.string.missed_call)
: (mMissedCalls.size() == 1)
? mXmppConnectionService.getString(
R.string.n_missed_calls, totalCalls)
: mXmppConnectionService.getString(
R.string.n_missed_calls_from_m_contacts,
totalCalls,
mMissedCalls.size());
builder.setContentTitle(title); builder.setContentTitle(title);
builder.setTicker(title); builder.setTicker(title);
if (!publicVersion) { if (!publicVersion) {
@ -1012,19 +1023,27 @@ public class NotificationService {
return builder.build(); return builder.build();
} }
private Builder buildMissedCall(final Conversational conversation, final MissedCallsInfo info, boolean publicVersion) { private Builder buildMissedCall(
final Builder builder = new NotificationCompat.Builder(mXmppConnectionService, "missed_calls"); final Conversational conversation, final MissedCallsInfo info, boolean publicVersion) {
final String title = (info.getNumberOfCalls() == 1) ? mXmppConnectionService.getString(R.string.missed_call) : final Builder builder =
mXmppConnectionService.getString(R.string.n_missed_calls, info.getNumberOfCalls()); new NotificationCompat.Builder(mXmppConnectionService, "missed_calls");
final String title =
(info.getNumberOfCalls() == 1)
? mXmppConnectionService.getString(R.string.missed_call)
: mXmppConnectionService.getString(
R.string.n_missed_calls, info.getNumberOfCalls());
builder.setContentTitle(title); builder.setContentTitle(title);
final String name = conversation.getContact().getDisplayName(); final String name = conversation.getContact().getDisplayName();
if (publicVersion) { if (publicVersion) {
builder.setTicker(title); builder.setTicker(title);
} else { } else {
if (info.getNumberOfCalls() == 1) { if (info.getNumberOfCalls() == 1) {
builder.setTicker(mXmppConnectionService.getString(R.string.missed_call_from_x, name)); builder.setTicker(
mXmppConnectionService.getString(R.string.missed_call_from_x, name));
} else { } else {
builder.setTicker(mXmppConnectionService.getString(R.string.n_missed_calls_from_x, info.getNumberOfCalls(), name)); builder.setTicker(
mXmppConnectionService.getString(
R.string.n_missed_calls_from_x, info.getNumberOfCalls(), name));
} }
builder.setContentText(name); builder.setContentText(name);
} }
@ -1035,15 +1054,20 @@ public class NotificationService {
builder.setContentIntent(createContentIntent(conversation)); builder.setContentIntent(createContentIntent(conversation));
builder.setDeleteIntent(createMissedCallsDeleteIntent(conversation)); builder.setDeleteIntent(createMissedCallsDeleteIntent(conversation));
if (!publicVersion && conversation instanceof Conversation) { if (!publicVersion && conversation instanceof Conversation) {
builder.setLargeIcon(mXmppConnectionService.getAvatarService() builder.setLargeIcon(
.get((Conversation) conversation, AvatarService.getSystemUiAvatarSize(mXmppConnectionService))); mXmppConnectionService
.getAvatarService()
.get(
(Conversation) conversation,
AvatarService.getSystemUiAvatarSize(mXmppConnectionService)));
} }
modifyMissedCall(builder); modifyMissedCall(builder);
return builder; return builder;
} }
private void modifyMissedCall(final Builder builder) { private void modifyMissedCall(final Builder builder) {
final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(mXmppConnectionService); final SharedPreferences preferences =
PreferenceManager.getDefaultSharedPreferences(mXmppConnectionService);
final Resources resources = mXmppConnectionService.getResources(); final Resources resources = mXmppConnectionService.getResources();
final boolean led = preferences.getBoolean("led", resources.getBoolean(R.bool.led)); final boolean led = preferences.getBoolean("led", resources.getBoolean(R.bool.led));
if (led) { if (led) {
@ -1521,7 +1545,7 @@ public class NotificationService {
return createContentIntent(conversation.getUuid(), null); return createContentIntent(conversation.getUuid(), null);
} }
private PendingIntent createDeleteIntent(Conversation conversation) { private PendingIntent createDeleteIntent(final Conversation conversation) {
final Intent intent = new Intent(mXmppConnectionService, XmppConnectionService.class); final Intent intent = new Intent(mXmppConnectionService, XmppConnectionService.class);
intent.setAction(XmppConnectionService.ACTION_CLEAR_MESSAGE_NOTIFICATION); intent.setAction(XmppConnectionService.ACTION_CLEAR_MESSAGE_NOTIFICATION);
if (conversation != null) { if (conversation != null) {
@ -1548,9 +1572,21 @@ public class NotificationService {
intent.setAction(XmppConnectionService.ACTION_CLEAR_MISSED_CALL_NOTIFICATION); intent.setAction(XmppConnectionService.ACTION_CLEAR_MISSED_CALL_NOTIFICATION);
if (conversation != null) { if (conversation != null) {
intent.putExtra("uuid", conversation.getUuid()); intent.putExtra("uuid", conversation.getUuid());
return PendingIntent.getService(mXmppConnectionService, generateRequestCode(conversation, 21), intent, 0); return PendingIntent.getService(
mXmppConnectionService,
generateRequestCode(conversation, 21),
intent,
s()
? PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT
: PendingIntent.FLAG_UPDATE_CURRENT);
} }
return PendingIntent.getService(mXmppConnectionService, 1, intent, 0); return PendingIntent.getService(
mXmppConnectionService,
1,
intent,
s()
? PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT
: PendingIntent.FLAG_UPDATE_CURRENT);
} }
private PendingIntent createReplyIntent( private PendingIntent createReplyIntent(
@ -1896,6 +1932,7 @@ public class NotificationService {
return lastTime; return lastTime;
} }
} }
private class VibrationRunnable implements Runnable { private class VibrationRunnable implements Runnable {
@Override @Override

2
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
View file

@ -1958,7 +1958,7 @@ public class XmppConnectionService extends Service {
restoreMessages(conversation); restoreMessages(conversation);
} }
} }
mNotificationService.finishBacklog(false); mNotificationService.finishBacklog();
restoredFromDatabaseLatch.countDown(); restoredFromDatabaseLatch.countDown();
final long diffMessageRestore = SystemClock.elapsedRealtime() - startMessageRestore; final long diffMessageRestore = SystemClock.elapsedRealtime() - startMessageRestore;
Log.d(Config.LOGTAG, "finished restoring messages in " + diffMessageRestore + "ms"); Log.d(Config.LOGTAG, "finished restoring messages in " + diffMessageRestore + "ms");