Add client::notification.bigImageUrl extra

closes #185
gotify · Dec 2, 2021 · f598875 · f598875
1 parent 802e30f
commit f598875
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/app/src/main/java/com/github/gotify/picasso/PicassoHandler.java b/app/src/main/java/com/github/gotify/picasso/PicassoHandler.java
@@ -56,16 +56,18 @@ private Picasso makePicasso() {
                 .build();
     }
 
+    public Bitmap getImageFromUrl(String url) throws IOException {
+        return picasso.load(url).get();
+    }
+
     public Bitmap getIcon(Long appId) {
         if (appId == -1) {
             return BitmapFactory.decodeResource(context.getResources(), R.drawable.gotify);
         }
 
         try {
-            return picasso.load(
-                            Utils.resolveAbsoluteUrl(
-                                    settings.url() + "/", appIdToAppImage.get(appId)))
-                    .get();
+            return getImageFromUrl(
+                    Utils.resolveAbsoluteUrl(settings.url() + "/", appIdToAppImage.get(appId)));
         } catch (IOException e) {
             Log.e("Could not load image for notification", e);
         }

diff --git a/app/src/main/java/com/github/gotify/service/WebSocketService.java b/app/src/main/java/com/github/gotify/service/WebSocketService.java
@@ -314,6 +314,19 @@ private void showNotification(
         b.setContentText(message);
         b.setStyle(new NotificationCompat.BigTextStyle().bigText(formattedMessage));
 
+        String notificationImageUrl =
+                Extras.getNestedValue(String.class, extras, "client::notification", "bigImageUrl");
+
+        if (notificationImageUrl != null) {
+            try {
+                b.setStyle(
+                        new NotificationCompat.BigPictureStyle()
+                                .bigPicture(picassoHandler.getImageFromUrl(notificationImageUrl)));
+            } catch (Exception e) {
+                Log.e("Error loading bigImageUrl", e);
+            }
+        }
+
         NotificationManager notificationManager =
                 (NotificationManager) this.getSystemService(Context.NOTIFICATION_SERVICE);
         notificationManager.notify(Utils.longToInt(id), b.build());