yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-04 18:29:23 +02:00
Code Issues Releases Wiki Activity

better book network integration

Browse source
This commit is contained in:
Nikolay Pultsin 2015-03-27 18:48:11 +00:00
parent 7ee92ff51f
commit 423cd5eed4
35 changed files with 126 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

3
assets/resources/application/ar.xml
View file

@ -329,6 +329,9 @@
<node name="Preferences">
<node name="sync" value="Synchronisation" toBeTranslated="true">
<node name="summary" value="Book network settings" toBeTranslated="true"/>
<node name="site" value="Read more about synchronisation" toBeTranslated="true">
<node name="url" value="https://books.fbreader.org/help.html" toBeTranslated="true"/>
</node>
<node name="enable" value="Enable synchronisation" toBeTranslated="true">
<node name="summaryOn" value="Synchronise my library with FBReader book network server" toBeTranslated="true"/>
<node name="summaryOnWithAccount" value="Synchronise my library as %s" toBeTranslated="true"/>

3
assets/resources/application/be.xml
View file

@ -331,6 +331,9 @@
<node name="Preferences">
<node name="sync" value="Сынхранізацыя">
<node name="summary" value="Налады кніжнай сеткі"/>
<node name="site" value="Read more about synchronisation" toBeTranslated="true">
<node name="url" value="https://books.fbreader.org/help.html" toBeTranslated="true"/>
</node>
<node name="enable" value="Уключыць сынхранізацыю">
<node name="summaryOn" value="Сынхранізаваць маю бібліятэку з сэрвэрам кніжнай сеткі FBReader"/>
<node name="summaryOnWithAccount" value="Сынхранізаваць маю бібліятэку як %s"/>

3
assets/resources/application/bg.xml
View file

@ -337,6 +337,9 @@
<node name="Preferences">
<node name="sync" value="Synchronisation" toBeTranslated="true">
<node name="summary" value="Book network settings" toBeTranslated="true"/>
<node name="site" value="Read more about synchronisation" toBeTranslated="true">
<node name="url" value="https://books.fbreader.org/help.html" toBeTranslated="true"/>
</node>
<node name="enable" value="Enable synchronisation" toBeTranslated="true">
<node name="summaryOn" value="Synchronise my library with FBReader book network server" toBeTranslated="true"/>
<node name="summaryOnWithAccount" value="Synchronise my library as %s" toBeTranslated="true"/>

3
assets/resources/application/ca.xml
View file

@ -337,6 +337,9 @@
<node name="Preferences">
<node name="sync" value="Synchronisation" toBeTranslated="true">
<node name="summary" value="Book network settings" toBeTranslated="true"/>
<node name="site" value="Read more about synchronisation" toBeTranslated="true">
<node name="url" value="https://books.fbreader.org/help.html" toBeTranslated="true"/>
</node>
<node name="enable" value="Enable synchronisation" toBeTranslated="true">
<node name="summaryOn" value="Synchronise my library with FBReader book network server" toBeTranslated="true"/>
<node name="summaryOnWithAccount" value="Synchronise my library as %s" toBeTranslated="true"/>

3
assets/resources/application/cs.xml
View file

@ -340,6 +340,9 @@
<node name="Preferences">
<node name="sync" value="Synchronizace">
<node name="summary" value="Nastavení síťové knihovny"/>
<node name="site" value="Read more about synchronisation" toBeTranslated="true">
<node name="url" value="https://books.fbreader.org/help.html" toBeTranslated="true"/>
</node>
<node name="enable" value="Povolit synchronizaci">
<node name="summaryOn" value="Synchronizovat mou knihovnu se serverem síťové knihovny FBReaderu"/>
<node name="summaryOnWithAccount" value="Synchronizovat mou knihovnu jako %s"/>

3
assets/resources/application/da.xml
View file

@ -330,6 +330,9 @@
<node name="Preferences">
<node name="sync" value="Synchronisation" toBeTranslated="true">
<node name="summary" value="Book network settings" toBeTranslated="true"/>
<node name="site" value="Read more about synchronisation" toBeTranslated="true">
<node name="url" value="https://books.fbreader.org/help.html" toBeTranslated="true"/>
</node>
<node name="enable" value="Enable synchronisation" toBeTranslated="true">
<node name="summaryOn" value="Synchronise my library with FBReader book network server" toBeTranslated="true"/>
<node name="summaryOnWithAccount" value="Synchronise my library as %s" toBeTranslated="true"/>

3
assets/resources/application/de.xml
View file

@ -339,6 +339,9 @@
<node name="Preferences">
<node name="sync" value="Synchronisation">
<node name="summary" value="Bücher Netzwerk Einstellungen"/>
<node name="site" value="Read more about synchronisation" toBeTranslated="true">
<node name="url" value="https://books.fbreader.org/help.html" toBeTranslated="true"/>
</node>
<node name="enable" value="Synchronisation aktivieren">
<node name="summaryOn" value="Synchronisiere meine Bibliothek mit dem FBReader Bücher Netzwerkserver"/>
<node name="summaryOnWithAccount" value="Synchronisiere meine Bibliothek als %s"/>

3
assets/resources/application/el.xml
View file

@ -321,6 +321,9 @@
<node name="Preferences">
<node name="sync" value="Synchronisation" toBeTranslated="true">
<node name="summary" value="Book network settings" toBeTranslated="true"/>
<node name="site" value="Read more about synchronisation" toBeTranslated="true">
<node name="url" value="https://books.fbreader.org/help.html" toBeTranslated="true"/>
</node>
<node name="enable" value="Enable synchronisation" toBeTranslated="true">
<node name="summaryOn" value="Synchronise my library with FBReader book network server" toBeTranslated="true"/>
<node name="summaryOnWithAccount" value="Synchronise my library as %s" toBeTranslated="true"/>

9
assets/resources/application/en.xml
View file

@ -145,11 +145,11 @@
<node name="disableCatalog" value="Disable catalogue"/>
<node name="confirmQuestions">
<node name="read" value="Do you want to read local copy?"/>
<node name="download" value="Do you want to download this book?"/>
<node name="download" value="Do you want to download the book?"/>
<node name="readDemo" value="Do you want to read sample?"/>
<node name="downloadDemo" value="Do you want to download sample?"/>
<node name="buy" value="Do you want to buy this book? (%s)"/>
<node name="openInBrowser" value="Do you want to open this catalogue in browser?"/>
<node name="buy" value="Do you want to buy the book? (%s)"/>
<node name="openInBrowser" value="Do you want to open the link in browser?"/>
</node>
<node name="downloadingCatalogs" value="Downloading catalogues"/>
<!-- used as notification title -->
@ -331,6 +331,9 @@
<node name="Preferences">
<node name="sync" value="Synchronisation">
<node name="summary" value="Book network settings"/>
<node name="site" value="Read more about synchronisation">
<node name="url" value="https://books.fbreader.org/help.html"/>
</node>
<node name="enable" value="Enable synchronisation">
<node name="summaryOn" value="Synchronise my library with FBReader book network server"/>
<node name="summaryOnWithAccount" value="Synchronise my library as %s"/>

3
assets/resources/application/es.xml
View file

@ -336,6 +336,9 @@
<node name="Preferences">
<node name="sync" value="Synchronisation" toBeTranslated="true">
<node name="summary" value="Book network settings" toBeTranslated="true"/>
<node name="site" value="Read more about synchronisation" toBeTranslated="true">
<node name="url" value="https://books.fbreader.org/help.html" toBeTranslated="true"/>
</node>
<node name="enable" value="Enable synchronisation" toBeTranslated="true">
<node name="summaryOn" value="Synchronise my library with FBReader book network server" toBeTranslated="true"/>
<node name="summaryOnWithAccount" value="Synchronise my library as %s" toBeTranslated="true"/>

3
assets/resources/application/eu.xml
View file

@ -331,6 +331,9 @@
<node name="Preferences">
<node name="sync" value="Synchronisation" toBeTranslated="true">
<node name="summary" value="Book network settings" toBeTranslated="true"/>
<node name="site" value="Read more about synchronisation" toBeTranslated="true">
<node name="url" value="https://books.fbreader.org/help.html" toBeTranslated="true"/>
</node>
<node name="enable" value="Enable synchronisation" toBeTranslated="true">
<node name="summaryOn" value="Synchronise my library with FBReader book network server" toBeTranslated="true"/>
<node name="summaryOnWithAccount" value="Synchronise my library as %s" toBeTranslated="true"/>

3
assets/resources/application/fa.xml
View file

@ -330,6 +330,9 @@
<node name="Preferences">
<node name="sync" value="همگام سازی">
<node name="summary" value="تنظیمات شبکه کتاب"/>
<node name="site" value="Read more about synchronisation" toBeTranslated="true">
<node name="url" value="https://books.fbreader.org/help.html" toBeTranslated="true"/>
</node>
<node name="enable" value="فعالسازی همگامسازی">
<node name="summaryOn" value="هماهنگی کتابخانه من با سرور شبکه کتاب برنامه"/>
<node name="summaryOnWithAccount" value="هماهنگی کتابخانه من بعنوان %s"/>

3
assets/resources/application/fr.xml
View file

@ -324,6 +324,9 @@
<node name="Preferences">
<node name="sync" value="Synchronisation">
<node name="summary" value="Paramètres réseaux des livres"/>
<node name="site" value="Read more about synchronisation" toBeTranslated="true">
<node name="url" value="https://books.fbreader.org/help.html" toBeTranslated="true"/>
</node>
<node name="enable" value="Activer synchronisation">
<node name="summaryOn" value="Synchroniser ma librairie avec le serveur de livres de FBReader"/>
<node name="summaryOnWithAccount" value="Synchroniser ma librairie en tant que %s"/>

3
assets/resources/application/gl.xml
View file

@ -321,6 +321,9 @@
<node name="Preferences">
<node name="sync" value="Synchronisation" toBeTranslated="true">
<node name="summary" value="Book network settings" toBeTranslated="true"/>
<node name="site" value="Read more about synchronisation" toBeTranslated="true">
<node name="url" value="https://books.fbreader.org/help.html" toBeTranslated="true"/>
</node>
<node name="enable" value="Enable synchronisation" toBeTranslated="true">
<node name="summaryOn" value="Synchronise my library with FBReader book network server" toBeTranslated="true"/>
<node name="summaryOnWithAccount" value="Synchronise my library as %s" toBeTranslated="true"/>

3
assets/resources/application/hu.xml
View file

@ -321,6 +321,9 @@
<node name="Preferences">
<node name="sync" value="Synchronisation" toBeTranslated="true">
<node name="summary" value="Book network settings" toBeTranslated="true"/>
<node name="site" value="Read more about synchronisation" toBeTranslated="true">
<node name="url" value="https://books.fbreader.org/help.html" toBeTranslated="true"/>
</node>
<node name="enable" value="Enable synchronisation" toBeTranslated="true">
<node name="summaryOn" value="Synchronise my library with FBReader book network server" toBeTranslated="true"/>
<node name="summaryOnWithAccount" value="Synchronise my library as %s" toBeTranslated="true"/>

3
assets/resources/application/hy.xml
View file

@ -336,6 +336,9 @@
<node name="Preferences">
<node name="sync" value="Synchronisation" toBeTranslated="true">
<node name="summary" value="Book network settings" toBeTranslated="true"/>
<node name="site" value="Read more about synchronisation" toBeTranslated="true">
<node name="url" value="https://books.fbreader.org/help.html" toBeTranslated="true"/>
</node>
<node name="enable" value="Enable synchronisation" toBeTranslated="true">
<node name="summaryOn" value="Synchronise my library with FBReader book network server" toBeTranslated="true"/>
<node name="summaryOnWithAccount" value="Synchronise my library as %s" toBeTranslated="true"/>

3
assets/resources/application/it.xml
View file

@ -322,6 +322,9 @@
<node name="Preferences">
<node name="sync" value="Synchronisation" toBeTranslated="true">
<node name="summary" value="Book network settings" toBeTranslated="true"/>
<node name="site" value="Read more about synchronisation" toBeTranslated="true">
<node name="url" value="https://books.fbreader.org/help.html" toBeTranslated="true"/>
</node>
<node name="enable" value="Enable synchronisation" toBeTranslated="true">
<node name="summaryOn" value="Synchronise my library with FBReader book network server" toBeTranslated="true"/>
<node name="summaryOnWithAccount" value="Synchronise my library as %s" toBeTranslated="true"/>

3
assets/resources/application/ja.xml
View file

@ -331,6 +331,9 @@
<node name="Preferences">
<node name="sync" value="シンクロ">
<node name="summary" value="ブックネットワークの設定"/>
<node name="site" value="Read more about synchronisation" toBeTranslated="true">
<node name="url" value="https://books.fbreader.org/help.html" toBeTranslated="true"/>
</node>
<node name="enable" value="シンクロを有効化">
<node name="summaryOn" value="ライブラリを FBReader ブックネットワークサーバとシンクロする"/>
<node name="summaryOnWithAccount" value="ライブラリを %s としてシンクロする"/>

3
assets/resources/application/ka.xml
View file

@ -336,6 +336,9 @@
<node name="Preferences">
<node name="sync" value="Synchronisation" toBeTranslated="true">
<node name="summary" value="Book network settings" toBeTranslated="true"/>
<node name="site" value="Read more about synchronisation" toBeTranslated="true">
<node name="url" value="https://books.fbreader.org/help.html" toBeTranslated="true"/>
</node>
<node name="enable" value="Enable synchronisation" toBeTranslated="true">
<node name="summaryOn" value="Synchronise my library with FBReader book network server" toBeTranslated="true"/>
<node name="summaryOnWithAccount" value="Synchronise my library as %s" toBeTranslated="true"/>

3
assets/resources/application/nb.xml
View file

@ -331,6 +331,9 @@
<node name="Preferences">
<node name="sync" value="Synchronisation" toBeTranslated="true">
<node name="summary" value="Book network settings" toBeTranslated="true"/>
<node name="site" value="Read more about synchronisation" toBeTranslated="true">
<node name="url" value="https://books.fbreader.org/help.html" toBeTranslated="true"/>
</node>
<node name="enable" value="Enable synchronisation" toBeTranslated="true">
<node name="summaryOn" value="Synchronise my library with FBReader book network server" toBeTranslated="true"/>
<node name="summaryOnWithAccount" value="Synchronise my library as %s" toBeTranslated="true"/>

3
assets/resources/application/nl.xml
View file

@ -331,6 +331,9 @@
<node name="Preferences">
<node name="sync" value="Synchronisatie">
<node name="summary" value="Boekennetwerk"/>
<node name="site" value="Read more about synchronisation" toBeTranslated="true">
<node name="url" value="https://books.fbreader.org/help.html" toBeTranslated="true"/>
</node>
<node name="enable" value="Synchronisatie inschakelen">
<node name="summaryOn" value="Synchroniseer mijn bibliotheek met het FBReader boekennetwerk"/>
<node name="summaryOnWithAccount" value="Synchroniseer mijn bibliotheek als %s"/>

3
assets/resources/application/pl.xml
View file

@ -321,6 +321,9 @@
<node name="Preferences">
<node name="sync" value="Synchronisation" toBeTranslated="true">
<node name="summary" value="Book network settings" toBeTranslated="true"/>
<node name="site" value="Read more about synchronisation" toBeTranslated="true">
<node name="url" value="https://books.fbreader.org/help.html" toBeTranslated="true"/>
</node>
<node name="enable" value="Enable synchronisation" toBeTranslated="true">
<node name="summaryOn" value="Synchronise my library with FBReader book network server" toBeTranslated="true"/>
<node name="summaryOnWithAccount" value="Synchronise my library as %s" toBeTranslated="true"/>

3
assets/resources/application/pt.xml
View file

@ -335,6 +335,9 @@
<node name="Preferences" value="Preferências">
<node name="sync" value="Sincronização">
<node name="summary" value="Marcar opções de rede"/>
<node name="site" value="Read more about synchronisation" toBeTranslated="true">
<node name="url" value="https://books.fbreader.org/help.html" toBeTranslated="true"/>
</node>
<node name="enable" value="Ativar sicronização">
<node name="summaryOn" value="Sincronizar a minha biblioteca com a rede de servidores de livros do FBReader"/>
<node name="summaryOnWithAccount" value="Sincronizar a minha biblioteca como %s"/>

3
assets/resources/application/ro.xml
View file

@ -323,6 +323,9 @@
<node name="Preferences">
<node name="sync" value="Sincronizare">
<node name="summary" value="Setarile retelei de carti"/>
<node name="site" value="Read more about synchronisation" toBeTranslated="true">
<node name="url" value="https://books.fbreader.org/help.html" toBeTranslated="true"/>
</node>
<node name="enable" value="Activeaza sincronizarea">
<node name="summaryOn" value="Sincronizeaza-mi libraria cu serverul FBReader"/>
<node name="summaryOnWithAccount" value="Sincronizeaza-mi libraria ca %s"/>

5
assets/resources/application/ru.xml
View file

@ -153,7 +153,7 @@
<node name="readDemo" value="Вы хотите открыть фрагмент?"/>
<node name="downloadDemo" value="Вы хотите скачать фрагмент?"/>
<node name="buy" value="Вы хотите купить эту книгу? (%s)"/>
<node name="openInBrowser" value="Вы хотите открыть этот каталог в браузере?"/>
<node name="openInBrowser" value="Вы хотите открыть эту ссылку в браузере?"/>
</node>
<node name="downloadingCatalogs" value="Идёт загрузка каталогов"/>
<!-- used as notification title -->
@ -336,6 +336,9 @@
<node name="Preferences">
<node name="sync" value="Синхронизация">
<node name="summary" value="Настройки книжной сети"/>
<node name="site" value="Как работает синхронизация FBReader">
<node name="url" value="https://books.fbreader.org/help.html"/>
</node>
<node name="enable" value="Включить синхронизацию">
<node name="summaryOn" value="Синхронизировать мою библиотеку с сервером книжной сети"/>
<node name="summaryOnWithAccount" value="Синхронизировать библиотеку от имени %s"/>

3
assets/resources/application/sr.xml
View file

@ -331,6 +331,9 @@
<node name="Preferences">
<node name="sync" value="Synchronisation" toBeTranslated="true">
<node name="summary" value="Book network settings" toBeTranslated="true"/>
<node name="site" value="Read more about synchronisation" toBeTranslated="true">
<node name="url" value="https://books.fbreader.org/help.html" toBeTranslated="true"/>
</node>
<node name="enable" value="Enable synchronisation" toBeTranslated="true">
<node name="summaryOn" value="Synchronise my library with FBReader book network server" toBeTranslated="true"/>
<node name="summaryOnWithAccount" value="Synchronise my library as %s" toBeTranslated="true"/>

3
assets/resources/application/th.xml
View file

@ -321,6 +321,9 @@
<node name="Preferences">
<node name="sync" value="Synchronisation" toBeTranslated="true">
<node name="summary" value="Book network settings" toBeTranslated="true"/>
<node name="site" value="Read more about synchronisation" toBeTranslated="true">
<node name="url" value="https://books.fbreader.org/help.html" toBeTranslated="true"/>
</node>
<node name="enable" value="Enable synchronisation" toBeTranslated="true">
<node name="summaryOn" value="Synchronise my library with FBReader book network server" toBeTranslated="true"/>
<node name="summaryOnWithAccount" value="Synchronise my library as %s" toBeTranslated="true"/>

3
assets/resources/application/tr.xml
View file

@ -331,6 +331,9 @@
<node name="Preferences">
<node name="sync" value="Synchronisation" toBeTranslated="true">
<node name="summary" value="Book network settings" toBeTranslated="true"/>
<node name="site" value="Read more about synchronisation" toBeTranslated="true">
<node name="url" value="https://books.fbreader.org/help.html" toBeTranslated="true"/>
</node>
<node name="enable" value="Enable synchronisation" toBeTranslated="true">
<node name="summaryOn" value="Synchronise my library with FBReader book network server" toBeTranslated="true"/>
<node name="summaryOnWithAccount" value="Synchronise my library as %s" toBeTranslated="true"/>

3
assets/resources/application/uk.xml
View file

@ -321,6 +321,9 @@
<node name="Preferences">
<node name="sync" value="Synchronisation" toBeTranslated="true">
<node name="summary" value="Book network settings" toBeTranslated="true"/>
<node name="site" value="Read more about synchronisation" toBeTranslated="true">
<node name="url" value="https://books.fbreader.org/help.html" toBeTranslated="true"/>
</node>
<node name="enable" value="Enable synchronisation" toBeTranslated="true">
<node name="summaryOn" value="Synchronise my library with FBReader book network server" toBeTranslated="true"/>
<node name="summaryOnWithAccount" value="Synchronise my library as %s" toBeTranslated="true"/>

3
assets/resources/application/vi.xml
View file

@ -321,6 +321,9 @@
<node name="Preferences">
<node name="sync" value="Synchronisation" toBeTranslated="true">
<node name="summary" value="Book network settings" toBeTranslated="true"/>
<node name="site" value="Read more about synchronisation" toBeTranslated="true">
<node name="url" value="https://books.fbreader.org/help.html" toBeTranslated="true"/>
</node>
<node name="enable" value="Enable synchronisation" toBeTranslated="true">
<node name="summaryOn" value="Synchronise my library with FBReader book network server" toBeTranslated="true"/>
<node name="summaryOnWithAccount" value="Synchronise my library as %s" toBeTranslated="true"/>

3
assets/resources/application/zh.xml
View file

@ -321,6 +321,9 @@
<node name="Preferences">
<node name="sync" value="Synchronisation" toBeTranslated="true">
<node name="summary" value="Book network settings" toBeTranslated="true"/>
<node name="site" value="Read more about synchronisation" toBeTranslated="true">
<node name="url" value="https://books.fbreader.org/help.html" toBeTranslated="true"/>
</node>
<node name="enable" value="Enable synchronisation" toBeTranslated="true">
<node name="summaryOn" value="Synchronise my library with FBReader book network server" toBeTranslated="true"/>
<node name="summaryOnWithAccount" value="Synchronise my library as %s" toBeTranslated="true"/>

3
assets/resources/application/zh_TW.xml
View file

@ -321,6 +321,9 @@
<node name="Preferences">
<node name="sync" value="Synchronisation" toBeTranslated="true">
<node name="summary" value="Book network settings" toBeTranslated="true"/>
<node name="site" value="Read more about synchronisation" toBeTranslated="true">
<node name="url" value="https://books.fbreader.org/help.html" toBeTranslated="true"/>
</node>
<node name="enable" value="Enable synchronisation" toBeTranslated="true">
<node name="summaryOn" value="Synchronise my library with FBReader book network server" toBeTranslated="true"/>
<node name="summaryOnWithAccount" value="Synchronise my library as %s" toBeTranslated="true"/>

8
src/org/geometerplus/android/fbreader/network/Util.java
View file

@ -99,6 +99,14 @@ public abstract class Util implements UserRegistrationConstants {
activity.startActivity(intent);
}
public static boolean isOurLink(String url) {
try {
return Uri.parse(url).getHost().endsWith(".fbreader.org");
} catch (Throwable t) {
return false;
}
}
public static void openInBrowser(Activity activity, String url) {
if (url != null) {
url = NetworkLibrary.Instance().rewriteUrl(url, true);

4
src/org/geometerplus/android/fbreader/network/action/OpenInBrowserAction.java
View file

@ -55,6 +55,9 @@ public class OpenInBrowserAction extends CatalogAction {
final String url =
((NetworkURLCatalogItem)((NetworkCatalogTree)tree).Item).getUrl(UrlInfo.Type.HtmlPage);
if (Util.isOurLink(url)) {
Util.openInBrowser(myActivity, url);
} else {
final ZLResource buttonResource = ZLResource.resource("dialog").getResource("button");
final String message = NetworkLibrary.resource().getResource("confirmQuestions").getResource("openInBrowser").getValue();
new AlertDialog.Builder(myActivity)
@ -70,3 +73,4 @@ public class OpenInBrowserAction extends CatalogAction {
.create().show();
}
}
}

1
src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java
View file

@ -155,6 +155,7 @@ public class PreferenceActivity extends ZLPreferenceActivity {
return syncOptions.Enabled.getValue();
}
};
syncScreen.addPreference(new UrlPreference(this, syncScreen.Resource, "site"));
syncScreen.addPreference(new ZLCheckBoxPreference(
this, syncScreen.Resource.getResource("enable")
) {