1 files changed, 24 insertions, 38 deletions
diff --git a/apps/files_external/controller/storagescontroller.php b/apps/files_external/controller/storagescontroller.php
index 7efe7611407..ddd7fe6df16 100644
--- a/apps/files_external/controller/storagescontroller.php
+++ b/apps/files_external/controller/storagescontroller.php
@@ -242,44 +242,30 @@ abstract class StoragesController extends Controller {
 				$this->l10n->t('Insufficient data: %s', [$e->getMessage()])
 			);
 		} catch (StorageNotAvailableException $e) {
-			switch ($e->getCode()) {
-				case 1:
-					$storage->setStatus(
-						\OC_Mount_Config::STATUS_ERROR,
-						$this->l10n->t('%s', [$e->getMessage()])
-					);
-					break;
-				case 3:
-					$storage->setStatus(
-						\OC_Mount_Config::STATUS_INCOMPLETE_CONF,
-						$this->l10n->t('Incomplete configuration. %s', [$e->getMessage()])
-					);
-					break;
-				case 4:
-					$storage->setStatus(
-						\OC_Mount_Config::STATUS_UNAUTHORIZED,
-						$this->l10n->t('Unauthorized. %s', [$e->getMessage()])
-						$e->getMessage()
-					);
-					break;
-				case 5:
-					$storage->setStatus(
-						\OC_Mount_Config::STATUS_TIMEOUT,
-						$this->l10n->t('Timeout. %s', [$e->getMessage()])
-					);
-					break;
-				case 6:
-					$storage->setStatus(
-						\OC_Mount_Config::STATUS_NETWORK_ERROR,
-						$this->l10n->t('Network error. %s', [$e->getMessage()])
-					);
-					break;
-				default:
-					$storage->setStatus(
-						\OC_Mount_Config::STATUS_ERROR,
-						$this->l10n->t('%s', [$e->getMessage()])
-					);
-			}
+			$storage->setStatus(
+				\OC_Mount_Config::STATUS_ERROR,
+				$this->l10n->t('%s', [$e->getMessage()])
+			);
+		} catch (ExtStorageBadConfigException $e) {
+			$storage->setStatus(
+				$e->getCode(),
+				$this->l10n->t('%s', [$e->getMessage()])
+			);
+		} catch (ExtStorageAuthException $e) {
+			$storage->setStatus(
+				$e->getCode(),
+				$this->l10n->t('%s', [$e->getMessage()])
+			);
+		} catch (ExtStorageTimeoutException $e) {
+			$storage->setStatus(
+				$e->getCode(),
+				$this->l10n->t('%s', [$e->getMessage()])
+			);
+		} catch (ExtStorageConnectionException $e) {
+			$storage->setStatus(
+				$e->getCode(),
+				$this->l10n->t('%s', [$e->getMessage()])
+			);
 		} catch (\Exception $e) {
 			// FIXME: convert storage exceptions to StorageNotAvailableException
 			$storage->setStatus(