Add subtitle field to ApsAlert (#239)

Author: hiranya911

firebase_admin/messaging.py

@@ -424,6 +424,7 @@ class ApsAlert(object):
  Args:
  title: Title of the alert (optional). If specified, overrides the title set via
  ``messaging.Notification``.
+ subtitle: Subtitle of the alert (optional).
  body: Body of the alert (optional). If specified, overrides the body set via
  ``messaging.Notification``.
  loc_key: Key of the body string in the app's string resources to use to localize the
@@ -439,9 +440,10 @@ class ApsAlert(object):
  launch_image: Image for the notification action (optional).
  """
 
- def __init__(self, title=None, body=None, loc_key=None, loc_args=None, title_loc_key=None,
- title_loc_args=None, action_loc_key=None, launch_image=None):
+ def __init__(self, title=None, subtitle=None, body=None, loc_key=None, loc_args=None,
+ title_loc_key=None, title_loc_args=None, action_loc_key=None, launch_image=None):
  self.title = title
+ self.subtitle = subtitle
  self.body = body
  self.loc_key = loc_key
  self.loc_args = loc_args
@@ -765,6 +767,7 @@ def encode_aps_alert(cls, alert):
  raise ValueError('Aps.alert must be a string or an instance of ApsAlert class.')
  result = {
  'title': _Validators.check_string('ApsAlert.title', alert.title),
+ 'subtitle': _Validators.check_string('ApsAlert.subtitle', alert.subtitle),
  'body': _Validators.check_string('ApsAlert.body', alert.body),
  'title-loc-key': _Validators.check_string(
  'ApsAlert.title_loc_key', alert.title_loc_key),

tests/test_messaging.py

@@ -850,6 +850,13 @@ def test_invalid_title(self, data):
  expected = 'ApsAlert.title must be a string.'
  assert str(excinfo.value) == expected
 
+ @pytest.mark.parametrize('data', NON_STRING_ARGS)
+ def test_invalid_subtitle(self, data):
+ alert = messaging.ApsAlert(subtitle=data)
+ excinfo = self._check_alert(alert)
+ expected = 'ApsAlert.subtitle must be a string.'
+ assert str(excinfo.value) == expected
+
  @pytest.mark.parametrize('data', NON_STRING_ARGS)
  def test_invalid_body(self, data):
  alert = messaging.ApsAlert(body=data)
@@ -927,6 +934,7 @@ def test_aps_alert(self):
  aps=messaging.Aps(
  alert=messaging.ApsAlert(
  title='t',
+ subtitle='st',
  body='b',
  title_loc_key='tlk',
  title_loc_args=['t1', 't2'],
@@ -946,6 +954,7 @@ def test_aps_alert(self):
  'aps': {
  'alert': {
  'title': 't',
+ 'subtitle': 'st',
  'body': 'b',
  'title-loc-key': 'tlk',
  'title-loc-args': ['t1', 't2'],