diff --git a/assets/resources/application/ar.xml b/assets/resources/application/ar.xml index 022727ec0..799fb8c5b 100644 --- a/assets/resources/application/ar.xml +++ b/assets/resources/application/ar.xml @@ -1045,7 +1045,7 @@ - + diff --git a/assets/resources/application/be.xml b/assets/resources/application/be.xml index 8abd5749a..ec9f06dd3 100644 --- a/assets/resources/application/be.xml +++ b/assets/resources/application/be.xml @@ -1047,7 +1047,7 @@ - + diff --git a/assets/resources/application/ca.xml b/assets/resources/application/ca.xml index 74be765e4..c421d5a6b 100644 --- a/assets/resources/application/ca.xml +++ b/assets/resources/application/ca.xml @@ -1053,7 +1053,7 @@ - + diff --git a/assets/resources/application/cs.xml b/assets/resources/application/cs.xml index 5219584c1..172fe6a98 100644 --- a/assets/resources/application/cs.xml +++ b/assets/resources/application/cs.xml @@ -1056,7 +1056,7 @@ - + diff --git a/assets/resources/application/da.xml b/assets/resources/application/da.xml index d272e9887..248f611ce 100644 --- a/assets/resources/application/da.xml +++ b/assets/resources/application/da.xml @@ -1046,7 +1046,7 @@ - + diff --git a/assets/resources/application/de.xml b/assets/resources/application/de.xml index 7afa11d08..0a5d78188 100644 --- a/assets/resources/application/de.xml +++ b/assets/resources/application/de.xml @@ -1052,7 +1052,7 @@ - + diff --git a/assets/resources/application/el.xml b/assets/resources/application/el.xml index 15bf16f2a..369cb1970 100644 --- a/assets/resources/application/el.xml +++ b/assets/resources/application/el.xml @@ -1045,7 +1045,7 @@ - + diff --git a/assets/resources/application/en.xml b/assets/resources/application/en.xml index 08037ff4f..b546cc7db 100644 --- a/assets/resources/application/en.xml +++ b/assets/resources/application/en.xml @@ -1047,7 +1047,7 @@ - + diff --git a/assets/resources/application/en_US.xml b/assets/resources/application/en_US.xml index b7489cf6b..00f88c27d 100644 --- a/assets/resources/application/en_US.xml +++ b/assets/resources/application/en_US.xml @@ -1047,7 +1047,7 @@ - + diff --git a/assets/resources/application/es.xml b/assets/resources/application/es.xml index 6edfb8cc6..e8e7a7306 100644 --- a/assets/resources/application/es.xml +++ b/assets/resources/application/es.xml @@ -1053,7 +1053,7 @@ - + diff --git a/assets/resources/application/eu.xml b/assets/resources/application/eu.xml index 103244173..7524dc9e9 100644 --- a/assets/resources/application/eu.xml +++ b/assets/resources/application/eu.xml @@ -1047,7 +1047,7 @@ - + diff --git a/assets/resources/application/fa.xml b/assets/resources/application/fa.xml index ae619e0be..d043f9458 100644 --- a/assets/resources/application/fa.xml +++ b/assets/resources/application/fa.xml @@ -1046,7 +1046,7 @@ - + diff --git a/assets/resources/application/fr.xml b/assets/resources/application/fr.xml index 67d791766..2b1b79a08 100644 --- a/assets/resources/application/fr.xml +++ b/assets/resources/application/fr.xml @@ -1040,7 +1040,7 @@ - + diff --git a/assets/resources/application/gl.xml b/assets/resources/application/gl.xml index 0107cec27..513b35c89 100644 --- a/assets/resources/application/gl.xml +++ b/assets/resources/application/gl.xml @@ -1037,7 +1037,7 @@ - + diff --git a/assets/resources/application/hu.xml b/assets/resources/application/hu.xml index d70e324fe..ff3de24ca 100644 --- a/assets/resources/application/hu.xml +++ b/assets/resources/application/hu.xml @@ -1037,7 +1037,7 @@ - + diff --git a/assets/resources/application/it.xml b/assets/resources/application/it.xml index 5f64c8635..1c7b705a6 100644 --- a/assets/resources/application/it.xml +++ b/assets/resources/application/it.xml @@ -1039,7 +1039,7 @@ - + diff --git a/assets/resources/application/ja.xml b/assets/resources/application/ja.xml index 0e161e3c2..b26b1cae1 100644 --- a/assets/resources/application/ja.xml +++ b/assets/resources/application/ja.xml @@ -1047,7 +1047,7 @@ - + diff --git a/assets/resources/application/ko.xml b/assets/resources/application/ko.xml index 3218ae90d..376e38478 100644 --- a/assets/resources/application/ko.xml +++ b/assets/resources/application/ko.xml @@ -1047,7 +1047,7 @@ - + diff --git a/assets/resources/application/nb.xml b/assets/resources/application/nb.xml index ea13e6608..bec1c6567 100644 --- a/assets/resources/application/nb.xml +++ b/assets/resources/application/nb.xml @@ -1047,7 +1047,7 @@ - + diff --git a/assets/resources/application/nl.xml b/assets/resources/application/nl.xml index e4a529f80..2bb0478a4 100644 --- a/assets/resources/application/nl.xml +++ b/assets/resources/application/nl.xml @@ -1047,7 +1047,7 @@ - + diff --git a/assets/resources/application/pl.xml b/assets/resources/application/pl.xml index f44e04631..a519eb1ad 100644 --- a/assets/resources/application/pl.xml +++ b/assets/resources/application/pl.xml @@ -1037,7 +1037,7 @@ - + diff --git a/assets/resources/application/pt.xml b/assets/resources/application/pt.xml old mode 100755 new mode 100644 index 46f46a586..87b3007e1 --- a/assets/resources/application/pt.xml +++ b/assets/resources/application/pt.xml @@ -1048,7 +1048,7 @@ - + diff --git a/assets/resources/application/pt_BR.xml b/assets/resources/application/pt_BR.xml index ddbfbd05c..4218f7600 100644 --- a/assets/resources/application/pt_BR.xml +++ b/assets/resources/application/pt_BR.xml @@ -1048,7 +1048,7 @@ - + diff --git a/assets/resources/application/ro.xml b/assets/resources/application/ro.xml index ff60225ee..c1c779c6a 100644 --- a/assets/resources/application/ro.xml +++ b/assets/resources/application/ro.xml @@ -1073,7 +1073,7 @@ - + diff --git a/assets/resources/application/sr.xml b/assets/resources/application/sr.xml index f499c32c4..64b4fee4f 100644 --- a/assets/resources/application/sr.xml +++ b/assets/resources/application/sr.xml @@ -1047,7 +1047,7 @@ - + diff --git a/assets/resources/application/th.xml b/assets/resources/application/th.xml index f7b483f05..96d081eee 100644 --- a/assets/resources/application/th.xml +++ b/assets/resources/application/th.xml @@ -1037,7 +1037,7 @@ - + diff --git a/assets/resources/application/tr.xml b/assets/resources/application/tr.xml index 5760a1970..6a16af774 100644 --- a/assets/resources/application/tr.xml +++ b/assets/resources/application/tr.xml @@ -1047,7 +1047,7 @@ - + diff --git a/assets/resources/application/vi.xml b/assets/resources/application/vi.xml index c6213ff2c..dee2dfa60 100644 --- a/assets/resources/application/vi.xml +++ b/assets/resources/application/vi.xml @@ -1038,7 +1038,7 @@ - + diff --git a/assets/resources/application/zh.xml b/assets/resources/application/zh.xml index f4e67a3d4..6ea01d077 100644 --- a/assets/resources/application/zh.xml +++ b/assets/resources/application/zh.xml @@ -1037,7 +1037,7 @@ - + diff --git a/assets/resources/application/zh_TW.xml b/assets/resources/application/zh_TW.xml index f0fed945d..7f00fec5f 100644 --- a/assets/resources/application/zh_TW.xml +++ b/assets/resources/application/zh_TW.xml @@ -1037,7 +1037,7 @@ - + diff --git a/fbreader/app/src/main/java/org/geometerplus/fbreader/network/authentication/litres/LitResXMLReader.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/authentication/litres/LitResXMLReader.java index e1c9dbfa5..12544139c 100644 --- a/fbreader/app/src/main/java/org/geometerplus/fbreader/network/authentication/litres/LitResXMLReader.java +++ b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/authentication/litres/LitResXMLReader.java @@ -201,7 +201,7 @@ class LitResXMLReader extends LitResAuthenticationXMLReader { if (TAG_BOOK == tag) { myUrls.addInfo(new UrlInfo( UrlInfo.Type.SingleEntry, - "http://data.fbreader.org/catalogs/litres2/full.php5?id=" + myBookId, + "https://data.fbreader.org/catalogs/litres2/full.php5?id=" + myBookId, MimeType.APP_ATOM_XML_ENTRY )); Books.add(new OPDSBookItem( diff --git a/fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/OPDSConstants.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/OPDSConstants.java index c0977f813..6ba7f19be 100644 --- a/fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/OPDSConstants.java +++ b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/OPDSConstants.java @@ -23,9 +23,9 @@ import org.geometerplus.fbreader.network.atom.ATOMConstants; interface OPDSConstants extends ATOMConstants { // Feed level - String REL_BOOKSHELF = "http://data.fbreader.org/rel/bookshelf"; - String REL_RECOMMENDATIONS = "http://data.fbreader.org/rel/recommendations"; - String REL_TOPUP = "http://data.fbreader.org/rel/topup"; + String REL_BOOKSHELF = "https://data.fbreader.org/rel/bookshelf"; + String REL_RECOMMENDATIONS = "https://data.fbreader.org/rel/recommendations"; + String REL_TOPUP = "https://data.fbreader.org/rel/topup"; //String REL_SUBSCRIPTIONS = "http://opds-spec.org/subscriptions"; // Entry level / catalog types @@ -33,15 +33,15 @@ interface OPDSConstants extends ATOMConstants { // Entry level / acquisition links String REL_ACQUISITION_PREFIX = "http://opds-spec.org/acquisition"; - String REL_FBREADER_ACQUISITION_PREFIX = "http://data.fbreader.org/acquisition"; + String REL_FBREADER_ACQUISITION_PREFIX = "https://data.fbreader.org/acquisition"; String REL_ACQUISITION = "http://opds-spec.org/acquisition"; String REL_ACQUISITION_OPEN = "http://opds-spec.org/acquisition/open-access"; String REL_ACQUISITION_SAMPLE = "http://opds-spec.org/acquisition/sample"; String REL_ACQUISITION_BUY = "http://opds-spec.org/acquisition/buy"; //String REL_ACQUISITION_BORROW = "http://opds-spec.org/acquisition/borrow"; //String REL_ACQUISITION_SUBSCRIBE = "http://opds-spec.org/acquisition/subscribe"; - String REL_ACQUISITION_CONDITIONAL = "http://data.fbreader.org/acquisition/conditional"; - String REL_ACQUISITION_SAMPLE_OR_FULL = "http://data.fbreader.org/acquisition/sampleOrFull"; + String REL_ACQUISITION_CONDITIONAL = "https://data.fbreader.org/acquisition/conditional"; + String REL_ACQUISITION_SAMPLE_OR_FULL = "https://data.fbreader.org/acquisition/sampleOrFull"; // Entry level / other String REL_IMAGE_PREFIX = "http://opds-spec.org/image"; @@ -54,9 +54,9 @@ interface OPDSConstants extends ATOMConstants { String REL_REPLIES = "replies"; // Entry level / OPDS Link Relations - String REL_LINK_SIGN_IN = "http://data.fbreader.org/catalog/sign-in"; - String REL_LINK_SIGN_OUT = "http://data.fbreader.org/catalog/sign-out"; - String REL_LINK_SIGN_UP = "http://data.fbreader.org/catalog/sign-up"; - String REL_LINK_TOPUP = "http://data.fbreader.org/catalog/refill-account"; - String REL_LINK_RECOVER_PASSWORD = "http://data.fbreader.org/catalog/recover-password"; + String REL_LINK_SIGN_IN = "https://data.fbreader.org/catalog/sign-in"; + String REL_LINK_SIGN_OUT = "https://data.fbreader.org/catalog/sign-out"; + String REL_LINK_SIGN_UP = "https://data.fbreader.org/catalog/sign-up"; + String REL_LINK_TOPUP = "https://data.fbreader.org/catalog/refill-account"; + String REL_LINK_RECOVER_PASSWORD = "https://data.fbreader.org/catalog/recover-password"; } diff --git a/fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/OPDSLinkReader.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/OPDSLinkReader.java index aced66d0b..eb614d497 100644 --- a/fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/OPDSLinkReader.java +++ b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/OPDSLinkReader.java @@ -28,7 +28,7 @@ import org.geometerplus.zlibrary.core.network.*; import org.geometerplus.fbreader.network.*; public class OPDSLinkReader { - static final String CATALOGS_URL = "http://data.fbreader.org/catalogs/generic-2.0.xml"; + static final String CATALOGS_URL = "https://data.fbreader.org/catalogs/generic-2.0.xml"; static final String FILE_NAME = "fbreader_catalogs-" + CATALOGS_URL.substring(CATALOGS_URL.lastIndexOf("/") + 1);