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

Revert "Remove useless conditions"

Browse source 
This reverts commit 5dd6d9181eaa36f5177760046d71dade444698ad.
This commit is contained in:
Mario Danic 2017-02-05 22:59:09 +01:00 committed by AndyScherzinger
parent fe4c44a586
commit f5f115e790
No known key found for this signature in database
GPG key ID: 6CADC7E3523C308B
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -78,6 +78,7 @@ public class SyncedFolderObserverService extends Service {
file = new File(MainApp.getAppContext().getExternalFilesDir(null).getAbsolutePath() + "/nc_persistence");
boolean readPerstistanceEntries = false;
if (file.exists() ) {
FileInputStream fis = null;
@ -85,6 +86,7 @@ public class SyncedFolderObserverService extends Service {
fis = new FileInputStream(file);
ObjectInputStream ois = new ObjectInputStream(fis);
pairArrayList = (CopyOnWriteArrayList<Pair<SyncedFolder, FileEntry>>)ois.readObject();
readPerstistanceEntries = true;
} catch (FileNotFoundException e) {
Log_OC.d(TAG, "Failed with FileNotFound while reading persistence file");
} catch (IOException e) {
@ -138,7 +140,7 @@ public class SyncedFolderObserverService extends Service {
}
}
writePersistenceEntries(file);
writePersistenceEntries(readPerstistanceEntries, file);
try {
monitor.start();
@ -150,11 +152,11 @@ public class SyncedFolderObserverService extends Service {
return Service.START_NOT_STICKY;
}
private void writePersistenceEntries(File file) {
private void writePersistenceEntries(boolean readPerstistanceEntries, File file) {
FileOutputStream fos = null;
try {
if (pairArrayList.size() > 0) {
if (pairArrayList.size() > 0 && !readPerstistanceEntries) {
fos = MainApp.getAppContext().openFileOutput(file.getAbsolutePath(), Context.MODE_PRIVATE);
ObjectOutputStream os = new ObjectOutputStream(fos);
for (int i = 0; i < pairArrayList.size(); i++) {
@ -199,7 +201,7 @@ public class SyncedFolderObserverService extends Service {
}
}
writePersistenceEntries(file);
writePersistenceEntries(false, file);
}
/**
@ -262,7 +264,7 @@ public class SyncedFolderObserverService extends Service {
}
}
writePersistenceEntries(file);
writePersistenceEntries(false, file);
}
@Override