fix: LCP passphrase dialog wasa acompanied by confusing red toast not…

…ification to announce load failure (Fixes #1084 PR #1089)
edrlab · Jun 9, 2020 · 233283e · 233283e
1 parent 82fc65f
commit 233283e
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 14 deletions.
diff --git a/src/main/redux/sagas/publication/openPublication.ts b/src/main/redux/sagas/publication/openPublication.ts
@@ -22,6 +22,8 @@ import { Publication as R2Publication } from "@r2-shared-js/models/publication";
 const filename_ = "readium-desktop:main:redux:sagas:publication:open";
 const debug = debug_(filename_);
 
+export const ERROR_MESSAGE_ON_USERKEYCHECKREQUEST = "ERROR_MESSAGE_ON_USERKEYCHECKREQUEST";
+
 export function* streamerOpenPublicationAndReturnManifestUrl(pubId: string) {
 
     const publicationRepository = yield* callTyped(
@@ -106,7 +108,7 @@ export function* streamerOpenPublicationAndReturnManifestUrl(pubId: string) {
                         message,
                     ));
 
-                    throw new Error(message);
+                    throw ERROR_MESSAGE_ON_USERKEYCHECKREQUEST;
                 } catch (error) {
 
                     throw error;
@@ -187,7 +189,7 @@ export function* streamerOpenPublicationAndReturnManifestUrl(pubId: string) {
                         message,
                     ));
 
-                    throw new Error(message);
+                    throw ERROR_MESSAGE_ON_USERKEYCHECKREQUEST;
                 } catch (error) {
 
                     throw error;

diff --git a/src/main/redux/sagas/reader.ts b/src/main/redux/sagas/reader.ts
@@ -28,7 +28,9 @@ import { ObjectValues } from "readium-desktop/utils/object-keys-values";
 import { all, call, put, take } from "redux-saga/effects";
 import { types } from "util";
 
-import { streamerOpenPublicationAndReturnManifestUrl } from "./publication/openPublication";
+import {
+    ERROR_MESSAGE_ON_USERKEYCHECKREQUEST, streamerOpenPublicationAndReturnManifestUrl,
+} from "./publication/openPublication";
 
 // Logger
 const filename_ = "readium-desktop:main:saga:reader";
@@ -255,20 +257,24 @@ function* readerOpenRequest(action: readerActions.openRequest.TAction) {
 
     } catch (e) {
 
-        const translator = yield* callTyped(
-            () => diMainGet("translator"));
+        if (e.toString() !== ERROR_MESSAGE_ON_USERKEYCHECKREQUEST) {
+
+            const translator = yield* callTyped(
+                () => diMainGet("translator"));
+
+            if (types.isNativeError(e)) {
+                // disable "Error: "
+                e.name = "";
+            }
 
-        if (types.isNativeError(e)) {
-            // disable "Error: "
-            e.name = "";
+            yield put(
+                toastActions.openRequest.build(
+                    ToastType.Error,
+                    translator.translate("message.open.error", { err: e.toString() }),
+                ),
+            );
         }
 
-        yield put(
-            toastActions.openRequest.build(
-                ToastType.Error,
-                translator.translate("message.open.error", {err: e.toString()}),
-            ),
-        );
     }
 
     if (manifestUrl) {