mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-23 21:55:48 +03:00
Code Issues Projects Releases Packages Wiki Activity

- update to obey non-image files

Browse source
This commit is contained in:
tobiasKaminsky 2014-10-22 09:07:08 +02:00
parent d7b32ecc17
commit c505977cb8
4 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/com/owncloud/android/files/FileOperationsHelper.java
View file

@ -22,7 +22,6 @@ import org.apache.http.protocol.HTTP;
import android.accounts.Account;
import android.accounts.AccountManager;
import android.content.Intent;
import android.media.MediaScannerConnection;
import android.net.Uri;
import android.support.v4.app.DialogFragment;
import android.webkit.MimeTypeMap;

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

@ -33,6 +33,7 @@ import com.owncloud.android.utils.FileStorageUtils;
import android.accounts.Account;
import android.content.Context;
import android.content.Intent;
import android.media.MediaScannerConnection;
/**
* Remote operation performing the read of remote file in the ownCloud server.
@ -194,6 +195,12 @@ 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());

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

@ -30,10 +30,12 @@ import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.database.Cursor;
import android.media.MediaScannerConnection;
import android.os.IBinder;
import com.owncloud.android.MainApp;
import com.owncloud.android.authentication.AccountUtils;
import com.owncloud.android.datamodel.FileDataStorageManager;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.db.ProviderMeta.ProviderTableMeta;
import com.owncloud.android.files.services.FileDownloader;
@ -351,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())
@ -367,6 +369,13 @@ 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());
}
}

8
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
View file

@ -308,7 +308,13 @@ public class OCFileListFragment extends ExtendedListFragment {
case R.id.action_download_file:
case R.id.action_sync_file: {
mContainerActivity.getFileOperationsHelper().syncFile(mTargetFile);
triggerMediaScan(mTargetFile.getStoragePath());
Log_OC.d("mediascan", "path: " + mTargetFile.getRemotePath());
FileDataStorageManager storageManager = mContainerActivity.getStorageManager();
Log_OC.d("mediaScan", "path: "+ storageManager.getFileByPath(mTargetFile.getRemotePath()).getStoragePath());
// TODO triggerMediaScan
return true;
}
case R.id.action_cancel_download: