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

account name shown in sync settings

Browse source
This commit is contained in:
Nikolay Pultsin 2014-08-02 21:30:34 +01:00
parent 913a14256a
commit 42a79481a1
37 changed files with 83 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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">

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

@ -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">

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

@ -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">

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

@ -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">

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

@ -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">

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

@ -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">

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

@ -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">

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

@ -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">

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

@ -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">

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

@ -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">

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

@ -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">

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

@ -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">

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

@ -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">

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

@ -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">

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

@ -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">

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

@ -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">

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

@ -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">

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

@ -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">

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

@ -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">

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

@ -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">

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

@ -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">

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

@ -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">

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

@ -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">

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

@ -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">

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

@ -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">

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

@ -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">

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

@ -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">

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

@ -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">

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

@ -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">

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

@ -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">

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

@ -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">

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

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

4
src/org/geometerplus/android/fbreader/preferences/ZLBooleanPreference.java
View file

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

6
src/org/geometerplus/android/fbreader/preferences/ZLCheckBoxPreference.java
View file

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

4
src/org/geometerplus/android/fbreader/preferences/ZLPreferenceActivity.java
View file

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

2
src/org/geometerplus/android/fbreader/style/EditStyleActivity.java
View file

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

1
src/org/geometerplus/fbreader/fbreader/options/SyncOptions.java
View file

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