Skip to content

Commit

Permalink
Update SyncUtils.kt
Browse files Browse the repository at this point in the history
  • Loading branch information
amberin authored May 18, 2024
1 parent a8aa7d9 commit c499fb5
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions app/src/main/java/com/orgzly/android/sync/SyncUtils.kt
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,11 @@ object SyncUtils {
BookSyncStatus.CONFLICT_BOOK_WITH_LINK_AND_ROOK_BUT_NEVER_SYNCED_BEFORE,
BookSyncStatus.CONFLICT_LAST_SYNCED_ROOK_AND_LATEST_ROOK_ARE_DIFFERENT,
BookSyncStatus.ROOK_AND_VROOK_HAVE_DIFFERENT_REPOS,
BookSyncStatus.ONLY_DUMMY ->
BookSyncStatus.ONLY_DUMMY,
BookSyncStatus.ROOK_NO_LONGER_EXISTS,
BookSyncStatus.SYNCED_BOOK_WITHOUT_LINK ->
bookAction = BookAction.forNow(BookAction.Type.ERROR, namesake.status.msg())

BookSyncStatus.SYNCED_ROOK_NO_LONGER_EXISTS ->
bookAction = BookAction.forNow(BookAction.Type.ERROR, namesake.status.msg(namesake.book.syncedTo!!.uri))

/* Load remote book. */

BookSyncStatus.NO_BOOK_ONE_ROOK, BookSyncStatus.DUMMY_WITHOUT_LINK_AND_ONE_ROOK -> {
Expand Down Expand Up @@ -217,4 +216,4 @@ object SyncUtils {
}
return noNewMergeConflicts
}
}
}

0 comments on commit c499fb5

Please sign in to comment.