Update to 7.0.0 (2060)

This commit is contained in:
DrKLO 2020-08-14 19:58:22 +03:00
parent c0125f27ea
commit 321b756367
8001 changed files with 1605501 additions and 421684 deletions

View file

@ -944,7 +944,7 @@ public class NotificationsController extends BaseController {
if (pushMessagesDict.indexOfKey(mid) >= 0) {
continue;
}
MessageObject messageObject = new MessageObject(currentAccount, message, false);
MessageObject messageObject = new MessageObject(currentAccount, message, false, false);
if (isPersonalMessage(messageObject)) {
personal_count++;
}
@ -1255,7 +1255,11 @@ public class NotificationsController extends BaseController {
} else if (messageObject.messageOwner.action instanceof TLRPC.TL_messageActionGameScore || messageObject.messageOwner.action instanceof TLRPC.TL_messageActionPaymentSent) {
return messageObject.messageText.toString();
} else if (messageObject.messageOwner.action instanceof TLRPC.TL_messageActionPhoneCall) {
return LocaleController.getString("CallMessageIncomingMissed", R.string.CallMessageIncomingMissed);
if (messageObject.messageOwner.action.video) {
return LocaleController.getString("CallMessageVideoIncomingMissed", R.string.CallMessageVideoIncomingMissed);
} else {
return LocaleController.getString("CallMessageIncomingMissed", R.string.CallMessageIncomingMissed);
}
} else if (messageObject.messageOwner.action instanceof TLRPC.TL_messageActionChatAddUser) {
int singleUserId = messageObject.messageOwner.action.user_id;
if (singleUserId == 0 && messageObject.messageOwner.action.users.size() == 1) {
@ -1667,7 +1671,11 @@ public class NotificationsController extends BaseController {
} else if (messageObject.messageOwner.action instanceof TLRPC.TL_messageActionGameScore || messageObject.messageOwner.action instanceof TLRPC.TL_messageActionPaymentSent) {
msg = messageObject.messageText.toString();
} else if (messageObject.messageOwner.action instanceof TLRPC.TL_messageActionPhoneCall) {
msg = LocaleController.getString("CallMessageIncomingMissed", R.string.CallMessageIncomingMissed);
if (messageObject.messageOwner.action.video) {
msg = LocaleController.getString("CallMessageVideoIncomingMissed", R.string.CallMessageVideoIncomingMissed);
} else {
msg = LocaleController.getString("CallMessageIncomingMissed", R.string.CallMessageIncomingMissed);
}
}
} else {
if (messageObject.isMediaEmpty()) {
@ -2373,7 +2381,7 @@ public class NotificationsController extends BaseController {
}
});
}
private boolean unsupportedNotificationShortcut() {
return Build.VERSION.SDK_INT < 29 || !SharedConfig.chatBubbles;
}
@ -3180,6 +3188,9 @@ public class NotificationsController extends BaseController {
boolean waitingForPasscode = AndroidUtilities.needShowPasscode() || SharedConfig.isWaitingForPasscodeEnter;
for (int b = 0, size = sortedDialogs.size(); b < size; b++) {
if (holders.size() >= 15) {
break;
}
long dialog_id = sortedDialogs.get(b);
ArrayList<MessageObject> messageObjects = messagesByDialogs.get(dialog_id);
int max_id = messageObjects.get(0).getId();
@ -3742,7 +3753,9 @@ public class NotificationsController extends BaseController {
for (int a = 0, size = holders.size(); a < size; a++) {
NotificationHolder holder = holders.get(a);
holder.call();
ids.add(holder.notification.getShortcutId());
if (!unsupportedNotificationShortcut()) {
ids.add(holder.notification.getShortcutId());
}
}
if (!unsupportedNotificationShortcut()) {
ShortcutManagerCompat.removeDynamicShortcuts(ApplicationLoader.applicationContext, ids);