flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-06-08 00:16:09 +00:00
Code Issues Releases Wiki Activity

Clean up some dependencies

Browse Source
This commit is contained in:
davigonz 2018-10-01 13:21:55 +02:00
parent c36a71caf2
commit 096d037f94
1 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/com/owncloud/android/lib/common/SingleSessionManager.java
View File

@ -24,14 +24,6 @@
package com.owncloud.android.lib.common; package com.owncloud.android.lib.common;
import java.io.IOException;
import java.util.Iterator;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import android.accounts.Account; import android.accounts.Account;
import android.accounts.AccountManager; import android.accounts.AccountManager;
import android.accounts.AuthenticatorException; import android.accounts.AuthenticatorException;
@ -41,12 +33,13 @@ import android.net.Uri;
import android.util.Log; import android.util.Log;
import com.owncloud.android.lib.common.accounts.AccountUtils; import com.owncloud.android.lib.common.accounts.AccountUtils;
import com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException;
import com.owncloud.android.lib.common.authentication.OwnCloudCredentials;
import com.owncloud.android.lib.common.authentication.OwnCloudSamlSsoCredentials; import com.owncloud.android.lib.common.authentication.OwnCloudSamlSsoCredentials;
import com.owncloud.android.lib.common.utils.Log_OC; import com.owncloud.android.lib.common.utils.Log_OC;
import okhttp3.Cookie; import java.io.IOException;
import java.util.Iterator;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
/** /**
* Implementation of {@link OwnCloudClientManager} * Implementation of {@link OwnCloudClientManager}
@ -114,8 +107,6 @@ public class SingleSessionManager implements OwnCloudClientManager {
reusingKnown = true; reusingKnown = true;
} }
account.loadCredentials(context);
if (client == null) { if (client == null) {
// no client to reuse - create a new one // no client to reuse - create a new one
client = OwnCloudClientFactory.createOwnCloudClient( client = OwnCloudClientFactory.createOwnCloudClient(
@ -126,6 +117,7 @@ public class SingleSessionManager implements OwnCloudClientManager {
client.setContext(context); client.setContext(context);
client.setOwnCloudClientManager(this); client.setOwnCloudClientManager(this);
account.loadCredentials(context);
client.setCredentials(account.getCredentials()); client.setCredentials(account.getCredentials());
if (client.getCredentials() instanceof OwnCloudSamlSsoCredentials) { if (client.getCredentials() instanceof OwnCloudSamlSsoCredentials) {
@ -149,7 +141,7 @@ public class SingleSessionManager implements OwnCloudClientManager {
Log_OC.v(TAG, "reusing client for session " + sessionName); Log_OC.v(TAG, "reusing client for session " + sessionName);
} }
keepCredentialsUpdated(account, client); keepCredentialsUpdated(client);
keepCookiesUpdated(context, account, client); keepCookiesUpdated(context, account, client);
keepUriUpdated(account, client); keepUriUpdated(account, client);
} }
@ -163,7 +155,6 @@ public class SingleSessionManager implements OwnCloudClientManager {
@Override @Override
public OwnCloudClient removeClientFor(OwnCloudAccount account) { public OwnCloudClient removeClientFor(OwnCloudAccount account) {
if (Log.isLoggable(TAG, Log.DEBUG)) { if (Log.isLoggable(TAG, Log.DEBUG)) {
Log_OC.d(TAG, "removeClientFor starting "); Log_OC.d(TAG, "removeClientFor starting ");
} }
@ -198,9 +189,7 @@ public class SingleSessionManager implements OwnCloudClientManager {
@Override @Override
public void saveAllClients(Context context, String accountType) public void saveAllClients(Context context, String accountType) {
throws AccountNotFoundException, AuthenticatorException, IOException,
OperationCanceledException {
if (Log.isLoggable(TAG, Log.DEBUG)) { if (Log.isLoggable(TAG, Log.DEBUG)) {
Log_OC.d(TAG, "Saving sessions... "); Log_OC.d(TAG, "Saving sessions... ");
@ -223,7 +212,7 @@ public class SingleSessionManager implements OwnCloudClientManager {
} }
} }
private void keepCredentialsUpdated(OwnCloudAccount account, OwnCloudClient reusedClient) { private void keepCredentialsUpdated(OwnCloudClient reusedClient) {
reusedClient.applyCredentials(); reusedClient.applyCredentials();
} }