X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/6c32365704be635c38e0a338b727643fa76120f5..c2abbaaedb69dba35866a48b745b68f3519cbca1:/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 bc528308..8f2e3ee6 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 @@ -18,122 +18,86 @@ package com.owncloud.android.files; -import java.util.LinkedList; -import java.util.List; +import java.io.File; -import com.owncloud.android.datamodel.DataStorageManager; +import com.owncloud.android.Log_OC; +import com.owncloud.android.datamodel.FileDataStorageManager; 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 com.owncloud.android.operations.RemoteOperationResult.ResultCode; +import com.owncloud.android.ui.activity.ConflictsResolveActivity; + -import eu.alefzero.webdav.WebdavClient; 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; + public static int CHANGES_ONLY = CLOSE_WRITE; + + private static String TAG = OwnCloudFileObserver.class.getSimpleName(); - private static String TAG = "OwnCloudFileObserver"; private String mPath; private int mMask; - DataStorageManager mStorage; - Account mOCAccount; - OCFile mFile; - static Context mContext; - List mListeners; - - public OwnCloudFileObserver(String path) { - this(path, ALL_EVENTS); - } + private Account mOCAccount; + //private OCFile mFile; + private Context mContext; + - public OwnCloudFileObserver(String path, int mask) { + public OwnCloudFileObserver(String path, Account account, Context context, int mask) { super(path, mask); + if (path == null) + throw new IllegalArgumentException("NULL path argument received"); + /*if (file == null) + throw new IllegalArgumentException("NULL file argument received");*/ + if (account == null) + throw new IllegalArgumentException("NULL account argument received"); + if (context == null) + throw new IllegalArgumentException("NULL context argument received"); + /*if (!path.equals(file.getStoragePath()) && !path.equals(FileStorageUtils.getDefaultSavePathFor(account.name, file))) + throw new IllegalArgumentException("File argument is not linked to the local file set in path argument"); */ mPath = path; - mMask = mask; - mListeners = new LinkedList(); - } - - public void setAccount(Account account) { + //mFile = file; mOCAccount = account; - } - - 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); + mContext = context; + mMask = mask; } @Override public void onEvent(int event, String path) { - Log.d(TAG, "Got file modified with event " + event + " and path " + path); + Log_OC.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 " + path + + 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.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; } - - 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); - } - - public interface FileObserverStatusListener { - public enum Status { - SENDING_TO_UPLOADER, - CONFLICT, - INCORRECT_MASK + 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, + 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); } - - 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 } }