All: Add more context to encryption errors

ReactNativeClient/lib/models/BaseItem.js

@@ -341,7 +341,15 @@ class BaseItem extends BaseModel {
 			throw e;
 		}
 
-		const cipherText = await this.encryptionService().encryptString(serialized);
+		let cipherText = null;
+
+		try {
+			cipherText = await this.encryptionService().encryptString(serialized);
+		} catch (error) {
+			const msg = [`Could not encrypt item ${item.id}`];
+			if (error && error.message) msg.push(error.message);
+			throw new Error(msg.join(': '));
+		}
 
 		// List of keys that won't be encrypted - mostly foreign keys required to link items
 		// with each others and timestamp required for synchronisation.

ReactNativeClient/lib/services/EncryptionService.js

@@ -295,7 +295,7 @@ class EncryptionService {
 				});
 			} catch (error) {
 				// SJCL returns a string as error which means stack trace is missing so convert to an error object here
-				throw new Error(error.message);
+				throw new Error(`SJCL error: ${error.message}`);
 			}
 		}
 
@@ -313,7 +313,7 @@ class EncryptionService {
 				});
 			} catch (error) {
 				// SJCL returns a string as error which means stack trace is missing so convert to an error object here
-				throw new Error(error.message);
+				throw new Error(`SJCL error: ${error.message}`);
 			}
 		}
 
@@ -331,7 +331,7 @@ class EncryptionService {
 				});
 			} catch (error) {
 				// SJCL returns a string as error which means stack trace is missing so convert to an error object here
-				throw new Error(error.message);
+				throw new Error(`SJCL error: ${error.message}`);
 			}
 		}
 
@@ -348,7 +348,7 @@ class EncryptionService {
 				});
 			} catch (error) {
 				// SJCL returns a string as error which means stack trace is missing so convert to an error object here
-				throw new Error(error.message);
+				throw new Error(`SJCL error: ${error.message}`);
 			}
 		}