Fixed dcai#238 issue that can't send broadcast message due to device …

…type check for ios-fcm

controllers/broadcast.py

@@ -27,8 +27,8 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import tornado.web
-
-from controllers.base import *
+from routes import route
+from controllers.base import WebBaseHandler
 
 
 @route(r"/applications/([^/]+)/broadcast")
@@ -41,16 +41,18 @@ def get(self, appname):
             raise tornado.web.HTTPError(500)
         self.render("app_broadcast.html", app=app, sent=False)
 
+    # TODO: to check and implement for performance in case there are much devices
+    # to send the broadcast message.
     @tornado.web.authenticated
-    def post(self, appname):
+    async def post(self, appname):
         self.appname = appname
         app = self.masterdb.applications.find_one({"shortname": appname})
         if not app:
             raise tornado.web.HTTPError(500)
         alert = self.get_argument("notification").strip()
         sound = "default"
         channel = "default"
-        self.application.send_broadcast(
+        await self.application.send_broadcast(
             self.appname, self.db, channel=channel, alert=alert, sound=sound
         )
         self.render("app_broadcast.html", app=app, sent=True)

web.py

@@ -6,7 +6,11 @@
     RELEASE,
     VERSION,
 )
-from uimodules import *
+from uimodules import (
+    AppSideBar,
+    NavBar,
+    TabBar
+)
 import datetime
 import os
 import logging
@@ -117,15 +121,16 @@ async def send_broadcast(self, appname, appdb, **kwargs):
                             extra=extra,
                             apns=kwargs.get("apns", {}),
                         )
-                elif token["device"] == DEVICE_TYPE_FCM or token["device"] == DEVICE_TYPE_ANDROID:
+                elif (token["device"].endswith(DEVICE_TYPE_FCM) or
+                      token["device"] == DEVICE_TYPE_ANDROID):
                     await fcm.process(
                         token=t, alert=alert, extra=extra, fcm=kwargs.get("fcm", {})
                     )
-                elif token["device"] == DEVICE_TYPE_WNS:
-                    if wns is not None:
-                        wns.process(
-                            token=t, alert=alert, extra=extra, wns=kwargs.get("wns", {})
-                        )
+                elif (token["device"] == DEVICE_TYPE_WNS and
+                      wns is not None):
+                    wns.process(
+                        token=t, alert=alert, extra=extra, wns=kwargs.get("wns", {})
+                    )
         except Exception as ex:
             logging.error(ex)