Update logic that checks if password was entered. Empty user and empty owner password means no password was entered

Author: ViliusSutkus89

pdf2htmlEX/src/main/java/com/viliussutkus89/android/pdf2htmlex/pdf2htmlEX.java

@@ -139,13 +139,13 @@ public File convert(@NonNull File inputPDF) throws IOException, ConversionFailed
 
   public pdf2htmlEX setOwnerPassword(@NonNull String ownerPassword) {
     this.p_ownerPassword = ownerPassword;
-    this.p_wasPasswordEntered = true;
+    this.p_wasPasswordEntered = !ownerPassword.isEmpty() | !this.p_userPassword.isEmpty();
     return this;
   }
 
   public pdf2htmlEX setUserPassword(@NonNull String userPassword) {
     this.p_userPassword = userPassword;
-    this.p_wasPasswordEntered = true;
+    this.p_wasPasswordEntered = !this.p_ownerPassword.isEmpty() | !userPassword.isEmpty();
     return this;
   }
 

pdf2htmlEX/src/main/java/com/viliussutkus89/android/pdf2htmlex/pdf2htmlEX_exe.java

@@ -75,15 +75,23 @@ public pdf2htmlEX_exe(@NonNull Context ctx) {
 
   @Override
   public pdf2htmlEX setOwnerPassword(@NonNull String ownerPassword) {
-    this.m_arguments.put("--owner-password", ownerPassword);
-    this.p_wasPasswordEntered = true;
+    if (!ownerPassword.isEmpty()){
+      this.m_arguments.put("--owner-password", ownerPassword);
+    } else {
+      this.m_arguments.remove("--owner-password");
+    }
+    this.p_wasPasswordEntered = !ownerPassword.isEmpty() | this.m_arguments.containsKey("--user-password");
     return this;
   }
 
   @Override
   public pdf2htmlEX setUserPassword(@NonNull String userPassword) {
-    this.m_arguments.put("--user-password", userPassword);
-    this.p_wasPasswordEntered = true;
+    if (!userPassword.isEmpty()){
+      this.m_arguments.put("--user-password", userPassword);
+    } else {
+      this.m_arguments.remove("--user-password");
+    }
+    this.p_wasPasswordEntered = this.m_arguments.containsKey("--owner-password") | !userPassword.isEmpty();
     return this;
   }