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

special network link for synchronization service

Browse source
This commit is contained in:
Nikolay Pultsin 2014-08-05 13:17:53 +01:00
parent 34cea5fe4d
commit 1d755b9888
44 changed files with 276 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -42,7 +42,8 @@ import org.geometerplus.fbreader.Paths;
import org.geometerplus.fbreader.bookmodel.FBTextKind;
import org.geometerplus.fbreader.fbreader.*;
import org.geometerplus.fbreader.fbreader.options.*;
import org.geometerplus.fbreader.tips.TipsManager;
import org.geometerplus.fbreader.network.sync.SyncUtil;
//import org.geometerplus.fbreader.tips.TipsManager;
import org.geometerplus.android.fbreader.DictionaryUtil;
import org.geometerplus.android.fbreader.FBReader;
@ -143,7 +144,7 @@ public class PreferenceActivity extends ZLPreferenceActivity {
) {
{
if (isChecked()) {
setOnSummary(myNetworkContext.getAccountName(SyncOptions.DOMAIN, SyncOptions.REALM));
setOnSummary(SyncUtil.getAccountName(myNetworkContext));
}
}
@ -152,8 +153,7 @@ public class PreferenceActivity extends ZLPreferenceActivity {
super.onClick();
syncPreferences.run();
myNetworkContext.removeCookiesForDomain(SyncOptions.DOMAIN);
myNetworkContext.setAccountName(SyncOptions.DOMAIN, SyncOptions.REALM, null);
SyncUtil.logout(myNetworkContext);
if (!isChecked()) {
setOnSummary(null);
@ -164,7 +164,7 @@ public class PreferenceActivity extends ZLPreferenceActivity {
public void run() {
try {
myNetworkContext.perform(
new JsonRequest(SyncOptions.URL + "login/test") {
new JsonRequest(SyncOptions.BASE_URL + "login/test") {
@Override
public void processResponse(Object response) {
setOnSummary((String)((Map)response).get("user"));
@ -657,8 +657,8 @@ public class PreferenceActivity extends ZLPreferenceActivity {
keyBindings.getOption(KeyEvent.KEYCODE_BACK, true), backKeyLongPressActions
));
final Screen tipsScreen = createPreferenceScreen("tips");
tipsScreen.addOption(TipsManager.Instance().ShowTipsOption, "showTips");
//final Screen tipsScreen = createPreferenceScreen("tips");
//tipsScreen.addOption(TipsManager.Instance().ShowTipsOption, "showTips");
final Screen aboutScreen = createPreferenceScreen("about");
aboutScreen.addPreference(new InfoPreference(