X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/c301865c351da2c46c82cca268c0d7e32bc2fd83..e1245bbda7894e1a3028d2b54a6918e4bdd46ae2:/src/com/owncloud/android/files/OwnCloudFileObserver.java diff --git a/src/com/owncloud/android/files/OwnCloudFileObserver.java b/src/com/owncloud/android/files/OwnCloudFileObserver.java index 3cbdb1e5..68c97e4f 100644 --- a/src/com/owncloud/android/files/OwnCloudFileObserver.java +++ b/src/com/owncloud/android/files/OwnCloudFileObserver.java @@ -1,10 +1,10 @@ /* 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 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 @@ -19,109 +19,94 @@ package com.owncloud.android.files; import java.io.File; -import java.util.LinkedList; -import java.util.List; -import com.owncloud.android.datamodel.DataStorageManager; +import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; -import com.owncloud.android.network.OwnCloudClientUtils; -import com.owncloud.android.operations.RemoteOperationResult; +import com.owncloud.android.oc_framework.operations.RemoteOperationResult; import com.owncloud.android.operations.SynchronizeFileOperation; - -import eu.alefzero.webdav.WebdavClient; +import com.owncloud.android.oc_framework.operations.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; + private static int MASK = (FileObserver.MODIFY | FileObserver.CLOSE_WRITE); private static String TAG = OwnCloudFileObserver.class.getSimpleName(); + private String mPath; private int mMask; - private DataStorageManager mStorage; private Account mOCAccount; - private OCFile mFile; private Context mContext; - private List mListeners; - - public OwnCloudFileObserver(String path) { - this(path, ALL_EVENTS); - } + 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; - mListeners = new LinkedList(); - } - - public void setAccount(Account account) { mOCAccount = account; + mContext = context; + mModified = false; } - public void setStorageManager(DataStorageManager 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(); - } - - 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 " + mPath + ((path != null) ? File.separator + path : "")); - if ((event & mMask) == 0) { - Log.wtf(TAG, "Incorrect event " + event + " sent for file " + mPath + ((path != null) ? File.separator + 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); - /* Unexpected event that will be ignored; no reason to propagate it - for (FileObserverStatusListener l : mListeners) - l.OnObservedFileStatusUpdate(mPath, getRemotePath(), mOCAccount, Status.INCORRECT_MASK); - */ - return; - } - WebdavClient wc = OwnCloudClientUtils.createOwnCloudClient(mOCAccount, mContext); - SynchronizeFileOperation sfo = new SynchronizeFileOperation(mFile, null, mStorage, mOCAccount, true, false, mContext); - RemoteOperationResult result = sfo.execute(wc); - for (FileObserverStatusListener l : mListeners) { - l.onObservedFileStatusUpdate(mPath, getRemotePath(), mOCAccount, result); - } - - } - - public interface FileObserverStatusListener { - public void onObservedFileStatusUpdate(String localPath, - String remotePath, - Account account, - RemoteOperationResult result); - } - - public OCFile getOCFile() { - return mFile; + } 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(); + } + } + } } - public Account getAccount() { - return mOCAccount; + + 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); + } + // TODO save other errors in some point where the user can inspect them later; + // or maybe just toast them; + // or nothing, very strange fails } }