2 files changed, 35 insertions, 24 deletions

diff --git a/js/lang/bundle.js b/js/lang/bundle.js
index bf1a361..e7dc1e6 100644
--- a/js/lang/bundle.js
+++ b/js/lang/bundle.js
@@ -211,6 +211,7 @@ var langstrings = {
 		imageAddedAsAnAttachment: "image added as an attachment",
 		unableToReadDirectory: "unable to read directory of people",
 		messageCouldNotBeSent: "message could to be sent",
+		incorrectPassword: "incorrect password",
 		// chats
 		chat: "chat",
 		chattingWith: "chatting with",
@@ -393,6 +394,7 @@ var langstrings = {
 		imageAddedAsAnAttachment: "slika dodana kot priloga",
 		unableToReadDirectory: "imenika ni bilo mogoče prebrati",
 		messageCouldNotBeSent: "sporočila ni bilo mogoče poslati",
+		incorrectPassword: "nepravilno geslo",
 		// chats
 		chat: "klepet",
 		chattingWith: "klepet z osebo",
diff --git a/js/messaging.js b/js/messaging.js
index c34e242..3ac9e99 100644
--- a/js/messaging.js
+++ b/js/messaging.js
@@ -271,16 +271,20 @@ function displayMessage(id, data) {
                 value="Decrypt"
                 class="btn waves-effect waves-light"
                 onclick="
-                    $('#beziapp-msg-e2ee-content-${randomencdivid}').html(
-                        filterXSS(
-                            sjcl.decrypt(
-                                $('#beziapp-msg-e2ee-password-${randomencdivid}').val(),
-                                $('#beziapp-msg-e2ee-content-${randomencdivid}').html()
-                            )
-                        )
-                    );
-                    $('#beziapp-msg-e2ee-content-${randomencdivid}').show();
-                    $('#beziapp-msg-e2ee-form-${randomencdivid}').hide();
+										try {
+	                    $('#beziapp-msg-e2ee-content-${randomencdivid}').html(
+	                        filterXSS(
+	                            sjcl.decrypt(
+	                                $('#beziapp-msg-e2ee-password-${randomencdivid}').val(),
+	                                $('#beziapp-msg-e2ee-content-${randomencdivid}').html()
+	                            )
+	                        )
+	                    );
+      	              $('#beziapp-msg-e2ee-content-${randomencdivid}').show();
+    	                $('#beziapp-msg-e2ee-form-${randomencdivid}').hide();
+										} catch (err) {
+											alert('${D("incorrectPassword")}');
+										}
                 "
             >
                 ${S("decrypt")}
@@ -418,11 +422,11 @@ async function validateName() {
         if ($("#full-name").val() in directory) {
             $("#full-name").addClass("valid");
             $("#full-name").removeClass("invalid");
-            $("#msg-send").prop("disabled", false);
+            $("#msg-send").removeAttr("disabled");
         } else {
             $("#full-name").addClass("invalid");
             $("#full-name").removeClass("valid");
-            $("#msg-send").prop("disabled", true);
+            $("#msg-send").attr("disabled", "disabled");
         }
     }
 }
@@ -493,7 +497,7 @@ function setupEventListeners() {
         localforage.getItem("directory").then(function (value) {
             var msgcontent = $("#msg-body").val() + additionalstufftoaddtomessage;
             var msgsubject = $("#msg-subject").val();
-	        if ($("#msg-e2ee-pass").prop("hidden") !== true) {
+	        if ($("#encryption-key-input").prop("hidden") !== true) {
 		        var randomencdivid = Math.floor(Math.random() * 9999).toString().padStart(4, "0");
                 var addrparts = window.location.href.split("/"); // engleski
                 
@@ -505,15 +509,19 @@ function setupEventListeners() {
                         This message was encrypted by BežiApp.
                         <input type="password" autocomplete="new-password" id="beziapp-msg-e2ee-password-${randomencdivid}" placeholder="Enter password ...">
                         <input type="button" value="Decrypt" onclick="
-                            console.log($('beziapp-msg-e2ee-content-${randomencdivid}').text());
-                            $('#beziapp-msg-e2ee-content-${randomencdivid}').html(
-                                sjcl.decrypt(
-                                    $('#beziapp-msg-e2ee-password-${randomencdivid}').val(),
-                                    $('beziapp-msg-e2ee-content-${randomencdivid}').text()
-                                )
-                            );
-                            $('#beziapp-msg-e2ee-content-${randomencdivid}').show();
-                            $('#beziapp-msg-e2ee-form-${randomencdivid}').hide();
+														try {
+	                            console.log($('beziapp-msg-e2ee-content-${randomencdivid}').text());
+	                            $('#beziapp-msg-e2ee-content-${randomencdivid}').html(
+	                                sjcl.decrypt(
+	                                    $('#beziapp-msg-e2ee-password-${randomencdivid}').val(),
+	                                    $('beziapp-msg-e2ee-content-${randomencdivid}').text()
+	                                )
+	                            );
+	                            $('#beziapp-msg-e2ee-content-${randomencdivid}').show();
+	                            $('#beziapp-msg-e2ee-form-${randomencdivid}').hide();
+														} catch(err) {
+															alert('${D("incorrectPassword")}');
+														}
                             "
                         >
                     </div>
@@ -530,7 +538,8 @@ function setupEventListeners() {
             $("#msg-body").val("");
             $("#full-name").val("");
             $("#msg-subject").val("");
-            $("#msg-send").prop("disabled", true);
+            // $("#msg-send").prop("disabled", true);
+            $("#msg-send").attr("disabled", "disabled");
             additionalstufftoaddtomessage = "";
 
 	        $("#msg-added-image").html("");
@@ -605,4 +614,4 @@ document.addEventListener("DOMContentLoaded", () => {
     // Setup side menu
     const menus = document.querySelectorAll(".side-menu");
     M.Sidenav.init(menus, { edge: "right", draggable: true });
-});
\ No newline at end of file
+});