Fixed NPE in FileParams.setKeyAndIv

1 files changed, 2 insertions, 0 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/entities/FileParams.java b/src/main/java/de/thedevstack/conversationsplus/entities/FileParams.java
index 290b87b8..3abb37e4 100644
--- a/src/main/java/de/thedevstack/conversationsplus/entities/FileParams.java
+++ b/src/main/java/de/thedevstack/conversationsplus/entities/FileParams.java
@@ -93,6 +93,7 @@ public class FileParams {
     }
 
     public void setKeyAndIv(byte[] keyIvCombo) {
+        if (null != keyIvCombo) {
             if (keyIvCombo.length == 48) {
                 this.aeskey = new byte[32];
                 this.iv = new byte[16];
@@ -106,6 +107,7 @@ public class FileParams {
                 System.arraycopy(keyIvCombo, 0, this.aeskey, 0, 16);
             }
         }
+    }
 
     public void setKey(byte[] key) {
         this.aeskey = key;