Merge branch 'master' into fcm-http2

Author: jonathanedey

firebase_admin/_messaging_encoder.py

@@ -529,6 +529,8 @@ def encode_apns(cls, apns):
                 'APNSConfig.headers', apns.headers),
             'payload': cls.encode_apns_payload(apns.payload),
             'fcm_options': cls.encode_apns_fcm_options(apns.fcm_options),
+            'live_activity_token': _Validators.check_string(
+                'APNSConfig.live_activity_token', apns.live_activity_token),
         }
         return cls.remove_null_values(result)
 

firebase_admin/_messaging_utils.py

@@ -334,15 +334,17 @@ class APNSConfig:
         payload: A ``messaging.APNSPayload`` to be included in the message (optional).
         fcm_options: A ``messaging.APNSFCMOptions`` instance to be included in the message
             (optional).
+        live_activity_token: A live activity token string (optional).
 
     .. _APNS Documentation: https://developer.apple.com/library/content/documentation\
         /NetworkingInternet/Conceptual/RemoteNotificationsPG/CommunicatingwithAPNs.html
     """
 
-    def __init__(self, headers=None, payload=None, fcm_options=None):
+    def __init__(self, headers=None, payload=None, fcm_options=None, live_activity_token=None):
         self.headers = headers
         self.payload = payload
         self.fcm_options = fcm_options
+        self.live_activity_token = live_activity_token
 
 
 class APNSPayload:

firebase_admin/messaging.py

@@ -398,7 +398,7 @@ class BatchResponse:
 
     def __init__(self, responses: List[SendResponse]) -> None:
         self._responses = responses
-        self._success_count = len([resp for resp in responses if resp.success])
+        self._success_count = sum(1 for resp in responses if resp.success)
 
     @property
     def responses(self) -> List[SendResponse]:

tests/test_messaging.py

@@ -1097,7 +1097,8 @@ def test_apns_config(self):
             topic='topic',
             apns=messaging.APNSConfig(
                 headers={'h1': 'v1', 'h2': 'v2'},
-                fcm_options=messaging.APNSFCMOptions('analytics_label_v1')
+                fcm_options=messaging.APNSFCMOptions('analytics_label_v1'),
+                live_activity_token='test_token_string'
             ),
         )
         expected = {
@@ -1110,6 +1111,7 @@ def test_apns_config(self):
                 'fcm_options': {
                     'analytics_label': 'analytics_label_v1',
                 },
+                'live_activity_token': 'test_token_string',
             },
         }
         check_encoding(msg, expected)