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

Some progress on auto-upload fixes

Browse source
This commit is contained in:
Mario Danic 2017-02-06 13:21:04 +01:00
parent dcf99f8cb4
commit 9c39a6dfdc
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/com/owncloud/android/services/FileAlterationMagicListener.java
View file

@ -128,6 +128,7 @@ public class FileAlterationMagicListener implements FileAlterationListener {
if (fileRunnable.containsKey(file.getAbsolutePath())) { if (fileRunnable.containsKey(file.getAbsolutePath())) {
handler.removeCallbacks(fileRunnable.get(file.getAbsolutePath())); handler.removeCallbacks(fileRunnable.get(file.getAbsolutePath()));
handler.postDelayed(fileRunnable.get(file.getAbsolutePath()), 500); handler.postDelayed(fileRunnable.get(file.getAbsolutePath()), 500);
fileRunnable.remove(file.getAbsolutePath());
} }
} }
@ -135,6 +136,7 @@ public class FileAlterationMagicListener implements FileAlterationListener {
public void onFileDelete(File file) { public void onFileDelete(File file) {
if (fileRunnable.containsKey(file.getAbsolutePath())) { if (fileRunnable.containsKey(file.getAbsolutePath())) {
handler.removeCallbacks(fileRunnable.get(file.getAbsolutePath())); handler.removeCallbacks(fileRunnable.get(file.getAbsolutePath()));
fileRunnable.remove(file.getAbsolutePath());
} }
} }

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

@ -138,6 +138,15 @@ public class SyncedFolderObserverService extends Service {
} else { } else {
for(int i = 0; i < pairArrayList.size(); i++) { for(int i = 0; i < pairArrayList.size(); i++) {
SyncedFolder syncFolder = pairArrayList.get(i).getKey(); SyncedFolder syncFolder = pairArrayList.get(i).getKey();
for(SyncedFolder syncedFolder : mProvider.getSyncedFolders()) {
if (syncFolder.getId() == syncedFolder.getId()) {
syncFolder = syncedFolder;
pairArrayList.set(i, new SerializablePair<SyncedFolder, FileEntry>(syncFolder,
pairArrayList.get(i).getValue()));
break;
}
}
FileAlterationMagicObserver observer = new FileAlterationMagicObserver(new File( FileAlterationMagicObserver observer = new FileAlterationMagicObserver(new File(
syncFolder.getLocalPath()), fileFilter); syncFolder.getLocalPath()), fileFilter);
observer.setRootEntry(pairArrayList.get(i).getValue()); observer.setRootEntry(pairArrayList.get(i).getValue());