From 03ea5eae4c8809d08ac50ea6957bce78177585fb Mon Sep 17 00:00:00 2001
From: Albert Vaca Cintora <albertvaka@gmail.com>
Date: Mon, 17 Mar 2025 14:03:15 +0100
Subject: [PATCH] Fix NPE

---
 .../UserInterface/CustomDevicesActivity.java           | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/org/kde/kdeconnect/UserInterface/CustomDevicesActivity.java b/src/org/kde/kdeconnect/UserInterface/CustomDevicesActivity.java
index f26cd729..2a026f78 100644
--- a/src/org/kde/kdeconnect/UserInterface/CustomDevicesActivity.java
+++ b/src/org/kde/kdeconnect/UserInterface/CustomDevicesActivity.java
@@ -250,11 +250,17 @@ public class CustomDevicesActivity extends BaseActivity<ActivityCustomDevicesBin
                         showEmptyListMessageIfRequired();
                     }
                     else {
-                        Toast.makeText(addDeviceDialog.getContext(), R.string.device_host_duplicate, Toast.LENGTH_SHORT).show();
+                        Context context = addDeviceDialog.getContext();
+                        if (context != null) {
+                            Toast.makeText(addDeviceDialog.getContext(), R.string.device_host_duplicate, Toast.LENGTH_SHORT).show();
+                        }
                     }
                 }
                 else {
-                    Toast.makeText(addDeviceDialog.getContext(), R.string.device_host_invalid, Toast.LENGTH_SHORT).show();
+                    Context context = addDeviceDialog.getContext();
+                    if (context != null) {
+                        Toast.makeText(addDeviceDialog.getContext(), R.string.device_host_invalid, Toast.LENGTH_SHORT).show();
+                    }
                 }
             }
         }