diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/OwnCloudAccount.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/OwnCloudAccount.java index 87e1e150..ba03b545 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/OwnCloudAccount.java +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/OwnCloudAccount.java @@ -107,13 +107,11 @@ public class OwnCloudAccount { * Method for deferred load of account attributes from AccountManager * * @param context - * @throws AccountNotFoundException * @throws AuthenticatorException * @throws IOException * @throws OperationCanceledException */ - public void loadCredentials(Context context) throws AuthenticatorException, - IOException, OperationCanceledException { + public void loadCredentials(Context context) throws AuthenticatorException, IOException, OperationCanceledException { if (context == null) { throw new IllegalArgumentException("Parameter 'context' cannot be null"); diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/OwnCloudClientManager.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/OwnCloudClientManager.java index c2d7e6b3..fe793863 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/OwnCloudClientManager.java +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/OwnCloudClientManager.java @@ -43,12 +43,10 @@ import java.io.IOException; public interface OwnCloudClientManager { OwnCloudClient getClientFor(OwnCloudAccount account, Context context) throws AccountNotFoundException, - OperationCanceledException, AuthenticatorException, - IOException; + OperationCanceledException, AuthenticatorException, IOException; OwnCloudClient removeClientFor(OwnCloudAccount account); - void saveAllClients(Context context, String accountType) - throws AccountNotFoundException, AuthenticatorException, - IOException, OperationCanceledException; + void saveAllClients(Context context, String accountType) throws AccountNotFoundException, AuthenticatorException, IOException, + OperationCanceledException; } \ No newline at end of file diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/OwnCloudClientManagerFactory.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/OwnCloudClientManagerFactory.java index 7b1b0b5b..b66bc249 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/OwnCloudClientManagerFactory.java +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/OwnCloudClientManagerFactory.java @@ -82,18 +82,13 @@ public class OwnCloudClientManagerFactory { if (sDefaultSingleton == null) { return false; } - if (policy == Policy.ALWAYS_NEW_CLIENT && - !(sDefaultSingleton instanceof SimpleFactoryManager)) { + if (policy == Policy.ALWAYS_NEW_CLIENT && !(sDefaultSingleton instanceof SimpleFactoryManager)) { return true; } - if (policy == Policy.SINGLE_SESSION_PER_ACCOUNT && - !(sDefaultSingleton instanceof SingleSessionManager)) { - return true; - } - return false; + return policy == Policy.SINGLE_SESSION_PER_ACCOUNT && !(sDefaultSingleton instanceof SingleSessionManager); } - public static enum Policy { + public enum Policy { ALWAYS_NEW_CLIENT, SINGLE_SESSION_PER_ACCOUNT, SINGLE_SESSION_PER_ACCOUNT_IF_SERVER_SUPPORTS_SERVER_MONITORING diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/SingleSessionManager.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/SingleSessionManager.java index 128207a8..630ba7f7 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/SingleSessionManager.java +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/SingleSessionManager.java @@ -34,6 +34,7 @@ import android.util.Log; import com.owncloud.android.lib.common.accounts.AccountUtils; import com.owncloud.android.lib.common.authentication.OwnCloudSamlSsoCredentials; +import com.owncloud.android.lib.common.http.HttpClient; import com.owncloud.android.lib.common.utils.Log_OC; import java.io.IOException; @@ -56,11 +57,9 @@ public class SingleSessionManager implements OwnCloudClientManager { private static final String TAG = SingleSessionManager.class.getSimpleName(); - private ConcurrentMap mClientsWithKnownUsername = - new ConcurrentHashMap<>(); + private ConcurrentMap mClientsWithKnownUsername = new ConcurrentHashMap<>(); - private ConcurrentMap mClientsWithUnknownUsername = - new ConcurrentHashMap<>(); + private ConcurrentMap mClientsWithUnknownUsername = new ConcurrentHashMap<>(); @Override public OwnCloudClient getClientFor(OwnCloudAccount account, Context context) throws OperationCanceledException, @@ -76,9 +75,7 @@ public class SingleSessionManager implements OwnCloudClientManager { OwnCloudClient client = null; String accountName = account.getName(); String sessionName = account.getCredentials() == null ? "" : - AccountUtils.buildAccountName( - account.getBaseUri(), - account.getCredentials().getAuthToken()); + AccountUtils.buildAccountName(account.getBaseUri(), account.getCredentials().getAuthToken()); if (accountName != null) { client = mClientsWithKnownUsername.get(accountName); @@ -113,7 +110,7 @@ public class SingleSessionManager implements OwnCloudClientManager { context.getApplicationContext(), true); // TODO remove dependency on OwnCloudClientFactory client.setAccount(account); - client.setContext(context); + HttpClient.setContext(context); client.setOwnCloudClientManager(this); account.loadCredentials(context); @@ -198,10 +195,7 @@ public class SingleSessionManager implements OwnCloudClientManager { while (accountNames.hasNext()) { accountName = accountNames.next(); account = new Account(accountName, accountType); - AccountUtils.saveClient( - mClientsWithKnownUsername.get(accountName), - account, - context); + AccountUtils.saveClient(mClientsWithKnownUsername.get(accountName), account, context); } if (Log.isLoggable(TAG, Log.DEBUG)) { @@ -218,7 +212,7 @@ public class SingleSessionManager implements OwnCloudClientManager { if (am != null && account.getSavedAccount() != null) { String recentCookies = am.getUserData(account.getSavedAccount(), AccountUtils.Constants.KEY_COOKIES); String previousCookies = reusedClient.getCookiesString(); - if (recentCookies != null && previousCookies != "" && !recentCookies.equals(previousCookies)) { + if (recentCookies != null && !previousCookies.equals("") && !recentCookies.equals(previousCookies)) { AccountUtils.restoreCookies(account.getSavedAccount(), reusedClient, context); } } diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/authentication/oauth/BearerCredentials.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/authentication/oauth/BearerCredentials.java index ffed3a03..6f7e9a6e 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/authentication/oauth/BearerCredentials.java +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/authentication/oauth/BearerCredentials.java @@ -41,9 +41,6 @@ public class BearerCredentials { * @param token The bearer token */ public BearerCredentials(String token) { - /*if (token == null) { - throw new IllegalArgumentException("Bearer token may not be null"); - }*/ mAccessToken = (token == null) ? "" : token; } diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/network/AdvancedX509TrustManager.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/network/AdvancedX509TrustManager.java index a1fbf59d..f70dabd8 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/network/AdvancedX509TrustManager.java +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/network/AdvancedX509TrustManager.java @@ -33,7 +33,6 @@ import java.security.KeyStore; import java.security.KeyStoreException; import java.security.NoSuchAlgorithmException; import java.security.cert.CertPathValidatorException; -import java.security.cert.CertStoreException; import java.security.cert.CertificateException; import java.security.cert.CertificateExpiredException; import java.security.cert.CertificateNotYetValidException; @@ -46,20 +45,17 @@ public class AdvancedX509TrustManager implements X509TrustManager { private static final String TAG = AdvancedX509TrustManager.class.getSimpleName(); - private X509TrustManager mStandardTrustManager = null; + private X509TrustManager mStandardTrustManager; private KeyStore mKnownServersKeyStore; /** * Constructor for AdvancedX509TrustManager * * @param knownServersKeyStore Local certificates store with server certificates explicitly trusted by the user. - * @throws CertStoreException When no default X509TrustManager instance was found in the system. */ - public AdvancedX509TrustManager(KeyStore knownServersKeyStore) - throws NoSuchAlgorithmException, KeyStoreException, CertStoreException { + public AdvancedX509TrustManager(KeyStore knownServersKeyStore) throws NoSuchAlgorithmException, KeyStoreException { super(); - TrustManagerFactory factory = TrustManagerFactory - .getInstance(TrustManagerFactory.getDefaultAlgorithm()); + TrustManagerFactory factory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()); factory.init((KeyStore) null); mStandardTrustManager = findX509TrustManager(factory); @@ -71,13 +67,12 @@ public class AdvancedX509TrustManager implements X509TrustManager { * * @param factory TrustManagerFactory to inspect in the search for a X509TrustManager * @return The first X509TrustManager found in factory. - * @throws CertStoreException When no X509TrustManager instance was found in factory */ - private X509TrustManager findX509TrustManager(TrustManagerFactory factory) throws CertStoreException { + private X509TrustManager findX509TrustManager(TrustManagerFactory factory) { TrustManager tms[] = factory.getTrustManagers(); - for (int i = 0; i < tms.length; i++) { - if (tms[i] instanceof X509TrustManager) { - return (X509TrustManager) tms[i]; + for (TrustManager tm : tms) { + if (tm instanceof X509TrustManager) { + return (X509TrustManager) tm; } } return null; @@ -116,7 +111,7 @@ public class AdvancedX509TrustManager implements X509TrustManager { previousCause = cause; cause = cause.getCause(); } - if (cause != null && cause instanceof CertPathValidatorException) { + if (cause instanceof CertPathValidatorException) { result.setCertPathValidatorException((CertPathValidatorException) cause); } else { result.setOtherCertificateException(c); diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/network/ProgressiveDataTransferer.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/network/ProgressiveDataTransferer.java index 9c89e542..19b07205 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/network/ProgressiveDataTransferer.java +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/network/ProgressiveDataTransferer.java @@ -28,10 +28,10 @@ import java.util.Collection; public interface ProgressiveDataTransferer { - public void addDatatransferProgressListener(OnDatatransferProgressListener listener); + void addDatatransferProgressListener(OnDatatransferProgressListener listener); - public void addDatatransferProgressListeners(Collection listeners); + void addDatatransferProgressListeners(Collection listeners); - public void removeDatatransferProgressListener(OnDatatransferProgressListener listener); + void removeDatatransferProgressListener(OnDatatransferProgressListener listener); } diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java index 40d19465..e9263cd7 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java @@ -58,15 +58,8 @@ public class GetRemoteUserAvatarOperation extends RemoteOperation(RemoteOperationResult.ResultCode.FILE_NOT_FOUND); return result; } @@ -115,12 +104,10 @@ public class GetRemoteUserAvatarOperation extends RemoteOperation