mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-27 17:46:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

- moved MediaScan to DownloadFileOperation.

Browse source
This commit is contained in:
tobiasKaminsky 2014-10-22 11:20:08 +02:00
parent 10b980cacf
commit b6f773bf8c
3 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/com/owncloud/android/operations/DownloadFileOperation.java
View file

@ -23,6 +23,7 @@ import java.util.Iterator;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
import com.owncloud.android.MainApp;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;
import com.owncloud.android.lib.common.OwnCloudClient;
@ -34,6 +35,7 @@ import com.owncloud.android.lib.resources.files.DownloadRemoteFileOperation;
import com.owncloud.android.utils.FileStorageUtils;
import android.accounts.Account;
import android.media.MediaScannerConnection;
import android.webkit.MimeTypeMap;
/**
@ -150,6 +152,11 @@ public class DownloadFileOperation extends RemoteOperation {
newFile = new File(getSavePath());
newFile.getParentFile().mkdirs();
moved = tmpFile.renameTo(newFile);
Log_OC.d("mediaScan", "mediaScan : " + newFile.getAbsolutePath());
MediaScannerConnection.scanFile(MainApp.getAppContext(),
new String[]{newFile.getAbsolutePath()}, null, null);
if (!moved)
result = new RemoteOperationResult(RemoteOperationResult.ResultCode.LOCAL_STORAGE_NOT_MOVED);

7
src/com/owncloud/android/operations/SynchronizeFileOperation.java
View file

@ -195,13 +195,6 @@ public class SynchronizeFileOperation extends SyncOperation {
}
}
// trigger MediaScan
MediaScannerConnection.scanFile(
null,
new String[]{mLocalFile.getStoragePath()},
null,null);
Log_OC.i(TAG, "Synchronizing " + mAccount.name + ", file " + mLocalFile.getRemotePath() + ": " + result.getLogMessage());
return result;

9
src/com/owncloud/android/services/observer/FileObserverService.java
View file

@ -353,7 +353,7 @@ public class FileObserverService extends Service {
Log_OC.d(TAG, "Received broadcast intent " + intent);
File downloadedFile = new File(intent.getStringExtra(FileDownloader.EXTRA_FILE_PATH));
String parentPath = downloadedFile.getParent();
String parentPath = downloadedFile.getParent();
FolderObserver observer = mFolderObserversMap.get(parentPath);
if (observer != null) {
if (intent.getAction().equals(FileDownloader.getDownloadFinishMessage())
@ -369,13 +369,6 @@ public class FileObserverService extends Service {
}
} else {
if (downloadedFile.exists()){
Log_OC.d("mediaScan", "mediaScan : " + downloadedFile.getAbsolutePath());
MediaScannerConnection.scanFile(getApplicationContext(),
new String[]{downloadedFile.getAbsolutePath()}, null, null);
}
Log_OC.d(TAG, "No observer for path " + downloadedFile.getAbsolutePath());
}
}