yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-05 02:39:23 +02:00
Code Issues Releases Wiki Activity

new synchronisation-related actions in library menus

Browse source
This commit is contained in:
Nikolay Pultsin 2014-07-27 22:10:55 +01:00
parent 0a7aa5fc29
commit 05fd7f181f
4 changed files with 126 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/org/geometerplus/android/fbreader/synchroniser/SynchroniserService.java
View file

@ -216,7 +216,8 @@ public class SynchroniserService extends Service implements IBookCollection.List
return SyncStatus.HashNotComputed;
} else if (myActualHashesFromServer.contains(hash)) {
return SyncStatus.AlreadyUploaded;
} else if (myDeletedHashesFromServer.contains(hash)) {
} else if (myDeletedHashesFromServer.contains(hash) &&
!book.labels().contains(Book.SYNC_TOSYNC_LABEL)) {
return SyncStatus.ToBeDeleted;
} else if (book.labels().contains(Book.SYNC_FAILURE_LABEL)) {
return SyncStatus.FailedPreviuousTime;