diff --git a/assets/resources/application/ar.xml b/assets/resources/application/ar.xml index 565783f3a..0c3498ead 100644 --- a/assets/resources/application/ar.xml +++ b/assets/resources/application/ar.xml @@ -322,6 +322,7 @@ + diff --git a/assets/resources/application/be.xml b/assets/resources/application/be.xml index 11b0c84a1..06e47de00 100644 --- a/assets/resources/application/be.xml +++ b/assets/resources/application/be.xml @@ -330,6 +330,7 @@ + diff --git a/assets/resources/application/bg.xml b/assets/resources/application/bg.xml index df49d6237..e177a81d2 100644 --- a/assets/resources/application/bg.xml +++ b/assets/resources/application/bg.xml @@ -330,6 +330,7 @@ + diff --git a/assets/resources/application/ca.xml b/assets/resources/application/ca.xml index c76beb75e..f63bdfabb 100644 --- a/assets/resources/application/ca.xml +++ b/assets/resources/application/ca.xml @@ -330,6 +330,7 @@ + diff --git a/assets/resources/application/cs.xml b/assets/resources/application/cs.xml index 77a8d541c..9d3801fa7 100644 --- a/assets/resources/application/cs.xml +++ b/assets/resources/application/cs.xml @@ -333,6 +333,7 @@ + diff --git a/assets/resources/application/da.xml b/assets/resources/application/da.xml index faf510740..da4311d06 100644 --- a/assets/resources/application/da.xml +++ b/assets/resources/application/da.xml @@ -324,6 +324,7 @@ + diff --git a/assets/resources/application/de.xml b/assets/resources/application/de.xml index 7d2b8dc66..ca507f428 100644 --- a/assets/resources/application/de.xml +++ b/assets/resources/application/de.xml @@ -329,6 +329,7 @@ + diff --git a/assets/resources/application/el.xml b/assets/resources/application/el.xml index f7411c189..e7a96b80e 100644 --- a/assets/resources/application/el.xml +++ b/assets/resources/application/el.xml @@ -314,6 +314,7 @@ + diff --git a/assets/resources/application/en.xml b/assets/resources/application/en.xml index 3033875c8..e3e97a901 100644 --- a/assets/resources/application/en.xml +++ b/assets/resources/application/en.xml @@ -324,6 +324,7 @@ + diff --git a/assets/resources/application/es.xml b/assets/resources/application/es.xml index b43a92c5c..aa92dd0d4 100644 --- a/assets/resources/application/es.xml +++ b/assets/resources/application/es.xml @@ -329,6 +329,7 @@ + diff --git a/assets/resources/application/eu.xml b/assets/resources/application/eu.xml index 38360be30..4683868ac 100644 --- a/assets/resources/application/eu.xml +++ b/assets/resources/application/eu.xml @@ -324,6 +324,7 @@ + diff --git a/assets/resources/application/fa.xml b/assets/resources/application/fa.xml index 2560b5fb9..6e6a96e8f 100644 --- a/assets/resources/application/fa.xml +++ b/assets/resources/application/fa.xml @@ -324,6 +324,7 @@ + diff --git a/assets/resources/application/fr.xml b/assets/resources/application/fr.xml index 669b8325d..5e283ccf9 100644 --- a/assets/resources/application/fr.xml +++ b/assets/resources/application/fr.xml @@ -317,6 +317,7 @@ + diff --git a/assets/resources/application/gl.xml b/assets/resources/application/gl.xml index fa8c7add7..b1cabd3ad 100644 --- a/assets/resources/application/gl.xml +++ b/assets/resources/application/gl.xml @@ -314,6 +314,7 @@ + diff --git a/assets/resources/application/hu.xml b/assets/resources/application/hu.xml index 290427014..6e9bbfbe4 100644 --- a/assets/resources/application/hu.xml +++ b/assets/resources/application/hu.xml @@ -314,6 +314,7 @@ + diff --git a/assets/resources/application/hy.xml b/assets/resources/application/hy.xml index 3a62aec82..057dad592 100644 --- a/assets/resources/application/hy.xml +++ b/assets/resources/application/hy.xml @@ -329,6 +329,7 @@ + diff --git a/assets/resources/application/it.xml b/assets/resources/application/it.xml index d4c3623e2..8513d6e68 100644 --- a/assets/resources/application/it.xml +++ b/assets/resources/application/it.xml @@ -315,6 +315,7 @@ + diff --git a/assets/resources/application/ka.xml b/assets/resources/application/ka.xml index f5dab71b7..c7af86d79 100644 --- a/assets/resources/application/ka.xml +++ b/assets/resources/application/ka.xml @@ -329,6 +329,7 @@ + diff --git a/assets/resources/application/nb.xml b/assets/resources/application/nb.xml index 19c722c73..ab1748645 100644 --- a/assets/resources/application/nb.xml +++ b/assets/resources/application/nb.xml @@ -324,6 +324,7 @@ + diff --git a/assets/resources/application/nl.xml b/assets/resources/application/nl.xml index e4046d979..668b5a772 100644 --- a/assets/resources/application/nl.xml +++ b/assets/resources/application/nl.xml @@ -324,6 +324,7 @@ + diff --git a/assets/resources/application/pl.xml b/assets/resources/application/pl.xml index 529625942..64d2e2f52 100644 --- a/assets/resources/application/pl.xml +++ b/assets/resources/application/pl.xml @@ -314,6 +314,7 @@ + diff --git a/assets/resources/application/pt.xml b/assets/resources/application/pt.xml index b9637180d..b5ea07121 100644 --- a/assets/resources/application/pt.xml +++ b/assets/resources/application/pt.xml @@ -326,6 +326,7 @@ + diff --git a/assets/resources/application/ro.xml b/assets/resources/application/ro.xml index 47b6ae409..186f2f626 100644 --- a/assets/resources/application/ro.xml +++ b/assets/resources/application/ro.xml @@ -315,6 +315,7 @@ + diff --git a/assets/resources/application/ru.xml b/assets/resources/application/ru.xml index 0ef3d02e0..c01dc7c61 100644 --- a/assets/resources/application/ru.xml +++ b/assets/resources/application/ru.xml @@ -329,6 +329,7 @@ + diff --git a/assets/resources/application/sr.xml b/assets/resources/application/sr.xml index 72b9974e5..12b3eea64 100644 --- a/assets/resources/application/sr.xml +++ b/assets/resources/application/sr.xml @@ -324,6 +324,7 @@ + diff --git a/assets/resources/application/th.xml b/assets/resources/application/th.xml index b39660f3f..19d0dc911 100644 --- a/assets/resources/application/th.xml +++ b/assets/resources/application/th.xml @@ -314,6 +314,7 @@ + diff --git a/assets/resources/application/tr.xml b/assets/resources/application/tr.xml index 1ee9c75b6..ce10c99ac 100644 --- a/assets/resources/application/tr.xml +++ b/assets/resources/application/tr.xml @@ -324,6 +324,7 @@ + diff --git a/assets/resources/application/uk.xml b/assets/resources/application/uk.xml index f4ad79f4a..09c31668b 100644 --- a/assets/resources/application/uk.xml +++ b/assets/resources/application/uk.xml @@ -314,6 +314,7 @@ + diff --git a/assets/resources/application/vi.xml b/assets/resources/application/vi.xml index 17d98fe33..05d4287ec 100644 --- a/assets/resources/application/vi.xml +++ b/assets/resources/application/vi.xml @@ -314,6 +314,7 @@ + diff --git a/assets/resources/application/zh.xml b/assets/resources/application/zh.xml index 59ecfcd5a..0a1d9353c 100644 --- a/assets/resources/application/zh.xml +++ b/assets/resources/application/zh.xml @@ -314,6 +314,7 @@ + diff --git a/assets/resources/application/zh_TW.xml b/assets/resources/application/zh_TW.xml index f27fc5bd1..62cb0ad74 100644 --- a/assets/resources/application/zh_TW.xml +++ b/assets/resources/application/zh_TW.xml @@ -314,6 +314,7 @@ + diff --git a/src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java b/src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java index bc2b7b4fd..ca73c4d0c 100644 --- a/src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java +++ b/src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java @@ -139,8 +139,12 @@ public class PreferenceActivity extends ZLPreferenceActivity { } }; syncScreen.addPreference(new ZLBooleanPreference( - this, syncOptions.Enabled, syncScreen.Resource, "enable" + this, syncOptions.Enabled, syncScreen.Resource.getResource("enable") ) { + { + setOnSummary(myNetworkContext.getAccountName(SyncOptions.DOMAIN, SyncOptions.REALM)); + } + @Override protected void onClick() { super.onClick(); @@ -149,33 +153,39 @@ public class PreferenceActivity extends ZLPreferenceActivity { return; } - new Thread() { + UIUtil.createExecutor(PreferenceActivity.this, "tryConnect").execute(new Runnable() { public void run() { - UIUtil.createExecutor(PreferenceActivity.this, "tryConnect") - .execute(new Runnable() { - public void run() { - try { - myNetworkContext.perform( - new JsonRequest(SyncOptions.URL + "login/test") { - @Override - public void processResponse(Object response) { - // TODO: update message - } - } - ); - } catch (ZLNetworkException e) { - e.printStackTrace(); - runOnUiThread(new Runnable() { - public void run() { - forceValue(false); - syncPreferences.run(); - } - }); + try { + myNetworkContext.perform( + new JsonRequest(SyncOptions.URL + "login/test") { + @Override + public void processResponse(Object response) { + setOnSummary((String)((Map)response).get("user")); } } - }, null); + ); + } catch (ZLNetworkException e) { + e.printStackTrace(); + runOnUiThread(new Runnable() { + public void run() { + forceValue(false); + syncPreferences.run(); + } + }); + } } - }.start(); + }, null); + } + + private void setOnSummary(String account) { + final String summary = account != null + ? Resource.getResource("summaryOnWithAccount").getValue().replace("%s", account) + : Resource.getResource("summaryOn").getValue(); + runOnUiThread(new Runnable() { + public void run() { + setSummaryOn(summary); + } + }); } }); syncPreferences.add(syncScreen.addOption(syncOptions.UploadAllBooks, "uploadAllBooks", "values")); @@ -212,14 +222,12 @@ public class PreferenceActivity extends ZLPreferenceActivity { appearanceScreen.addPreference(new ZLBooleanPreference( this, viewOptions.TwoColumnView, - appearanceScreen.Resource, - "twoColumnView" + appearanceScreen.Resource.getResource("twoColumnView") )); appearanceScreen.addPreference(new ZLBooleanPreference( this, miscOptions.AllowScreenBrightnessAdjustment, - appearanceScreen.Resource, - "allowScreenBrightnessAdjustment" + appearanceScreen.Resource.getResource("allowScreenBrightnessAdjustment") ) { private final int myLevel = androidLibrary.ScreenBrightnessLevelOption.getValue(); @@ -238,8 +246,7 @@ public class PreferenceActivity extends ZLPreferenceActivity { appearanceScreen.addPreference(new ZLBooleanPreference( this, androidLibrary.DontTurnScreenOffDuringChargingOption, - appearanceScreen.Resource, - "dontTurnScreenOffDuringCharging" + appearanceScreen.Resource.getResource("dontTurnScreenOffDuringCharging") )); */ appearanceScreen.addOption(androidLibrary.ShowStatusBarOption, "showStatusBar"); @@ -256,7 +263,8 @@ public class PreferenceActivity extends ZLPreferenceActivity { }; einkScreen.addPreference(new ZLBooleanPreference( - this, einkOptions.EnableFastRefresh, einkScreen.Resource, "enableFastRefresh" + this, einkOptions.EnableFastRefresh, + einkScreen.Resource.getResource("enableFastRefresh") ) { @Override protected void onClick() { @@ -506,7 +514,7 @@ public class PreferenceActivity extends ZLPreferenceActivity { } }; scrollingScreen.addPreference(new ZLCheckBoxPreference( - this, scrollingScreen.Resource, "volumeKeys" + this, scrollingScreen.Resource.getResource("volumeKeys") ) { { setChecked(keyBindings.hasBinding(KeyEvent.KEYCODE_VOLUME_UP, false)); @@ -526,7 +534,7 @@ public class PreferenceActivity extends ZLPreferenceActivity { } }); volumeKeysPreferences.add(scrollingScreen.addPreference(new ZLCheckBoxPreference( - this, scrollingScreen.Resource, "invertVolumeKeys" + this, scrollingScreen.Resource.getResource("invertVolumeKeys") ) { { setChecked(ActionCode.VOLUME_KEY_SCROLL_FORWARD.equals( @@ -607,8 +615,7 @@ public class PreferenceActivity extends ZLPreferenceActivity { dictionaryScreen.addPreference(new ZLBooleanPreference( PreferenceActivity.this, miscOptions.NavigateAllWords, - dictionaryScreen.Resource, - "navigateOverAllWords" + dictionaryScreen.Resource.getResource("navigateOverAllWords") )); dictionaryScreen.addOption(miscOptions.WordTappingAction, "tappingAction"); dictionaryScreen.addPreference(targetLanguagePreference); diff --git a/src/org/geometerplus/android/fbreader/preferences/ZLBooleanPreference.java b/src/org/geometerplus/android/fbreader/preferences/ZLBooleanPreference.java index db09e2e17..f476c99ef 100644 --- a/src/org/geometerplus/android/fbreader/preferences/ZLBooleanPreference.java +++ b/src/org/geometerplus/android/fbreader/preferences/ZLBooleanPreference.java @@ -27,8 +27,8 @@ import org.geometerplus.zlibrary.core.resources.ZLResource; class ZLBooleanPreference extends ZLCheckBoxPreference { private final ZLBooleanOption myOption; - ZLBooleanPreference(Context context, ZLBooleanOption option, ZLResource rootResource, String resourceKey) { - super(context, rootResource, resourceKey); + ZLBooleanPreference(Context context, ZLBooleanOption option, ZLResource resource) { + super(context, resource); myOption = option; setChecked(option.getValue()); } diff --git a/src/org/geometerplus/android/fbreader/preferences/ZLCheckBoxPreference.java b/src/org/geometerplus/android/fbreader/preferences/ZLCheckBoxPreference.java index 0e5431fc4..e9c1e8112 100644 --- a/src/org/geometerplus/android/fbreader/preferences/ZLCheckBoxPreference.java +++ b/src/org/geometerplus/android/fbreader/preferences/ZLCheckBoxPreference.java @@ -25,10 +25,12 @@ import android.preference.CheckBoxPreference; import org.geometerplus.zlibrary.core.resources.ZLResource; public abstract class ZLCheckBoxPreference extends CheckBoxPreference { - protected ZLCheckBoxPreference(Context context, ZLResource rootResource, String resourceKey) { + protected final ZLResource Resource; + + protected ZLCheckBoxPreference(Context context, ZLResource resource) { super(context); - ZLResource resource = rootResource.getResource(resourceKey); + Resource = resource; setTitle(resource.getValue()); setSummaryOn(resource.getResource("summaryOn").getValue()); setSummaryOff(resource.getResource("summaryOff").getValue()); diff --git a/src/org/geometerplus/android/fbreader/preferences/ZLPreferenceActivity.java b/src/org/geometerplus/android/fbreader/preferences/ZLPreferenceActivity.java index a6abda5dd..76435d979 100644 --- a/src/org/geometerplus/android/fbreader/preferences/ZLPreferenceActivity.java +++ b/src/org/geometerplus/android/fbreader/preferences/ZLPreferenceActivity.java @@ -65,7 +65,7 @@ abstract class ZLPreferenceActivity extends android.preference.PreferenceActivit public Preference addOption(ZLBooleanOption option, String resourceKey) { return addPreference( - new ZLBooleanPreference(ZLPreferenceActivity.this, option, Resource, resourceKey) + new ZLBooleanPreference(ZLPreferenceActivity.this, option, Resource.getResource(resourceKey)) ); } @@ -109,7 +109,7 @@ abstract class ZLPreferenceActivity extends android.preference.PreferenceActivit public Preference addOption(ZLBooleanOption option, String resourceKey) { ZLBooleanPreference preference = - new ZLBooleanPreference(ZLPreferenceActivity.this, option, Resource, resourceKey); + new ZLBooleanPreference(ZLPreferenceActivity.this, option, Resource.getResource(resourceKey)); myScreen.addPreference(preference); return preference; } diff --git a/src/org/geometerplus/android/fbreader/style/EditStyleActivity.java b/src/org/geometerplus/android/fbreader/style/EditStyleActivity.java index f90440543..8f497225f 100644 --- a/src/org/geometerplus/android/fbreader/style/EditStyleActivity.java +++ b/src/org/geometerplus/android/fbreader/style/EditStyleActivity.java @@ -91,7 +91,7 @@ public class EditStyleActivity extends PreferenceActivity { private ZLColor mySavedBgColor; InvisiblePreference() { - super(EditStyleActivity.this, myRootResource, "invisible"); + super(EditStyleActivity.this, myRootResource.getResource("invisible")); setChecked(myStyle.getBackgroundColor() == null); } diff --git a/src/org/geometerplus/fbreader/fbreader/options/SyncOptions.java b/src/org/geometerplus/fbreader/fbreader/options/SyncOptions.java index b72acf3e3..6151a88d3 100644 --- a/src/org/geometerplus/fbreader/fbreader/options/SyncOptions.java +++ b/src/org/geometerplus/fbreader/fbreader/options/SyncOptions.java @@ -24,6 +24,7 @@ import org.geometerplus.zlibrary.core.options.*; public class SyncOptions { public static final String DOMAIN = "demo.fbreader.org"; public static final String URL = "https://" + DOMAIN + "/"; + public static final String REALM = "FBReader book network"; public final ZLBooleanOption Enabled = new ZLBooleanOption("Sync", "Enabled", false);