account name shown in sync settings

assets/resources/application/ar.xml

@@ -322,6 +322,7 @@
 			<node name="summary" value="Book network settings" toBeTranslated="true"/>
 			<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"/>
 				<node name="summaryOff" value="Do not synchronise my library with FBReader book network server" toBeTranslated="true"/>
 			</node>
 			<node name="values">

assets/resources/application/be.xml

@@ -330,6 +330,7 @@
 			<node name="summary" value="Book network settings" toBeTranslated="true"/>
 			<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"/>
 				<node name="summaryOff" value="Do not synchronise my library with FBReader book network server" toBeTranslated="true"/>
 			</node>
 			<node name="values">

assets/resources/application/bg.xml

@@ -330,6 +330,7 @@
 			<node name="summary" value="Book network settings" toBeTranslated="true"/>
 			<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"/>
 				<node name="summaryOff" value="Do not synchronise my library with FBReader book network server" toBeTranslated="true"/>
 			</node>
 			<node name="values">

assets/resources/application/ca.xml

@@ -330,6 +330,7 @@
 			<node name="summary" value="Book network settings" toBeTranslated="true"/>
 			<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"/>
 				<node name="summaryOff" value="Do not synchronise my library with FBReader book network server" toBeTranslated="true"/>
 			</node>
 			<node name="values">

assets/resources/application/cs.xml

@@ -333,6 +333,7 @@
 			<node name="summary" value="Book network settings" toBeTranslated="true"/>
 			<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"/>
 				<node name="summaryOff" value="Do not synchronise my library with FBReader book network server" toBeTranslated="true"/>
 			</node>
 			<node name="values">

assets/resources/application/da.xml

@@ -324,6 +324,7 @@
 			<node name="summary" value="Book network settings" toBeTranslated="true"/>
 			<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"/>
 				<node name="summaryOff" value="Do not synchronise my library with FBReader book network server" toBeTranslated="true"/>
 			</node>
 			<node name="values">

assets/resources/application/de.xml

@@ -329,6 +329,7 @@
 			<node name="summary" value="Book network settings" toBeTranslated="true"/>
 			<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"/>
 				<node name="summaryOff" value="Do not synchronise my library with FBReader book network server" toBeTranslated="true"/>
 			</node>
 			<node name="values">

assets/resources/application/el.xml

@@ -314,6 +314,7 @@
 			<node name="summary" value="Book network settings" toBeTranslated="true"/>
 			<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"/>
 				<node name="summaryOff" value="Do not synchronise my library with FBReader book network server" toBeTranslated="true"/>
 			</node>
 			<node name="values">

assets/resources/application/en.xml

@@ -324,6 +324,7 @@
 			<node name="summary" value="Book network settings"/>
 			<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"/>
 				<node name="summaryOff" value="Do not synchronise my library with FBReader book network server"/>
 			</node>
 			<node name="values">

assets/resources/application/es.xml

@@ -329,6 +329,7 @@
 			<node name="summary" value="Book network settings" toBeTranslated="true"/>
 			<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"/>
 				<node name="summaryOff" value="Do not synchronise my library with FBReader book network server" toBeTranslated="true"/>
 			</node>
 			<node name="values">

assets/resources/application/eu.xml

@@ -324,6 +324,7 @@
 			<node name="summary" value="Book network settings" toBeTranslated="true"/>
 			<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"/>
 				<node name="summaryOff" value="Do not synchronise my library with FBReader book network server" toBeTranslated="true"/>
 			</node>
 			<node name="values">

assets/resources/application/fa.xml

@@ -324,6 +324,7 @@
 			<node name="summary" value="Book network settings" toBeTranslated="true"/>
 			<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"/>
 				<node name="summaryOff" value="Do not synchronise my library with FBReader book network server" toBeTranslated="true"/>
 			</node>
 			<node name="values">

assets/resources/application/fr.xml

@@ -317,6 +317,7 @@
 			<node name="summary" value="Book network settings" toBeTranslated="true"/>
 			<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"/>
 				<node name="summaryOff" value="Do not synchronise my library with FBReader book network server" toBeTranslated="true"/>
 			</node>
 			<node name="values">

assets/resources/application/gl.xml

@@ -314,6 +314,7 @@
 			<node name="summary" value="Book network settings" toBeTranslated="true"/>
 			<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"/>
 				<node name="summaryOff" value="Do not synchronise my library with FBReader book network server" toBeTranslated="true"/>
 			</node>
 			<node name="values">

assets/resources/application/hu.xml

@@ -314,6 +314,7 @@
 			<node name="summary" value="Book network settings" toBeTranslated="true"/>
 			<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"/>
 				<node name="summaryOff" value="Do not synchronise my library with FBReader book network server" toBeTranslated="true"/>
 			</node>
 			<node name="values">

assets/resources/application/hy.xml

@@ -329,6 +329,7 @@
 			<node name="summary" value="Book network settings" toBeTranslated="true"/>
 			<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"/>
 				<node name="summaryOff" value="Do not synchronise my library with FBReader book network server" toBeTranslated="true"/>
 			</node>
 			<node name="values">

assets/resources/application/it.xml

@@ -315,6 +315,7 @@
 			<node name="summary" value="Book network settings" toBeTranslated="true"/>
 			<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"/>
 				<node name="summaryOff" value="Do not synchronise my library with FBReader book network server" toBeTranslated="true"/>
 			</node>
 			<node name="values">

assets/resources/application/ka.xml

@@ -329,6 +329,7 @@
 			<node name="summary" value="Book network settings" toBeTranslated="true"/>
 			<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"/>
 				<node name="summaryOff" value="Do not synchronise my library with FBReader book network server" toBeTranslated="true"/>
 			</node>
 			<node name="values">

assets/resources/application/nb.xml

@@ -324,6 +324,7 @@
 			<node name="summary" value="Book network settings" toBeTranslated="true"/>
 			<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"/>
 				<node name="summaryOff" value="Do not synchronise my library with FBReader book network server" toBeTranslated="true"/>
 			</node>
 			<node name="values">

assets/resources/application/nl.xml

@@ -324,6 +324,7 @@
 			<node name="summary" value="Book network settings" toBeTranslated="true"/>
 			<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"/>
 				<node name="summaryOff" value="Do not synchronise my library with FBReader book network server" toBeTranslated="true"/>
 			</node>
 			<node name="values">

assets/resources/application/pl.xml

@@ -314,6 +314,7 @@
 			<node name="summary" value="Book network settings" toBeTranslated="true"/>
 			<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"/>
 				<node name="summaryOff" value="Do not synchronise my library with FBReader book network server" toBeTranslated="true"/>
 			</node>
 			<node name="values">

assets/resources/application/pt.xml

@@ -326,6 +326,7 @@
 			<node name="summary" value="Marcar opções de rede"/>
 			<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="Synchronise my library as %s" toBeTranslated="true"/>
 				<node name="summaryOff" value="Não Sincronizar a minha biblioteca com a rede de servidores de livros do FBReader"/>
 			</node>
 			<node name="values" value="Valores">

assets/resources/application/ro.xml

@@ -315,6 +315,7 @@
 			<node name="summary" value="Book network settings" toBeTranslated="true"/>
 			<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"/>
 				<node name="summaryOff" value="Do not synchronise my library with FBReader book network server" toBeTranslated="true"/>
 			</node>
 			<node name="values">

assets/resources/application/ru.xml

@@ -329,6 +329,7 @@
 			<node name="summary" value="Настройки книжной сети"/>
 			<node name="enable" value="Включить синхронизацию">
 				<node name="summaryOn" value="Синхронизировать мою библиотеку с сервером книжной сети"/>
+				<node name="summaryOnWithAccount" value="Синхронизировать библиотеку от имени %s"/>
 				<node name="summaryOff" value="Не синхронизировать мою библиотеку с сервером книжной сети"/>
 			</node>
 			<node name="values">

assets/resources/application/sr.xml

@@ -324,6 +324,7 @@
 			<node name="summary" value="Book network settings" toBeTranslated="true"/>
 			<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"/>
 				<node name="summaryOff" value="Do not synchronise my library with FBReader book network server" toBeTranslated="true"/>
 			</node>
 			<node name="values">

assets/resources/application/th.xml

@@ -314,6 +314,7 @@
 			<node name="summary" value="Book network settings" toBeTranslated="true"/>
 			<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"/>
 				<node name="summaryOff" value="Do not synchronise my library with FBReader book network server" toBeTranslated="true"/>
 			</node>
 			<node name="values">

assets/resources/application/tr.xml

@@ -324,6 +324,7 @@
 			<node name="summary" value="Book network settings" toBeTranslated="true"/>
 			<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"/>
 				<node name="summaryOff" value="Do not synchronise my library with FBReader book network server" toBeTranslated="true"/>
 			</node>
 			<node name="values">

assets/resources/application/uk.xml

@@ -314,6 +314,7 @@
 			<node name="summary" value="Book network settings" toBeTranslated="true"/>
 			<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"/>
 				<node name="summaryOff" value="Do not synchronise my library with FBReader book network server" toBeTranslated="true"/>
 			</node>
 			<node name="values">

assets/resources/application/vi.xml

@@ -314,6 +314,7 @@
 			<node name="summary" value="Book network settings" toBeTranslated="true"/>
 			<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"/>
 				<node name="summaryOff" value="Do not synchronise my library with FBReader book network server" toBeTranslated="true"/>
 			</node>
 			<node name="values">

assets/resources/application/zh.xml

@@ -314,6 +314,7 @@
 			<node name="summary" value="Book network settings" toBeTranslated="true"/>
 			<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"/>
 				<node name="summaryOff" value="Do not synchronise my library with FBReader book network server" toBeTranslated="true"/>
 			</node>
 			<node name="values">

assets/resources/application/zh_TW.xml

@@ -314,6 +314,7 @@
 			<node name="summary" value="Book network settings" toBeTranslated="true"/>
 			<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"/>
 				<node name="summaryOff" value="Do not synchronise my library with FBReader book network server" toBeTranslated="true"/>
 			</node>
 			<node name="values">

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")
+						try {
-							.execute(new Runnable() {
+							myNetworkContext.perform(
-								public void run() {
+								new JsonRequest(SyncOptions.URL + "login/test") {
-									try {
+									@Override
-										myNetworkContext.perform(
+									public void processResponse(Object response) {
-											new JsonRequest(SyncOptions.URL + "login/test") {
+										setOnSummary((String)((Map)response).get("user"));
-												@Override
-												public void processResponse(Object response) {
-													// TODO: update message
-												}
-											}
-										);
-									} catch (ZLNetworkException e) {
-										e.printStackTrace();
-										runOnUiThread(new Runnable() {
-											public void run() {
-												forceValue(false);
-												syncPreferences.run();
-											}
-										});
 									}
 								}
-							}, 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,
+			appearanceScreen.Resource.getResource("twoColumnView")
-			"twoColumnView"
 		));
 		appearanceScreen.addPreference(new ZLBooleanPreference(
 			this,
 			miscOptions.AllowScreenBrightnessAdjustment,
-			appearanceScreen.Resource,
+			appearanceScreen.Resource.getResource("allowScreenBrightnessAdjustment")
-			"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,
+			appearanceScreen.Resource.getResource("dontTurnScreenOffDuringCharging")
-			"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,
+					dictionaryScreen.Resource.getResource("navigateOverAllWords")
-					"navigateOverAllWords"
 				));
 				dictionaryScreen.addOption(miscOptions.WordTappingAction, "tappingAction");
 				dictionaryScreen.addPreference(targetLanguagePreference);

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) {
+	ZLBooleanPreference(Context context, ZLBooleanOption option, ZLResource resource) {
-		super(context, rootResource, resourceKey);
+		super(context, resource);
 		myOption = option;
 		setChecked(option.getValue());
 	}

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());

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;
 	}

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);
 		}
 

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);