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

fixed basic auth

Browse source
This commit is contained in:
Nikolay Pultsin 2011-09-25 16:23:34 +01:00
parent dec2e84b5f
commit 557d938a55
3 changed files with 25 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/org/geometerplus/android/fbreader/network/AuthenticationActivity.java
View file

@ -138,18 +138,25 @@ public class AuthenticationActivity extends Activity {
setContentView(R.layout.authentication); setContentView(R.layout.authentication);
final Intent intent = getIntent(); final Intent intent = getIntent();
myLink = Util.linkByIntent(intent);
if (myLink == null) {
finish();
return;
}
setResult(RESULT_CANCELED, Util.intentByLink(new Intent(), myLink));
final String host = intent.getStringExtra(HOST_KEY); final String host = intent.getStringExtra(HOST_KEY);
final String area = intent.getStringExtra(AREA_KEY); final String area = intent.getStringExtra(AREA_KEY);
final String username = intent.getStringExtra(USERNAME_KEY); final String username = intent.getStringExtra(USERNAME_KEY);
final String error = intent.getStringExtra(ERROR_KEY); final String error = intent.getStringExtra(ERROR_KEY);
myCustomAuthentication = intent.getBooleanExtra(CUSTOM_AUTH_KEY, false); myCustomAuthentication = intent.getBooleanExtra(CUSTOM_AUTH_KEY, false);
if (myCustomAuthentication) {
myLink = Util.linkByIntent(intent);
if (myLink == null) {
finish();
return;
}
setResult(RESULT_CANCELED, Util.intentByLink(new Intent(), myLink));
} else {
myLink = null;
setResult(RESULT_CANCELED);
}
myOnSuccessRunnable = ourOnSuccessRunnableMap.remove(intent.getLongExtra(RUNNABLE_KEY, -1)); myOnSuccessRunnable = ourOnSuccessRunnableMap.remove(intent.getLongExtra(RUNNABLE_KEY, -1));
myResource = ZLResource.resource("dialog").getResource("AuthenticationDialog"); myResource = ZLResource.resource("dialog").getResource("AuthenticationDialog");
@ -201,9 +208,11 @@ public class AuthenticationActivity extends Activity {
public void onClick(View v) { public void onClick(View v) {
runOnUiThread(new Runnable() { runOnUiThread(new Runnable() {
public void run() { public void run() {
final NetworkAuthenticationManager mgr = myLink.authenticationManager(); if (myLink != null) {
if (mgr.mayBeAuthorised(false)) { final NetworkAuthenticationManager mgr = myLink.authenticationManager();
mgr.logOut(); if (mgr.mayBeAuthorised(false)) {
mgr.logOut();
}
} }
final NetworkLibrary library = NetworkLibrary.Instance(); final NetworkLibrary library = NetworkLibrary.Instance();
library.invalidateVisibility(); library.invalidateVisibility();

2
src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java
View file

@ -127,7 +127,7 @@ public class NetworkLibraryActivity extends TreeActivity implements NetworkLibra
final NetworkTree tree = final NetworkTree tree =
NetworkLibrary.Instance().getCatalogTreeByUrl(intent.getData().toString()); NetworkLibrary.Instance().getCatalogTreeByUrl(intent.getData().toString());
if (tree != null) { if (tree != null) {
openTree(tree); new OpenCatalogAction(this).run(tree);
return true; return true;
} }
} }

8
src/org/geometerplus/android/fbreader/network/Util.java
View file

@ -43,11 +43,15 @@ public abstract class Util implements UserRegistrationConstants {
"android.fbreader.action.NETWORK_LIBRARY_AUTOSIGNIN"; "android.fbreader.action.NETWORK_LIBRARY_AUTOSIGNIN";
static INetworkLink linkByIntent(Intent intent) { static INetworkLink linkByIntent(Intent intent) {
return NetworkLibrary.Instance().getLinkByUrl(intent.getData().toString()); final Uri uri = intent.getData();
return uri != null ? NetworkLibrary.Instance().getLinkByUrl(uri.toString()) : null;
} }
static Intent intentByLink(Intent intent, INetworkLink link) { static Intent intentByLink(Intent intent, INetworkLink link) {
return intent.setData(Uri.parse(link.getUrl(UrlInfo.Type.Catalog))); if (link != null) {
intent.setData(Uri.parse(link.getUrl(UrlInfo.Type.Catalog)));
}
return intent;
} }
static void initLibrary(Activity activity) { static void initLibrary(Activity activity) {