Better logic (cosmetic) for default 3PID notification providers

kamax-matrix · Nov 30, 2017 · 1581ab9 · 1581ab9
1 parent a1adca7
commit 1581ab9
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/main/java/io/kamax/mxisd/notification/NotificationManager.java b/src/main/java/io/kamax/mxisd/notification/NotificationManager.java
@@ -46,9 +46,8 @@ public NotificationManager(NotificationConfig cfg, List<INotificationHandler> ha
         this.handlers = new HashMap<>();
         handlers.forEach(h -> {
             log.info("Found handler {} for medium {}", h.getId(), h.getMedium());
-            String handlerId = cfg.getHandler().get(h.getMedium());
-            if (StringUtils.isBlank(handlerId) && StringUtils.equals("raw", h.getId()) ||
-                    StringUtils.equals(handlerId, h.getId())) {
+            String handlerId = cfg.getHandler().getOrDefault(h.getMedium(), "raw");
+            if (StringUtils.equals(handlerId, h.getId())) {
                 this.handlers.put(h.getMedium(), h);
             }
         });