From 30c5db92e6df1d5348461c9dc82f78dc0ba7d153 Mon Sep 17 00:00:00 2001
From: J-Jamet <jeremy.jamet@kunzisoft.com>
Date: Sat, 10 Mar 2018 13:15:42 +0100
Subject: [PATCH] Fix getMasterKey for V3

---
 .../main/java/com/keepassdroid/database/PwDatabaseV3.java   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/keepassdroid/database/PwDatabaseV3.java b/app/src/main/java/com/keepassdroid/database/PwDatabaseV3.java
index f296721f3..c970cfaa0 100644
--- a/app/src/main/java/com/keepassdroid/database/PwDatabaseV3.java
+++ b/app/src/main/java/com/keepassdroid/database/PwDatabaseV3.java
@@ -221,18 +221,16 @@ public class PwDatabaseV3 extends PwDatabase {
 
 	public byte[] getMasterKey(String key, InputStream keyInputStream)
 			throws InvalidKeyFileException, IOException {
-		assert (key != null);
 
-		if (key.length() > 0 && keyInputStream != null) {
+	    if (key != null && key.length() > 0 && keyInputStream != null) {
 			return getCompositeKey(key, keyInputStream);
-		} else if (key.length() > 0) {
+		} else if (key != null && key.length() > 0) {
 			return getPasswordKey(key);
 		} else if (keyInputStream != null) {
 			return getFileKey(keyInputStream);
 		} else {
 			throw new IllegalArgumentException("Key cannot be empty.");
 		}
-
 	}
 
 	@Override