mirror of
https://github.com/geometer/FBReaderJ.git
synced 2025-10-03 17:59:33 +02:00
authorization on enabling sync
This commit is contained in:
Nikolay Pultsin
parent
7fee481e47
commit
913a14256a
34 changed files with 69 additions and 18 deletions
|
|
@ -848,6 +848,7 @@
|
|||
<node name="message" value="الملف موجود مسبقا، هل تريد إعادة تحميله؟"/>
|
||||
</node>
|
||||
<node name="waitMessage">
|
||||
<node name="tryConnect" value="Trying to connect. Please, wait…" toBeTranslated="true"/>
|
||||
<node name="downloadingFile" value="تحميل كتاب %s"/>
|
||||
<node name="search" value="جاري البحث..."/>
|
||||
<node name="loadInfo" value="جاري جمع معلومات حول الكتاب..."/>
|
||||
|
|
|
|||
|
|
@ -856,6 +856,7 @@
|
|||
<node name="message" value="Файл ужо існуе. Перазладаваць?"/>
|
||||
</node>
|
||||
<node name="waitMessage">
|
||||
<node name="tryConnect" value="Trying to connect. Please, wait…" toBeTranslated="true"/>
|
||||
<node name="downloadingFile" value="Зладаваньне кнігі %s"/>
|
||||
<node name="search" value="Пошук. Калі ласка, пачакайце…"/>
|
||||
<node name="loadInfo" value="Ладаваньне інфармацыі. Калі ласка, пачакайце…"/>
|
||||
|
|
|
|||
|
|
@ -856,6 +856,7 @@
|
|||
<node name="message" value="Съществуващ файл. Презаписване?"/>
|
||||
</node>
|
||||
<node name="waitMessage">
|
||||
<node name="tryConnect" value="Trying to connect. Please, wait…" toBeTranslated="true"/>
|
||||
<node name="downloadingFile" value="Сваляне на книгата %s"/>
|
||||
<node name="search" value="Търсене. Моля, изчакайте…"/>
|
||||
<node name="loadInfo" value="Зареждане. Моля, изчакайте…"/>
|
||||
|
|
|
|||
|
|
@ -856,6 +856,7 @@
|
|||
<node name="message" value="El archivo ya existe. ¿Volver a descargarlo?" toBeTranslated="true"/>
|
||||
</node>
|
||||
<node name="waitMessage">
|
||||
<node name="tryConnect" value="Trying to connect. Please, wait…" toBeTranslated="true"/>
|
||||
<node name="downloadingFile" value="Descargando libro %s" toBeTranslated="true"/>
|
||||
<node name="search" value="Buscando. Por favor, espere…" toBeTranslated="true"/>
|
||||
<node name="loadInfo" value="Cargando información. Por favor, espere…" toBeTranslated="true"/>
|
||||
|
|
|
|||
|
|
@ -859,6 +859,7 @@
|
|||
<node name="message" value="Soubor již existuje. Stáhnout ho znovu?"/>
|
||||
</node>
|
||||
<node name="waitMessage">
|
||||
<node name="tryConnect" value="Trying to connect. Please, wait…" toBeTranslated="true"/>
|
||||
<node name="downloadingFile" value="Stahování knihy %s"/>
|
||||
<node name="search" value="Vyhledávání. Čekejte…"/>
|
||||
<node name="loadInfo" value="Načítání informací. Čekejte…"/>
|
||||
|
|
|
|||
|
|
@ -850,6 +850,7 @@
|
|||
<node name="message" value="Filen findes allerede. Overfør igen?"/>
|
||||
</node>
|
||||
<node name="waitMessage">
|
||||
<node name="tryConnect" value="Trying to connect. Please, wait…" toBeTranslated="true"/>
|
||||
<node name="downloadingFile" value="Overfør bog %s"/>
|
||||
<node name="search" value="Søger. Vent venligst..."/>
|
||||
<node name="loadInfo" value="Indlæser oplysninger. Vent venligst..."/>
|
||||
|
|
|
|||
|
|
@ -855,6 +855,7 @@
|
|||
<node name="message" value="Datei existiert bereits. Erneut herunterladen?"/>
|
||||
</node>
|
||||
<node name="waitMessage">
|
||||
<node name="tryConnect" value="Trying to connect. Please, wait…" toBeTranslated="true"/>
|
||||
<node name="downloadingFile" value="Buch wird geladen %s"/>
|
||||
<node name="search" value="Suche läuft. Bitte warten…"/>
|
||||
<node name="loadInfo" value="Information wird geladen. Bitte warten…"/>
|
||||
|
|
|
|||
|
|
@ -848,6 +848,7 @@
|
|||
<node name="message" value="Το αρχείο υπα΄ρχει ήδη. Λήψη ξανά?"/>
|
||||
</node>
|
||||
<node name="waitMessage">
|
||||
<node name="tryConnect" value="Trying to connect. Please, wait…" toBeTranslated="true"/>
|
||||
<node name="downloadingFile" value="Η λήψη του βιβλίου ξεκίνησε %s"/>
|
||||
<node name="search" value="Η ανάζητηση εκτελείτε. Παρακαλώ περιμένετε…"/>
|
||||
<node name="loadInfo" value="Η πληροφορία φορτώνεται. Παρακαλώ περιμένετε…"/>
|
||||
|
|
|
|||
|
|
@ -850,6 +850,7 @@
|
|||
<node name="message" value="File already exists. Redownload?"/>
|
||||
</node>
|
||||
<node name="waitMessage">
|
||||
<node name="tryConnect" value="Trying to connect. Please, wait…"/>
|
||||
<node name="downloadingFile" value="Downloading book %s"/>
|
||||
<node name="search" value="Searching. Please, wait…"/>
|
||||
<node name="loadInfo" value="Loading information. Please, wait…"/>
|
||||
|
|
|
|||
|
|
@ -855,6 +855,7 @@
|
|||
<node name="message" value="El archivo ya existe. ¿Volver a descargarlo?"/>
|
||||
</node>
|
||||
<node name="waitMessage">
|
||||
<node name="tryConnect" value="Trying to connect. Please, wait…" toBeTranslated="true"/>
|
||||
<node name="downloadingFile" value="Descargando libro %s"/>
|
||||
<node name="search" value="Buscando. Por favor, espere…"/>
|
||||
<node name="loadInfo" value="Cargando información. Por favor, espere…"/>
|
||||
|
|
|
|||
|
|
@ -824,6 +824,11 @@
|
|||
<node name="refresh" value="Freskatu"/>
|
||||
<node name="authorise" value="Baimendu"/>
|
||||
<node name="resetPosition" value="Berrezarri posizioa"/>
|
||||
<node name="sendReport" value="Send report" toBeTranslated="true"/>
|
||||
<node name="addToFavorites" value="Add to favorites" toBeTranslated="true"/>
|
||||
<node name="removeFromFavorites" value="Remove from favorites" toBeTranslated="true"/>
|
||||
<node name="markAsRead" value="Mark as read" toBeTranslated="true"/>
|
||||
<node name="markAsUnread" value="Mark as unread" toBeTranslated="true"/>
|
||||
<node name="enterPosition" value="Idatzi orri zenbakia"/>
|
||||
<node name="sendReport" value="Bidali txostena"/>
|
||||
<node name="addToFavorites" value="Gehitu gogokoetara"/>
|
||||
|
|
@ -851,6 +856,7 @@
|
|||
<node name="message" value="Fitxategia dagoeneko badago. Berriro deskargatu?"/>
|
||||
</node>
|
||||
<node name="waitMessage">
|
||||
<node name="tryConnect" value="Trying to connect. Please, wait…" toBeTranslated="true"/>
|
||||
<node name="downloadingFile" value="Deskargatzen liburua %s"/>
|
||||
<node name="search" value="Bilatzen. Itxaron, mesedez…"/>
|
||||
<node name="loadInfo" value="Informazioa kargatzen. Itxaron mesedez…"/>
|
||||
|
|
|
|||
|
|
@ -850,6 +850,7 @@
|
|||
<node name="message" value="فايل در ديسك موجود است. مجددا دانلود شود؟"/>
|
||||
</node>
|
||||
<node name="waitMessage">
|
||||
<node name="tryConnect" value="Trying to connect. Please, wait…" toBeTranslated="true"/>
|
||||
<node name="downloadingFile" value="دانلود كتاب %s"/>
|
||||
<node name="search" value="در حال جستجو. لطفاً صبر كنيد..."/>
|
||||
<node name="loadInfo" value="درحال بارگذاري اطلاعات. لطفاً صبر كنيد..."/>
|
||||
|
|
|
|||
|
|
@ -843,6 +843,7 @@
|
|||
<node name="message" value="Le fichier existe déjà. Le re-télécharger ?"/>
|
||||
</node>
|
||||
<node name="waitMessage">
|
||||
<node name="tryConnect" value="Trying to connect. Please, wait…" toBeTranslated="true"/>
|
||||
<node name="downloadingFile" value="Téléchargement de %s"/>
|
||||
<node name="search" value="Recherche en cours, veuillez patienter…"/>
|
||||
<node name="loadInfo" value="Chargement des infos, veuillez patienter…"/>
|
||||
|
|
|
|||
|
|
@ -840,6 +840,7 @@
|
|||
<node name="message" value="O ficheiro xa existe. Volver a descargalo?"/>
|
||||
</node>
|
||||
<node name="waitMessage">
|
||||
<node name="tryConnect" value="Trying to connect. Please, wait…" toBeTranslated="true"/>
|
||||
<node name="downloadingFile" value="Descargando o libro %s"/>
|
||||
<node name="search" value="Buscando. Agarde…"/>
|
||||
<node name="loadInfo" value="Loading information. Please, wait…" toBeTranslated="true"/>
|
||||
|
|
|
|||
|
|
@ -840,6 +840,7 @@
|
|||
<node name="message" value="A fájl már létezik. Újra letölti?"/>
|
||||
</node>
|
||||
<node name="waitMessage">
|
||||
<node name="tryConnect" value="Trying to connect. Please, wait…" toBeTranslated="true"/>
|
||||
<node name="downloadingFile" value="Könyv letöltése %s"/>
|
||||
<node name="search" value="Keresés. Egy kis türelmet…"/>
|
||||
<node name="loadInfo" value="Információ letöltése. Egy kis türelmet…"/>
|
||||
|
|
|
|||
|
|
@ -855,6 +855,7 @@
|
|||
<node name="message" value="Նիշքն արդեն իսկ սարքավորումում է, կրկի՞ն բեռնել։"/>
|
||||
</node>
|
||||
<node name="waitMessage">
|
||||
<node name="tryConnect" value="Trying to connect. Please, wait…" toBeTranslated="true"/>
|
||||
<node name="downloadingFile" value="Բեռնվում է %s գիրքը"/>
|
||||
<node name="search" value="Որոնվում է, սպասեք..."/>
|
||||
<node name="loadInfo" value="Տվյալները բեռնվում են, սպասեք..."/>
|
||||
|
|
|
|||
|
|
@ -841,6 +841,7 @@
|
|||
<node name="message" value="File già esistente. Riscaricare?"/>
|
||||
</node>
|
||||
<node name="waitMessage">
|
||||
<node name="tryConnect" value="Trying to connect. Please, wait…" toBeTranslated="true"/>
|
||||
<node name="downloadingFile" value="Scaricamento libro %s"/>
|
||||
<node name="search" value="Ricerca. Attendere prego…"/>
|
||||
<node name="loadInfo" value="Caricamento informazioni. Si prega di attendere …"/>
|
||||
|
|
|
|||
|
|
@ -855,6 +855,7 @@
|
|||
<node name="message" value="ფაილი უკვე არის მოწყობილობაში. ახლიდან გადმოიწეროს?"/>
|
||||
</node>
|
||||
<node name="waitMessage">
|
||||
<node name="tryConnect" value="Trying to connect. Please, wait…" toBeTranslated="true"/>
|
||||
<node name="downloadingFile" value="იტვირთება წიგნი %s"/>
|
||||
<node name="search" value="მიმდინარეობს ძებნა. გთხოვთ, დაიცადოთ…"/>
|
||||
<node name="loadInfo" value="იტვირთება ინფორმაცია. გთხოვთ, დაიცადოთ…"/>
|
||||
|
|
|
|||
|
|
@ -850,6 +850,7 @@
|
|||
<node name="message" value="Filen finnes allerede. Last ned på nytt?"/>
|
||||
</node>
|
||||
<node name="waitMessage">
|
||||
<node name="tryConnect" value="Trying to connect. Please, wait…" toBeTranslated="true"/>
|
||||
<node name="downloadingFile" value="Laster ned boken %s"/>
|
||||
<node name="search" value="Søker. Vennligst vent…"/>
|
||||
<node name="loadInfo" value="Laster informasjon. Vennligst vent…"/>
|
||||
|
|
|
|||
|
|
@ -850,6 +850,7 @@
|
|||
<node name="message" value="Bestand bestaat al. Opnieuw downloaden?"/>
|
||||
</node>
|
||||
<node name="waitMessage">
|
||||
<node name="tryConnect" value="Trying to connect. Please, wait…" toBeTranslated="true"/>
|
||||
<node name="downloadingFile" value="Boek %s wordt gedownload"/>
|
||||
<node name="search" value="Bezig met zoeken. Een ogenblik…"/>
|
||||
<node name="loadInfo" value="Informatie wordt geladen. Een ogenblik…"/>
|
||||
|
|
|
|||
|
|
@ -840,6 +840,7 @@
|
|||
<node name="message" value="Plik już istnieje. Pobrać ponownie?"/>
|
||||
</node>
|
||||
<node name="waitMessage">
|
||||
<node name="tryConnect" value="Trying to connect. Please, wait…" toBeTranslated="true"/>
|
||||
<node name="downloadingFile" value="Pobieranie książki %s"/>
|
||||
<node name="search" value="Wyszukiwanie. Proszę czekać…"/>
|
||||
<node name="loadInfo" value="Wczytywanie informacji. Proszę czekać…"/>
|
||||
|
|
|
|||
|
|
@ -852,6 +852,7 @@
|
|||
<node name="message" value="O arquivo já existe. Você quer descarregá-lo novamente?"/>
|
||||
</node>
|
||||
<node name="waitMessage" value="Em espera">
|
||||
<node name="tryConnect" value="Trying to connect. Please, wait…" toBeTranslated="true"/>
|
||||
<node name="downloadingFile" value="Descarregar livro %s"/>
|
||||
<node name="search" value="Pesquisando. Por favor, aguarde…"/>
|
||||
<node name="loadInfo" value="Carregando informações. Por favor, aguarde…"/>
|
||||
|
|
|
|||
|
|
@ -841,6 +841,7 @@
|
|||
<node name="message" value="Fisierul exista deja. Doriti reincarcarea lui?"/>
|
||||
</node>
|
||||
<node name="waitMessage">
|
||||
<node name="tryConnect" value="Trying to connect. Please, wait…" toBeTranslated="true"/>
|
||||
<node name="downloadingFile" value="Descarcare carte %s"/>
|
||||
<node name="search" value="Cautarea a inceput. Va rugam asteptati…"/>
|
||||
<node name="loadInfo" value="Se incarca informatiile necesare. Va rugam asteptati…"/>
|
||||
|
|
|
|||
|
|
@ -855,6 +855,7 @@
|
|||
<node name="message" value="Файл уже есть на устройстве. Загрузить заново?"/>
|
||||
</node>
|
||||
<node name="waitMessage">
|
||||
<node name="tryConnect" value="Устанавливается соединение. Подождите, пожалуйста…"/>
|
||||
<node name="downloadingFile" value="Загужается книга %s"/>
|
||||
<node name="search" value="Идет поиск. Подождите, пожалуйста…"/>
|
||||
<node name="loadInfo" value="Загружается информация. Подождите, пожалуйста…"/>
|
||||
|
|
|
|||
|
|
@ -850,6 +850,7 @@
|
|||
<node name="message" value="Датотека већ постоји. Поново је преузети?"/>
|
||||
</node>
|
||||
<node name="waitMessage">
|
||||
<node name="tryConnect" value="Trying to connect. Please, wait…" toBeTranslated="true"/>
|
||||
<node name="downloadingFile" value="Преузимам књигу „%s“…"/>
|
||||
<node name="search" value="Тражим…"/>
|
||||
<node name="loadInfo" value="Учитавам податке…"/>
|
||||
|
|
|
|||
|
|
@ -840,6 +840,7 @@
|
|||
<node name="message" value="มีไฟล์นี้อยู่แล้วในระบบ ต้องการที่จะดาวน์โหลดใหม่หรือไม่?"/>
|
||||
</node>
|
||||
<node name="waitMessage">
|
||||
<node name="tryConnect" value="Trying to connect. Please, wait…" toBeTranslated="true"/>
|
||||
<node name="downloadingFile" value="กำลังดาวน์โหลดหนังสือ %s"/>
|
||||
<node name="search" value="กำลังค้นหา, กรุณารอสักครู่…"/>
|
||||
<node name="loadInfo" value="Loading information. Please, wait…" toBeTranslated="true"/>
|
||||
|
|
|
|||
|
|
@ -850,6 +850,7 @@
|
|||
<node name="message" value="Bu dosya zaten var, yeniden indirilsin mi?"/>
|
||||
</node>
|
||||
<node name="waitMessage">
|
||||
<node name="tryConnect" value="Trying to connect. Please, wait…" toBeTranslated="true"/>
|
||||
<node name="downloadingFile" value="İndirilen kitap %s"/>
|
||||
<node name="search" value="Aranıyor. Lütfen bekleyin…"/>
|
||||
<node name="loadInfo" value="Bilgiler yükleniyor. Lütfen bekleyin…"/>
|
||||
|
|
|
|||
|
|
@ -840,6 +840,7 @@
|
|||
<node name="message" value="Файл вже є на пристрої. Завантажити заново?"/>
|
||||
</node>
|
||||
<node name="waitMessage">
|
||||
<node name="tryConnect" value="Trying to connect. Please, wait…" toBeTranslated="true"/>
|
||||
<node name="downloadingFile" value="Завантажується книга %s"/>
|
||||
<node name="search" value="Йде пошук. Зачекайте, будь ласка…"/>
|
||||
<node name="loadInfo" value="Завантаження інформації. Зачекайте, будь ласка…"/>
|
||||
|
|
|
|||
|
|
@ -840,6 +840,7 @@
|
|||
<node name="message" value="Tập tin đã tồn tại. Tải lại?"/>
|
||||
</node>
|
||||
<node name="waitMessage">
|
||||
<node name="tryConnect" value="Trying to connect. Please, wait…" toBeTranslated="true"/>
|
||||
<node name="downloadingFile" value="Đang tải sách về %s"/>
|
||||
<node name="search" value="Đang tìm. Xin chờ…"/>
|
||||
<node name="loadInfo" value="Loading information. Please, wait…" toBeTranslated="true"/>
|
||||
|
|
|
|||
|
|
@ -840,6 +840,7 @@
|
|||
<node name="message" value="该文件已存在，确认重新下载?"/>
|
||||
</node>
|
||||
<node name="waitMessage">
|
||||
<node name="tryConnect" value="Trying to connect. Please, wait…" toBeTranslated="true"/>
|
||||
<node name="downloadingFile" value="已下载 %s"/>
|
||||
<node name="search" value="搜索中，请等待…"/>
|
||||
<node name="loadInfo" value="信息加载中，请等待…"/>
|
||||
|
|
|
|||
|
|
@ -840,6 +840,7 @@
|
|||
<node name="message" value="檔案已存在，確認重新下載?"/>
|
||||
</node>
|
||||
<node name="waitMessage">
|
||||
<node name="tryConnect" value="Trying to connect. Please, wait…" toBeTranslated="true"/>
|
||||
<node name="downloadingFile" value="正下載 %s"/>
|
||||
<node name="search" value="搜尋中，請稍候 …"/>
|
||||
<node name="loadInfo" value="Loading information. Please, wait…" toBeTranslated="true"/>
|
||||
|
|
|
|||
|
|
@ -50,6 +50,7 @@ import org.geometerplus.android.fbreader.libraryService.BookCollectionShadow;
|
|||
import org.geometerplus.android.fbreader.network.auth.ActivityNetworkContext;
|
||||
import org.geometerplus.android.fbreader.preferences.fileChooser.FileChooserCollection;
|
||||
|
||||
import org.geometerplus.android.util.UIUtil;
|
||||
import org.geometerplus.android.util.DeviceType;
|
||||
|
||||
public class PreferenceActivity extends ZLPreferenceActivity {
|
||||
|
|
@ -142,12 +143,16 @@ public class PreferenceActivity extends ZLPreferenceActivity {
|
|||
) {
|
||||
@Override
|
||||
protected void onClick() {
|
||||
superOnClick();
|
||||
super.onClick();
|
||||
syncPreferences.run();
|
||||
if (!isChecked()) {
|
||||
return;
|
||||
}
|
||||
|
||||
new Thread() {
|
||||
public void run() {
|
||||
UIUtil.createExecutor(PreferenceActivity.this, "tryConnect")
|
||||
.execute(new Runnable() {
|
||||
public void run() {
|
||||
try {
|
||||
myNetworkContext.perform(
|
||||
|
|
@ -160,17 +165,18 @@ public class PreferenceActivity extends ZLPreferenceActivity {
|
|||
);
|
||||
} catch (ZLNetworkException e) {
|
||||
e.printStackTrace();
|
||||
setChecked(false);
|
||||
superOnClick();
|
||||
runOnUiThread(new Runnable() {
|
||||
public void run() {
|
||||
forceValue(false);
|
||||
syncPreferences.run();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}, null);
|
||||
}
|
||||
}.start();
|
||||
}
|
||||
|
||||
private void superOnClick() {
|
||||
super.onClick();
|
||||
syncPreferences.run();
|
||||
}
|
||||
});
|
||||
syncPreferences.add(syncScreen.addOption(syncOptions.UploadAllBooks, "uploadAllBooks", "values"));
|
||||
syncPreferences.add(syncScreen.addOption(syncOptions.Positions, "positions", "values"));
|
||||
|
|
|
|||
|
|
@ -38,4 +38,9 @@ class ZLBooleanPreference extends ZLCheckBoxPreference {
|
|||
super.onClick();
|
||||
myOption.setValue(isChecked());
|
||||
}
|
||||
|
||||
protected void forceValue(boolean value) {
|
||||
setChecked(value);
|
||||
myOption.setValue(value);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,6 +28,8 @@ import android.content.Intent;
|
|||
import org.geometerplus.zlibrary.core.options.*;
|
||||
import org.geometerplus.zlibrary.core.resources.ZLResource;
|
||||
|
||||
import org.geometerplus.zlibrary.ui.android.network.SQLiteCookieDatabase;
|
||||
|
||||
import org.geometerplus.android.fbreader.OrientationUtil;
|
||||
|
||||
abstract class ZLPreferenceActivity extends android.preference.PreferenceActivity {
|
||||
|
|
@ -126,6 +128,8 @@ abstract class ZLPreferenceActivity extends android.preference.PreferenceActivit
|
|||
|
||||
Thread.setDefaultUncaughtExceptionHandler(new org.geometerplus.zlibrary.ui.android.library.UncaughtExceptionHandler(this));
|
||||
|
||||
SQLiteCookieDatabase.init(this);
|
||||
|
||||
myScreen = getPreferenceManager().createPreferenceScreen(this);
|
||||
|
||||
final Intent intent = getIntent();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue