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

change account name on switching synchronization off/on

Browse source
This commit is contained in:
Nikolay Pultsin 2014-08-02 22:48:17 +01:00
parent b3b85b4820
commit 6b0252eeb9
2 changed files with 7 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/org/geometerplus/android/fbreader/network/auth/WebAuthorisationScreen.java
View file

@ -40,6 +40,7 @@ public class WebAuthorisationScreen extends Activity {
requestWindowFeature(Window.FEATURE_PROGRESS);
CookieSyncManager.createInstance(getApplicationContext());
CookieManager.getInstance().removeAllCookie();
final Intent intent = getIntent();
final Uri data = intent.getData();
if (data == null || data.getHost() == null) {
@ -94,16 +95,4 @@ public class WebAuthorisationScreen extends Activity {
setContentView(view);
view.loadUrl(intent.getDataString());
}
@Override
protected void onResume() {
super.onResume();
CookieSyncManager.getInstance().startSync();
}
@Override
protected void onPause() {
super.onPause();
CookieSyncManager.getInstance().stopSync();
}
}

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

@ -142,7 +142,9 @@ public class PreferenceActivity extends ZLPreferenceActivity {
this, syncOptions.Enabled, syncScreen.Resource.getResource("enable")
) {
{
setOnSummary(myNetworkContext.getAccountName(SyncOptions.DOMAIN, SyncOptions.REALM));
if (isChecked()) {
setOnSummary(myNetworkContext.getAccountName(SyncOptions.DOMAIN, SyncOptions.REALM));
}
}
@Override
@ -150,11 +152,12 @@ public class PreferenceActivity extends ZLPreferenceActivity {
super.onClick();
syncPreferences.run();
if (!isChecked()) {
setOnSummary(null);
return;
}
//myNetworkContext.removeCookiesForDomain(SyncOptions.DOMAIN);
//myNetworkContext.setAccountName(SyncOptions.DOMAIN, SyncOptions.REALM, null);
myNetworkContext.removeCookiesForDomain(SyncOptions.DOMAIN);
myNetworkContext.setAccountName(SyncOptions.DOMAIN, SyncOptions.REALM, null);
UIUtil.createExecutor(PreferenceActivity.this, "tryConnect").execute(new Runnable() {
public void run() {