Minor bug fixes

server/models/Note.js

@@ -340,8 +340,8 @@ Note.getDiffText = (userId, noteId, usersCurrentText, lastUpdated) => {
 		Note.get(userId, noteId)
 		.then(noteObject => {
 
-			if(!noteObject.text || !usersCurrentText){
-				resolve(null)
+			if(!noteObject.text || !usersCurrentText || noteObject.encrypted == 1){
+				return resolve(null)
 			}
 
 			let oldText = noteObject.text.replace(/(\r\n|\n|\r)/gm,"")
@@ -349,7 +349,7 @@ Note.getDiffText = (userId, noteId, usersCurrentText, lastUpdated) => {
 
 			if(noteObject.updated == lastUpdated){
 				// console.log('No note diff')
-				resolve(null)
+				return resolve(null)
 			}
 
 			if(noteObject.updated > lastUpdated){