Added a message box and improved error message for unlocking process.

Author: imgrant

debian/changelog

@@ -1,4 +1,4 @@
-openmediavault-luksencryption (1.3.1) UNRELEASED; urgency=medium
+openmediavault-luksencryption (1.3.2) UNRELEASED; urgency=medium
 
   * Added check on matching UUID for header restore function (with override).
   * Added test passphrase method that reports which keyslot was unlocked.
@@ -9,8 +9,9 @@ openmediavault-luksencryption (1.3.1) UNRELEASED; urgency=medium
   * Add icons to keys and header sub-menus items.
   * Added kill slot functionality.
   * Added missing gettext() for strings that need translation.
+  * Improve UI notification for locking.
 
- -- OpenMediaVault Plugin Developers <plugins@omv-extras.org>  Thu, 12 Nov 2015 15:04:12 +0000
+ -- OpenMediaVault Plugin Developers <plugins@omv-extras.org>  Thu, 12 Nov 2015 15:54:19 +0000
 
 openmediavault-luksencryption (1.1.0) unstable; urgency=medium
 

usr/share/openmediavault/engined/rpc/luks.inc

@@ -469,7 +469,10 @@ class OMVLuksContainer extends OMVStorageDeviceAbstract {
                         escapeshellarg($this->getDecryptedName()));
         @OMVUtil::exec($cmd, $output, $result);
         if ($result !== 0) {
-            $this->setLastError($output);
+            // Just report the last line of the output to avoid, e.g. repeated
+            // 'device-mapper: remove ioctl failed: Device or resource busy'
+            // messages. The last line says, e.g. 'Device is still in use'.
+            $this->setLastError(end($output));
             return FALSE;
         }
         $this->refresh();

usr/share/php/openmediavault/luks.inc

@@ -1093,13 +1093,21 @@ Ext.define("OMV.module.admin.storage.luks.Containers", {
         var me = this;
         var record = me.getSelected();
         var df = record.get("devicefile");
+        // Display waiting dialog
+        OMV.MessageBox.wait(null, _("Locking device ..."));
         // Execute RPC.
         OMV.Rpc.request({
             scope: me,
             callback: function(df, success, response) {
-                this.doReload();
+                OMV.MessageBox.updateProgress(1);
+                OMV.MessageBox.hide();
+                if (success) {
+                    this.doReload();
+                } else {
+                  OMV.MessageBox.error(null, response);
+                }
             },
-            relayErrors: false,
+            relayErrors: true,
             rpcData: {
                 service: "LuksMgmt",
                 method: "closeContainer",