projects
/
pub
/
Android
/
ownCloud.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed some log levels
[pub/Android/ownCloud.git]
/
src
/
com
/
owncloud
/
android
/
MainApp.java
diff --git
a/src/com/owncloud/android/MainApp.java
b/src/com/owncloud/android/MainApp.java
index
37a3e6f
..
072469d
100644
(file)
--- a/
src/com/owncloud/android/MainApp.java
+++ b/
src/com/owncloud/android/MainApp.java
@@
-19,7
+19,6
@@
package com.owncloud.android;
import android.app.Application;
import android.content.Context;
import android.app.Application;
import android.content.Context;
-import com.owncloud.android.authentication.AccountUtils;
import com.owncloud.android.datamodel.ThumbnailsCacheManager;
import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
import com.owncloud.android.lib.common.OwnCloudClientManagerFactory.Policy;
import com.owncloud.android.datamodel.ThumbnailsCacheManager;
import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
import com.owncloud.android.lib.common.OwnCloudClientManagerFactory.Policy;
@@
-37,29
+36,17
@@
public class MainApp extends Application {
private static final String AUTH_ON = "on";
private static final String AUTH_ON = "on";
- @SuppressWarnings("unused")
- private static final String POLICY_SINGLE_SESSION_PER_ACCOUNT = "single session per account";
- @SuppressWarnings("unused")
- private static final String POLICY_ALWAYS_NEW_CLIENT = "always new client";
-
private static Context mContext;
public void onCreate(){
super.onCreate();
MainApp.mContext = getApplicationContext();
private static Context mContext;
public void onCreate(){
super.onCreate();
MainApp.mContext = getApplicationContext();
-
- boolean isSamlAuth = AUTH_ON.equals(getString(R.string.auth_method_saml_web_sso));
-
- if (isSamlAuth) {
- OwnCloudClientManagerFactory.setDefaultPolicy(Policy.SINGLE_SESSION_PER_ACCOUNT);
-
- } else {
- OwnCloudClientManagerFactory.setDefaultPolicy(Policy.ALWAYS_NEW_CLIENT);
- }
+ // keep a single session per account handling session cookie in requests (& all the other cookies)
+ OwnCloudClientManagerFactory.setDefaultPolicy(Policy.SINGLE_SESSION_PER_ACCOUNT);
+
// initialise thumbnails cache on background thread
// initialise thumbnails cache on background thread
- new ThumbnailsCacheManager.InitDiskCacheTask(AccountUtils.getCurrentOwnCloudAccount(mContext),
- mContext).execute();
+ new ThumbnailsCacheManager.InitDiskCacheTask().execute();
if (BuildConfig.DEBUG) {
if (BuildConfig.DEBUG) {