#567 Fixes crash on bulk_send test message operation from admin

Author: DataGreed

push_notifications/admin.py

@@ -57,13 +57,21 @@ def send_messages(self, request, queryset, bulk=False):
 				if "error" in r["results"][0]:
 					errors.append(r["results"][0]["error"])
 		else:
-			try:
-				errors = [r["error"] for r in ret[0][0]["results"] if "error" in r]
-			except TypeError:
-				for entry in ret[0][0]:
-					errors = errors + [r["error"] for r in entry["results"] if "error" in r]
-			except IndexError:
-				pass
+			if "results" in ret[0][0]:
+				try:
+					errors = [r["error"] for r in ret[0][0]["results"] if "error" in r]
+				except TypeError:
+					for entry in ret[0][0]:
+						errors = errors + [r["error"] for r in entry["results"] if "error" in r]
+				except IndexError:
+					pass
+			else:
+				# different format, e.g.:
+				# [{'some_token1': 'Success',
+				#  'some_token2': 'BadDeviceToken'}]
+				for key, value in ret[0][0].items():
+					if value.lower() != "success":
+						errors.append(value)
 		if errors:
 			self.message_user(
 				request, _("Some messages could not be processed: %r" % (", ".join(errors))),
@@ -73,14 +81,24 @@ def send_messages(self, request, queryset, bulk=False):
 			if bulk:
 				# When the queryset exceeds the max_recipients value, the
 				# send_message method returns a list of dicts, one per chunk
-				try:
-					success = ret[0][0]["success"]
-				except TypeError:
-					success = 0
-					for entry in ret[0][0]:
-						success = success + entry["success"]
-				if success == 0:
-					return
+				if "results" in ret[0][0]:
+					try:
+						success = ret[0][0]["success"]
+					except TypeError:
+						success = 0
+						for entry in ret[0][0]:
+							success = success + entry["success"]
+					if success == 0:
+						return
+				else:
+					# different format, e.g.:
+					# [{'some_token1': 'Success',
+					#  'some_token2': 'BadDeviceToken'}]
+					success = []
+					for key, value in ret[0][0].items():
+						if value.lower() == "success":
+							success.append(key)
+
 			elif len(errors) == len(ret):
 				return
 			if errors: