Handle crash when clipboard-copying empty JWT (#1)

novotnyr · Oct 30, 2017 · fa7a21c · fa7a21c
1 parent 2290b97
commit fa7a21c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/com/github/novotnyr/idea/jwt/JwtExplorer.java b/src/com/github/novotnyr/idea/jwt/JwtExplorer.java
@@ -87,7 +87,10 @@ private void configureToolbar() {
         group.add(new AnAction("Copy as JSON", "Copy JWT to clipboard as JSON", AllIcons.FileTypes.Json) {
             @Override
             public void actionPerformed(AnActionEvent anActionEvent) {
-                ClipboardUtils.copyPayload(JwtExplorer.this.jwt);
+                Jwt jwt = JwtExplorer.this.jwt;
+                if (jwt != null) {
+                    ClipboardUtils.copyPayload(JwtExplorer.this.jwt);
+                }
             }
         });
 

diff --git a/src/com/github/novotnyr/idea/jwt/JwtPanel.java b/src/com/github/novotnyr/idea/jwt/JwtPanel.java
@@ -225,6 +225,9 @@ private void editClaimAtRow(int row) {
 
 
     private void onCopyAsJsonActionPerformed(AnActionEvent anActionEvent) {
+        if (this.jwt == null) {
+            return;
+        }
         TextTransferable textTransferable = new TextTransferable(JwtHelper.prettyUnbase64Json(this.jwt.getPayloadString()));
         CopyPasteManagerEx.getInstanceEx().setContents(textTransferable);
     }