import com.owncloud.android.lib.common.operations.RemoteOperationResult;
import com.owncloud.android.lib.resources.files.ExistenceCheckRemoteOperation;
import com.owncloud.android.lib.resources.shares.ShareType;
+import com.owncloud.android.lib.resources.users.GetRemoteUserNameOperation;
import com.owncloud.android.operations.common.SyncOperation;
import com.owncloud.android.operations.CreateShareOperation;
import com.owncloud.android.operations.GetServerInfoOperation;
public static final String EXTRA_PASSWORD = "PASSWORD";
public static final String EXTRA_AUTH_TOKEN = "AUTH_TOKEN";
public static final String EXTRA_FOLLOW_REDIRECTS = "FOLLOW_REDIRECTS";
+ public static final String EXTRA_COOKIE = "COOKIE";
public static final String ACTION_CREATE_SHARE = "CREATE_SHARE";
public static final String ACTION_UNSHARE = "UNSHARE";
public static final String ACTION_GET_SERVER_INFO = "GET_SERVER_INFO";
public static final String ACTION_OAUTH2_GET_ACCESS_TOKEN = "OAUTH2_GET_ACCESS_TOKEN";
public static final String ACTION_EXISTENCE_CHECK = "EXISTENCE_CHECK";
+ public static final String ACTION_GET_USER_NAME = "GET_USER_NAME";
public static final String ACTION_OPERATION_ADDED = OperationsService.class.getName() + ".OPERATION_ADDED";
public static final String ACTION_OPERATION_FINISHED = OperationsService.class.getName() + ".OPERATION_FINISHED";
private ConcurrentLinkedQueue<Pair<Target, RemoteOperation>> mPendingOperations =
new ConcurrentLinkedQueue<Pair<Target, RemoteOperation>>();
+ /*
private ConcurrentMap<Integer, RemoteOperationResult> mOperationResults =
new ConcurrentHashMap<Integer, RemoteOperationResult>();
+ */
+
+ private ConcurrentMap<Integer, Pair<RemoteOperation, RemoteOperationResult>>
+ mUndispatchedFinishedOperations =
+ new ConcurrentHashMap<Integer, Pair<RemoteOperation, RemoteOperationResult>>();
private static class Target {
public Uri mServerUrl = null;
public String mPassword = "";
public String mAuthToken = "";
public boolean mFollowRedirects = true;
+ public String mCookie = "";
public Target(Account account, Uri serverUrl, String webdavUrl, String username, String password, String authToken,
- boolean followRedirects) {
+ boolean followRedirects, String cookie) {
mAccount = account;
mServerUrl = serverUrl;
mWebDavUrl = webdavUrl;
mPassword = password;
mAuthToken = authToken;
mFollowRedirects = followRedirects;
+ mCookie = cookie;
}
}
*/
@Override
public int onStartCommand(Intent intent, int flags, int startId) {
- //Log.wtf(TAG, "onStartCommand init" );
+ Log_OC.wtf(TAG, "onStartCommand init" );
Message msg = mServiceHandler.obtainMessage();
msg.arg1 = startId;
mServiceHandler.sendMessage(msg);
- //Log.wtf(TAG, "onStartCommand end" );
+ Log_OC.wtf(TAG, "onStartCommand end" );
return START_NOT_STICKY;
}
-
+ @Override
+ public void onDestroy() {
+ Log_OC.wtf(TAG, "onDestroy init" );
+ super.onDestroy();
+ Log_OC.wtf(TAG, "Clear mUndispatchedFinisiedOperations" );
+ mUndispatchedFinishedOperations.clear();
+ Log_OC.wtf(TAG, "onDestroy end" );
+ }
+
+
/**
* Provides a binder object that clients can use to perform actions on the queue of operations,
* except the addition of new operations.
*/
@Override
public IBinder onBind(Intent intent) {
- //Log.wtf(TAG, "onBind" );
+ Log_OC.wtf(TAG, "onBind" );
return mBinder;
}
String password = operationIntent.getStringExtra(EXTRA_PASSWORD);
String authToken = operationIntent.getStringExtra(EXTRA_AUTH_TOKEN);
boolean followRedirects = operationIntent.getBooleanExtra(EXTRA_FOLLOW_REDIRECTS, true);
+ String cookie = operationIntent.getStringExtra(EXTRA_COOKIE);
target = new Target(
account,
(serverUrl == null) ? null : Uri.parse(serverUrl),
(username == null) ? "" : username,
(password == null) ? "" : password,
(authToken == null) ? "" : authToken,
- followRedirects
+ followRedirects,
+ (cookie == null) ? "" : cookie
);
String action = operationIntent.getAction();
boolean successIfAbsent = operationIntent.getBooleanExtra(EXTRA_SUCCESS_IF_ABSENT, true);
operation = new ExistenceCheckRemoteOperation(remotePath, OperationsService.this, successIfAbsent);
+ } else if (action.equals(ACTION_GET_USER_NAME)) {
+ // Get User Name
+ operation = new GetRemoteUserNameOperation();
}
}
if (operation != null) {
mPendingOperations.add(new Pair<Target , RemoteOperation>(target, operation));
startService(new Intent(OperationsService.this, OperationsService.class));
+ Log_OC.wtf(TAG, "New operation added, opId: " + operation.hashCode());
return operation.hashCode();
} else {
+ Log_OC.wtf(TAG, "New operation failed, returned -1");
return -1;
}
}
- public RemoteOperationResult getOperationResultIfFinished(int mDetectAuthOpId) {
- //Log_OC.wtf(TAG, "Searching result for operation with id " + mDetectAuthOpId);
- return mOperationResults.remove(mDetectAuthOpId);
+ public RemoteOperationResult getOperationResultIfFinished(int operationId) {
+ Pair<RemoteOperation, RemoteOperationResult> undispatched =
+ mUndispatchedFinishedOperations.remove(operationId);
+ if (undispatched != null) {
+ return undispatched.second;
+ }
+ return null;
+ }
+
+
+ public void dispatchResultIfFinished(int operationId, OnRemoteOperationListener listener) {
+ Pair<RemoteOperation, RemoteOperationResult> undispatched =
+ mUndispatchedFinishedOperations.remove(operationId);
+ if (undispatched != null) {
+ listener.onRemoteOperationFinish(undispatched.first, undispatched.second);
+ Log_OC.wtf(TAG, "Sending callback later");
+ } else {
+ Log_OC.wtf(TAG, "Not finished yet");
+ }
}
}
*/
private void nextOperation() {
- //Log.wtf(TAG, "nextOperation init" );
+ Log_OC.wtf(TAG, "nextOperation init" );
Pair<Target, RemoteOperation> next = null;
synchronized(mPendingOperations) {
mOwnCloudClient.setBasicCredentials(mLastTarget.mUsername, mLastTarget.mPassword);
} else if (mLastTarget.mAuthToken != "") {
mOwnCloudClient.setBearerCredentials(mLastTarget.mAuthToken);
+ } else if (mLastTarget.mCookie != "") {
+ mOwnCloudClient.setSsoSessionCookie(mLastTarget.mCookie);
}
mStorageManager = null;
}
} finally {
synchronized(mPendingOperations) {
mPendingOperations.poll();
- mOperationResults.put(mCurrentOperation.hashCode(), result);
}
}
//sendBroadcastOperationFinished(mLastTarget, mCurrentOperation, result);
- callbackOperationListeners(mLastTarget, mCurrentOperation, result);
+ dispatchResultToOperationListeners(mLastTarget, mCurrentOperation, result);
}
}
* @param operation Finished operation.
* @param result Result of the operation.
*/
- private void callbackOperationListeners(
+ private void dispatchResultToOperationListeners(
Target target, final RemoteOperation operation, final RemoteOperationResult result) {
int count = 0;
Iterator<OnRemoteOperationListener> listeners = mBinder.mBoundListeners.keySet().iterator();
count += 1;
}
}
+ if (count == 0) {
+ //mOperationResults.put(operation.hashCode(), result);
+ Pair<RemoteOperation, RemoteOperationResult> undispatched =
+ new Pair<RemoteOperation, RemoteOperationResult>(operation, result);
+ mUndispatchedFinishedOperations.put(operation.hashCode(), undispatched);
+ }
Log_OC.d(TAG, "Called " + count + " listeners");
}
projects / pub / Android / ownCloud.git / blobdiff