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

Magical magical stuff

Browse source
This commit is contained in:
Mario Danic 2017-02-05 22:52:50 +01:00 committed by AndyScherzinger
parent 37f31c5172
commit 6aba87ef97
No known key found for this signature in database
GPG key ID: 6CADC7E3523C308B
1 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -47,8 +47,8 @@ import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.ObjectInputStream; import java.io.ObjectInputStream;
import java.io.ObjectOutputStream; import java.io.ObjectOutputStream;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.concurrent.CopyOnWriteArrayList;
public class SyncedFolderObserverService extends Service { public class SyncedFolderObserverService extends Service {
private static final String TAG = "SyncedFolderObserverService"; private static final String TAG = "SyncedFolderObserverService";
@ -57,7 +57,7 @@ public class SyncedFolderObserverService extends Service {
private final IBinder mBinder = new SyncedFolderObserverBinder(); private final IBinder mBinder = new SyncedFolderObserverBinder();
private FileAlterationMonitor monitor; private FileAlterationMonitor monitor;
private FileFilter fileFilter; private FileFilter fileFilter;
private ArrayList<Pair<SyncedFolder, FileEntry>> pairArrayList = new ArrayList<>(); private CopyOnWriteArrayList<Pair<SyncedFolder, FileEntry>> pairArrayList = new CopyOnWriteArrayList<>();
private File file; private File file;
@Override @Override
@ -85,7 +85,7 @@ public class SyncedFolderObserverService extends Service {
try { try {
fis = new FileInputStream(file); fis = new FileInputStream(file);
ObjectInputStream ois = new ObjectInputStream(fis); ObjectInputStream ois = new ObjectInputStream(fis);
pairArrayList = (ArrayList<Pair<SyncedFolder, FileEntry>>)ois.readObject(); pairArrayList = (CopyOnWriteArrayList<Pair<SyncedFolder, FileEntry>>)ois.readObject();
readPerstistanceEntries = true; readPerstistanceEntries = true;
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
Log_OC.d(TAG, "Failed with FileNotFound while reading persistence file"); Log_OC.d(TAG, "Failed with FileNotFound while reading persistence file");
@ -222,6 +222,14 @@ public class SyncedFolderObserverService extends Service {
} catch (Exception e) { } catch (Exception e) {
Log_OC.d(TAG, "Something went very wrong at onDestroy"); Log_OC.d(TAG, "Something went very wrong at onDestroy");
} }
// remove it from the paired array list
for (int i = 0; i < pairArrayList.size(); i++) {
if (syncedFolder.equals(pairArrayList.get(i).first)) {
pairArrayList.remove(i);
break;
}
}
syncedFolderMap.remove(syncedFolder); syncedFolderMap.remove(syncedFolder);
} }
@ -236,6 +244,15 @@ public class SyncedFolderObserverService extends Service {
} else { } else {
fileAlterationObserver = new FileAlterationMagicObserver(new File(syncedFolder.getLocalPath()), fileAlterationObserver = new FileAlterationMagicObserver(new File(syncedFolder.getLocalPath()),
fileFilter); fileFilter);
try {
fileAlterationObserver.init();
Pair<SyncedFolder, FileEntry> pair = new Pair<>(syncedFolder, fileAlterationObserver.getRootEntry());
pairArrayList.add(pair);
} catch (Exception e) {
Log_OC.d(TAG, "Failed getting an observer to intialize");
}
fileAlterationObserver.addListener(new FileAlterationMagicListener(syncedFolder)); fileAlterationObserver.addListener(new FileAlterationMagicListener(syncedFolder));
monitor.addObserver(fileAlterationObserver); monitor.addObserver(fileAlterationObserver);
try { try {
@ -246,6 +263,8 @@ public class SyncedFolderObserverService extends Service {
} }
} }
writePersistenceEntries(false, file);
} }
@Override @Override