+/* ownCloud Android client application
+ * Copyright (C) 2012 Bartek Przybylski
+ * Copyright (C) 2012-2013 ownCloud Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
package com.owncloud.android.files;
+import java.io.File;
+
import com.owncloud.android.datamodel.FileDataStorageManager;
import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.files.services.FileUploader;
+import com.owncloud.android.lib.operations.common.RemoteOperationResult;
+import com.owncloud.android.operations.SynchronizeFileOperation;
+import com.owncloud.android.lib.operations.common.RemoteOperationResult.ResultCode;
+import com.owncloud.android.ui.activity.ConflictsResolveActivity;
+import com.owncloud.android.utils.Log_OC;
import android.accounts.Account;
import android.content.Context;
import android.content.Intent;
import android.os.FileObserver;
-import android.util.Log;
public class OwnCloudFileObserver extends FileObserver {
- public static int CHANGES_ONLY = CLOSE_WRITE | MOVED_FROM | MODIFY;
+ private static int MASK = (FileObserver.MODIFY | FileObserver.CLOSE_WRITE);
+
+ private static String TAG = OwnCloudFileObserver.class.getSimpleName();
- private static String TAG = "OwnCloudFileObserver";
private String mPath;
private int mMask;
- FileDataStorageManager mStorage;
- Account mOCAccount;
- OCFile mFile;
- static Context mContext;
-
- public OwnCloudFileObserver(String path) {
- this(path, ALL_EVENTS);
- }
+ private Account mOCAccount;
+ private Context mContext;
+ private boolean mModified;
+
- public OwnCloudFileObserver(String path, int mask) {
- super(path, mask);
+ public OwnCloudFileObserver(String path, Account account, Context context) {
+ super(path, MASK);
+ 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;
- }
-
- public void setAccount(Account account) {
mOCAccount = account;
+ mContext = context;
+ mModified = false;
}
- public void setStorageManager(FileDataStorageManager manager) {
- mStorage = manager;
- }
-
- public void setOCFile(OCFile file) {
- mFile = file;
- }
-
- public void setContext(Context context) {
- mContext = context;
- }
-
- public String getPath() {
- return mPath;
- }
-
- public String getRemotePath() {
- return mFile.getRemotePath();
- }
@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 +
+ 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);
- return;
+ } 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;
+ startSyncOperation();
+ }
+ }
+ }
+ }
+
+
+ private void startSyncOperation() {
+ FileDataStorageManager storageManager = new FileDataStorageManager(mOCAccount, mContext.getContentResolver());
+ OCFile file = storageManager.getFileByLocalPath(mPath); // 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;
+ SynchronizeFileOperation sfo = new SynchronizeFileOperation(file,
+ null,
+ storageManager,
+ mOCAccount,
+ true,
+ mContext);
+ RemoteOperationResult result = sfo.execute(mOCAccount, 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);
}
- 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);
+ // TODO save other errors in some point where the user can inspect them later;
+ // or maybe just toast them;
+ // or nothing, very strange fails
}
}
projects / pub / Android / ownCloud.git / blobdiff