/* ownCloud Android client application
* Copyright (C) 2012 Bartek Przybylski
+ * Copyright (C) 2012-2014 ownCloud Inc.
*
* This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
package com.owncloud.android.files;
-import java.util.LinkedList;
-import java.util.List;
-
-import com.owncloud.android.datamodel.DataStorageManager;
-import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.files.OwnCloudFileObserver.FileObserverStatusListener.Status;
-import com.owncloud.android.files.services.FileUploader;
-import com.owncloud.android.network.OwnCloudClientUtils;
-import com.owncloud.android.operations.RemoteOperationResult;
-import com.owncloud.android.operations.SynchronizeFileOperation;
-
-import eu.alefzero.webdav.WebdavClient;
+import java.io.File;
import android.accounts.Account;
import android.content.Context;
import android.content.Intent;
import android.os.FileObserver;
-import android.util.Log;
+import android.os.Handler;
+
+import com.owncloud.android.datamodel.FileDataStorageManager;
+import com.owncloud.android.datamodel.OCFile;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
+import com.owncloud.android.operations.SynchronizeFileOperation;
+import com.owncloud.android.ui.activity.ConflictsResolveActivity;
+import com.owncloud.android.utils.Log_OC;
public class OwnCloudFileObserver extends FileObserver {
- public static int CHANGES_ONLY = CLOSE_WRITE | MOVED_FROM | MODIFY;
-
- private static String TAG = "OwnCloudFileObserver";
+ private static int MASK = (FileObserver.MODIFY | FileObserver.CLOSE_WRITE);
+ private static int IN_IGNORE = 32768;
+
+ private static String TAG = OwnCloudFileObserver.class.getSimpleName();
+
private String mPath;
private int mMask;
- DataStorageManager mStorage;
- Account mOCAccount;
- OCFile mFile;
- static Context mContext;
- List<FileObserverStatusListener> mListeners;
-
- public OwnCloudFileObserver(String path) {
- this(path, ALL_EVENTS);
- }
-
- public OwnCloudFileObserver(String path, int mask) {
- super(path, mask);
+ private Account mOCAccount;
+ private Context mContext;
+ private boolean mModified;
+ private long mFileLastModified;
+ private boolean mRestartWatching;
+ private Handler mHandler;
+
+ public OwnCloudFileObserver(String path, Account account, Context context, Handler handler) {
+ super(path, FileObserver.ALL_EVENTS);
+ if (path == null)
+ throw new IllegalArgumentException("NULL path argument received");
+ if (account == null)
+ throw new IllegalArgumentException("NULL account argument received");
+ if (context == null)
+ throw new IllegalArgumentException("NULL context argument received");
mPath = path;
- mMask = mask;
- mListeners = new LinkedList<FileObserverStatusListener>();
- }
-
- public void setAccount(Account account) {
mOCAccount = account;
- }
-
- public void setStorageManager(DataStorageManager manager) {
- mStorage = manager;
- }
-
- public void setOCFile(OCFile file) {
- mFile = file;
- }
-
- public void setContext(Context context) {
mContext = context;
+ mModified = false;
+ mFileLastModified = new File(path).lastModified();
+ mHandler = handler;
+ Log_OC.d(TAG, "Create Observer - FileLastModified: " + mFileLastModified);
}
- public String getPath() {
- return mPath;
- }
-
- public String getRemotePath() {
- return mFile.getRemotePath();
- }
-
- public void addObserverStatusListener(FileObserverStatusListener listener) {
- mListeners.add(listener);
- }
-
@Override
public void onEvent(int event, String path) {
- Log.d(TAG, "Got file modified with event " + event + " and path " + path);
- if ((event & mMask) == 0) {
- Log.wtf(TAG, "Incorrect event " + event + " sent for file " + path +
- " with registered for " + mMask + " and original path " +
- mPath);
- for (FileObserverStatusListener l : mListeners)
- l.OnObservedFileStatusUpdate(mPath, getRemotePath(), mOCAccount, Status.INCORRECT_MASK);
- return;
- }
- WebdavClient wc = OwnCloudClientUtils.createOwnCloudClient(mOCAccount, mContext);
- SynchronizeFileOperation sfo = new SynchronizeFileOperation(mFile.getRemotePath(), mStorage, mOCAccount, mContext);
- RemoteOperationResult result = sfo.execute(wc);
-
- if (result.getExtraData() == Boolean.TRUE) {
- // inform user about conflict and let him decide what to do
- for (FileObserverStatusListener l : mListeners)
- l.OnObservedFileStatusUpdate(mPath, getRemotePath(), mOCAccount, Status.CONFLICT);
- return;
- }
+ Log_OC.d(TAG, "Got file modified with event " + event + " and path " + mPath
+ + ((path != null) ? File.separator + path : ""));
+ if ((event & MASK) == 0) {
+ Log_OC.wtf(TAG, "Incorrect event " + event + " sent for file " + mPath
+ + ((path != null) ? File.separator + path : "") + " with registered for " + mMask
+ + " and original path " + mPath);
- for (FileObserverStatusListener l : mListeners)
- l.OnObservedFileStatusUpdate(mPath, getRemotePath(), mOCAccount, Status.SENDING_TO_UPLOADER);
-
- Intent i = new Intent(mContext, FileUploader.class);
- i.putExtra(FileUploader.KEY_ACCOUNT, mOCAccount);
- i.putExtra(FileUploader.KEY_REMOTE_FILE, mFile.getRemotePath());
- i.putExtra(FileUploader.KEY_LOCAL_FILE, mPath);
- i.putExtra(FileUploader.KEY_UPLOAD_TYPE, FileUploader.UPLOAD_SINGLE_FILE);
- i.putExtra(FileUploader.KEY_FORCE_OVERWRITE, true);
- mContext.startService(i);
+ // in case need start watching again
+ if ((event & IN_IGNORE) != 0 && mRestartWatching) {
+ mRestartWatching = false;
+
+ mHandler.postDelayed(new Runnable() {
+ public void run() {
+ startWatching();
+ }
+ }, 5000);
+
+ }
+ } else {
+ if ((event & FileObserver.MODIFY) != 0) {
+ // file changed
+ mModified = true;
+ }
+ // not sure if it's possible, but let's assume that both kind of
+ // events can be received at the same time
+ if ((event & FileObserver.CLOSE_WRITE) != 0) {
+ // file closed
+ if (mModified) {
+ mModified = false;
+ mRestartWatching = false;
+ startSyncOperation();
+ } else if (isFileUpdated()) {
+ // if file has been modified but Modify event type has not
+ // been launched
+ mRestartWatching = true;
+ mFileLastModified = new File(mPath).lastModified();
+ Log_OC.d(TAG, "CLOSE_WRITE - New FileLastModified: " + mFileLastModified);
+ startSyncOperation();
+ }
+ }
+ }
}
-
- public interface FileObserverStatusListener {
- public enum Status {
- SENDING_TO_UPLOADER,
- CONFLICT,
- INCORRECT_MASK
+
+ private void startSyncOperation() {
+ FileDataStorageManager storageManager = new FileDataStorageManager(mOCAccount, mContext.getContentResolver());
+ // a fresh object is needed; many things could have occurred to the file
+ // since it was registered to observe again, assuming that local files
+ // are linked to a remote file AT MOST, SOMETHING TO BE DONE;
+ OCFile file = storageManager.getFileByLocalPath(mPath);
+ SynchronizeFileOperation sfo = new SynchronizeFileOperation(file, null, mOCAccount, true, mContext);
+ RemoteOperationResult result = sfo.execute(storageManager, mContext);
+ if (result.getCode() == ResultCode.SYNC_CONFLICT) {
+ // ISSUE 5: if the user is not running the app (this is a service!),
+ // this can be very intrusive; a notification should be preferred
+ Intent i = new Intent(mContext, ConflictsResolveActivity.class);
+ i.setFlags(i.getFlags() | Intent.FLAG_ACTIVITY_NEW_TASK);
+ i.putExtra(ConflictsResolveActivity.EXTRA_FILE, file);
+ i.putExtra(ConflictsResolveActivity.EXTRA_ACCOUNT, mOCAccount);
+ mContext.startActivity(i);
}
-
- public void OnObservedFileStatusUpdate(String localPath,
- String remotePath,
- Account account,
- FileObserverStatusListener.Status status);
+ // TODO save other errors in some point where the user can inspect them
+ // later;
+ // or maybe just toast them;
+ // or nothing, very strange fails
+ }
+
+ /**
+ * Check if the timestamp of last file modification in local is more current
+ * that the timestamp when setting observer to the file
+ *
+ * @return boolean: True if file is updated, False if not
+ */
+ private boolean isFileUpdated() {
+ Log_OC.d(TAG, "FileLastModified: " + mFileLastModified);
+ return (new File(mPath).lastModified() > mFileLastModified);
}
-
}
projects / pub / Android / ownCloud.git / blobdiff