From 54224be8f207f5dee1d115cba658f622680a776e Mon Sep 17 00:00:00 2001 From: Niki Roo Date: Thu, 14 May 2020 13:25:10 +0200 Subject: [PATCH] merge from master --- library/WebLibrary.java | 3 +++ library/WebLibraryUrls.java | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/library/WebLibrary.java b/library/WebLibrary.java index 978dd9af..42f7ea5c 100644 --- a/library/WebLibrary.java +++ b/library/WebLibrary.java @@ -309,6 +309,9 @@ public class WebLibrary extends BasicLibrary { try { subPg = JsonIO.toProgress( new JSONObject(IOUtils.readSmallStream(in))); + pg.setName(subPg.getName()); + pg.setMinMax(subPg.getMin(), subPg.getMax()); + pg.setProgress(subPg.getProgress()); } catch (Exception e) { subPg = null; } finally { diff --git a/library/WebLibraryUrls.java b/library/WebLibraryUrls.java index 176b4ebc..5ec669fe 100644 --- a/library/WebLibraryUrls.java +++ b/library/WebLibraryUrls.java @@ -104,7 +104,8 @@ class WebLibraryUrls { static public boolean isSupportedUrl(String url) { return INDEX_URL.equals(url) || VERSION_URL.equals(url) || LOGOUT_URL.equals(url) || isViewUrl(url) || isStoryUrl(url) - || isListUrl(url) || isCoverUrl(url) || isImprtUrl(url); + || isListUrl(url) || isCoverUrl(url) || isImprtUrl(url) + || isDeleteUrl(url); } static public String getCoverUrlStory(String luid) { -- 2.27.0