feat: new push type MicroG

Co-authored-by: Matteo <matteobtt@users.noreply.github.com>
NextAlone · Apr 19, 2024 · d77111e · d77111e
1 parent 7bdc7c3
commit d77111e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/NotificationsController.java b/TMessagesProj/src/main/java/org/telegram/messenger/NotificationsController.java
@@ -3836,7 +3836,7 @@ private void showOrUpdateNotification(boolean notifyAboutLast) {
             }
             SharedPreferences preferences = getAccountInstance().getNotificationsSettings();
             int dismissDate = preferences.getInt("dismissDate", 0);
-            if (!lastMessageObject.isStoryPush && lastMessageObject.messageOwner.date <= dismissDate) {
+            if (!lastMessageObject.isStoryPush && (lastMessageObject.messageOwner.date <= dismissDate && NaConfig.INSTANCE.getPushServiceType().Int() != 3)) {
                 dismissNotification();
                 return;
             }
@@ -3962,7 +3962,7 @@ private void showOrUpdateNotification(boolean notifyAboutLast) {
                 for (int i = 0; i < count; i++) {
                     MessageObject messageObject = pushMessages.get(i);
                     String message = getStringForMessage(messageObject, false, text, null);
-                    if (message == null || !messageObject.isStoryPush && messageObject.messageOwner.date <= dismissDate) {
+                    if (message == null || !messageObject.isStoryPush && (messageObject.messageOwner.date <= dismissDate && NaConfig.INSTANCE.getPushServiceType().Int() != 3)) {
                         continue;
                     }
                     if (silent == 2) {
@@ -4454,7 +4454,7 @@ private void showExtraNotifications(NotificationCompat.Builder notificationBuild
             long dialog_id = messageObject.getDialogId();
             long topicId = MessageObject.getTopicId(currentAccount, messageObject.messageOwner, getMessagesController().isForum(messageObject));
             int dismissDate = preferences.getInt("dismissDate" + dialog_id, 0);
-            if (!messageObject.isStoryPush && messageObject.messageOwner.date <= dismissDate) {
+            if (!messageObject.isStoryPush && (messageObject.messageOwner.date <= dismissDate && NaConfig.INSTANCE.getPushServiceType().Int() != 3)) {
                 continue;
             }
 

diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/PushListenerController.java b/TMessagesProj/src/main/java/org/telegram/messenger/PushListenerController.java
@@ -1440,7 +1440,8 @@ public static IPushListenerServiceProvider getProvider() {
         if (instance != null)
             return instance;
         switch (NaConfig.INSTANCE.getPushServiceType().Int()) {
-            case 1: {
+            case 1:
+            case 3: {
                 instance = new GooglePushListenerServiceProvider();
                 break;
             }

diff --git a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/settings/NekoGeneralSettingsActivity.java b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/settings/NekoGeneralSettingsActivity.java
@@ -243,6 +243,7 @@ public class NekoGeneralSettingsActivity extends BaseNekoXSettingsActivity {
             LocaleController.getString(R.string.PushServiceTypeInApp),
             LocaleController.getString(R.string.PushServiceTypeFCM),
             LocaleController.getString(R.string.PushServiceTypeUnified),
+            LocaleController.getString(R.string.PushServiceTypeMicroG),
     }, null));
     private final AbstractConfigCell pushServiceTypeInAppDialogRow = cellGroup.appendCell(new ConfigCellTextCheck(NaConfig.INSTANCE.getPushServiceTypeInAppDialog()));
     private final AbstractConfigCell pushServiceTypeUnifiedGatewayRow = cellGroup.appendCell(new ConfigCellTextInput(null, NaConfig.INSTANCE.getPushServiceTypeUnifiedGateway(), null, null, (input) -> input.isEmpty() ? (String) NaConfig.INSTANCE.getPushServiceTypeUnifiedGateway().defaultValue : input));

diff --git a/TMessagesProj/src/main/res/values/strings_na.xml b/TMessagesProj/src/main/res/values/strings_na.xml
@@ -130,6 +130,7 @@
     <string name="PushServiceTypeInApp">In App</string>
     <string name="PushServiceTypeFCM">Google FCM</string>
     <string name="PushServiceTypeUnified">Unified Push</string>
+    <string name="PushServiceTypeMicroG">MicroG</string>
     <string name="PushServiceTypeInAppDialog">Show resident notifications</string>
     <string name="PushServiceTypeUnifiedGateway">Unified Push Gateway</string>
     <string name="SendMp4DocumentAsVideo">Send mp4 document as video</string>