leanote/leanote-android
1
0
Fork 0
mirror of https://github.com/leanote/leanote-android.git synced 2026-01-13 07:03:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

improve sync

Browse Source 
- sync notebook first
- save note/notebook' usn separately
- save usn ASAP
- deprecate lastUsn
This commit is contained in:
houxg
2016-12-26 01:07:12 +08:00
parent 78a36c46dc
commit 52939699d9
5 changed files with 99 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/houxg/leamonax/database/AppDataBase.java
View File

@@ -30,8 +30,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
//TODO:upgrade to Ver.2, handle tags
@Database(name = "leanote_db", version = 2)
@Database(name = "leanote_db", version = 3)
public class AppDataBase {
private static final String TAG = "AppDataBase";
@@ -81,6 +80,8 @@ public class AppDataBase {
}
}
//TODO:copy the value of lastUsn, save it as the noteUsn and notebookUsn
public static void deleteNoteByLocalId(long localId) {
SQLite.delete().from(Note.class)
.where(Note_Table.id.eq(localId))

23
app/src/main/java/org/houxg/leamonax/model/Account.java
View File

@@ -49,6 +49,11 @@ public class Account extends BaseModel {
@Column(name = "host")
@SerializedName("Host")
String host = "";
@Column(name = "noteUsn")
int noteUsn;
@Column(name = "notebookUsn")
int notebookUsn;
public Account() {
}
@@ -85,6 +90,7 @@ public class Account extends BaseModel {
return accessToken;
}
@Deprecated
public int getLastSyncUsn() {
return lastSyncUsn;
}
@@ -121,6 +127,7 @@ public class Account extends BaseModel {
this.host = host;
}
@Deprecated
public void setLastUsn(int lastUsn) {
this.lastSyncUsn = lastUsn;
}
@@ -137,6 +144,22 @@ public class Account extends BaseModel {
this.defaultEditor = defaultEditor;
}
public int getNoteUsn() {
return noteUsn;
}
public int getNotebookUsn() {
return notebookUsn;
}
public void setNoteUsn(int noteUsn) {
this.noteUsn = noteUsn;
}
public void setNotebookUsn(int notebookUsn) {
this.notebookUsn = notebookUsn;
}
@Override
public String toString() {
return "Account{" +

145
app/src/main/java/org/houxg/leamonax/service/NoteService.java
View File

@@ -48,86 +48,79 @@ public class NoteService {
private static final int MAX_ENTRY = 20;
public static boolean fetchFromServer() {
int noteUsn = AccountService.getCurrent().getLastSyncUsn();
int notebookUsn = noteUsn;
List<Note> notes;
do {
notes = RetrofitUtils.excute(getSyncNotes(noteUsn, MAX_ENTRY));
if (notes != null) {
for (Note noteMeta : notes) {
Note remoteNote = RetrofitUtils.excute(getNoteByServerId(noteMeta.getNoteId()));
if (remoteNote == null) {
return false;
}
Note localNote = AppDataBase.getNoteByServerId(noteMeta.getNoteId());
noteUsn = remoteNote.getUsn();
long localId;
if (localNote == null) {
localId = remoteNote.insert();
remoteNote.setId(localId);
Log.i(TAG, "note insert, usn=" + remoteNote.getUsn() + ", id=" + remoteNote.getNoteId() + ", local=" + localId);
} else {
if (localNote.isDirty()) {
Log.w(TAG, "note conflict, usn=" + remoteNote.getUsn() + ", id=" + remoteNote.getNoteId());
continue;
} else {
Log.i(TAG, "note update, usn=" + remoteNote.getUsn() + ", id=" + remoteNote.getNoteId());
remoteNote.setId(localNote.getId());
localId = localNote.getId();
}
}
remoteNote.setIsDirty(false);
if (remoteNote.isMarkDown()) {
remoteNote.setContent(convertToLocalImageLinkForMD(localId, remoteNote.getContent()));
} else {
remoteNote.setContent(convertToLocalImageLinkForRichText(localId, remoteNote.getContent()));
}
Log.i(TAG, "content=" + remoteNote.getContent());
remoteNote.update();
handleFile(localId, remoteNote.getNoteFiles());
updateTagsToLocal(localId, remoteNote.getTagData());
}
} else {
return false;
}
} while (notes.size() == MAX_ENTRY);
//sync notebook
int notebookUsn = AccountService.getCurrent().getNotebookUsn();
List<Notebook> notebooks;
do {
notebooks = RetrofitUtils.excute(getSyncNotebooks(notebookUsn, MAX_ENTRY));
if (notebooks != null) {
for (Notebook remoteNotebook : notebooks) {
Notebook localNotebook = AppDataBase.getNotebookByServerId(remoteNotebook.getNotebookId());
if (localNotebook == null) {
Log.i(TAG, "notebook insert, usn=" + remoteNotebook.getUsn() + ", id=" + remoteNotebook.getNotebookId());
remoteNotebook.insert();
notebooks = RetrofitUtils.excuteWithException(ApiProvider.getInstance().getNotebookApi().getSyncNotebooks(notebookUsn, MAX_ENTRY));
for (Notebook remoteNotebook : notebooks) {
Notebook localNotebook = AppDataBase.getNotebookByServerId(remoteNotebook.getNotebookId());
if (localNotebook == null) {
Log.i(TAG, "notebook insert, usn=" + remoteNotebook.getUsn() + ", id=" + remoteNotebook.getNotebookId());
remoteNotebook.insert();
} else {
if (localNotebook.isDirty()) {
Log.w(TAG, "notebook conflict, usn=" + remoteNotebook.getUsn() + ", id=" + remoteNotebook.getNotebookId());
} else {
if (localNotebook.isDirty()) {
Log.w(TAG, "notebook conflict, usn=" + remoteNotebook.getUsn() + ", id=" + remoteNotebook.getNotebookId());
} else {
Log.i(TAG, "notebook update, usn=" + remoteNotebook.getUsn() + ", id=" + remoteNotebook.getNotebookId());
remoteNotebook.setId(localNotebook.getId());
remoteNotebook.setIsDirty(false);
remoteNotebook.update();
}
Log.i(TAG, "notebook update, usn=" + remoteNotebook.getUsn() + ", id=" + remoteNotebook.getNotebookId());
remoteNotebook.setId(localNotebook.getId());
remoteNotebook.setIsDirty(false);
remoteNotebook.update();
}
notebookUsn = remoteNotebook.getUsn();
}
} else {
return false;
notebookUsn = remoteNotebook.getUsn();
Account account = AccountService.getCurrent();
account.setNotebookUsn(notebookUsn);
account.save();
}
} while (notebooks.size() == MAX_ENTRY);
Log.i(TAG, "noteUsn=" + noteUsn + ", notebookUsn=" + notebookUsn);
int max = Math.max(notebookUsn, noteUsn);
saveLastUsn(max);
return true;
}
private static void saveLastUsn(int lastUsn) {
Account account = AccountService.getCurrent();
account.setLastUsn(lastUsn);
account.save();
//sync note
int noteUsn = AccountService.getCurrent().getNoteUsn();
List<Note> notes;
do {
notes = RetrofitUtils.excuteWithException(ApiProvider.getInstance().getNoteApi().getSyncNotes(noteUsn, MAX_ENTRY));
for (Note noteMeta : notes) {
Note remoteNote = RetrofitUtils.excute(ApiProvider.getInstance().getNoteApi().getNoteAndContent(noteMeta.getNoteId()));
if (remoteNote == null) {
return false;
}
Note localNote = AppDataBase.getNoteByServerId(noteMeta.getNoteId());
noteUsn = remoteNote.getUsn();
long localId;
if (localNote == null) {
localId = remoteNote.insert();
remoteNote.setId(localId);
Log.i(TAG, "note insert, usn=" + remoteNote.getUsn() + ", id=" + remoteNote.getNoteId() + ", local=" + localId);
} else {
if (localNote.isDirty()) {
Log.w(TAG, "note conflict, usn=" + remoteNote.getUsn() + ", id=" + remoteNote.getNoteId());
continue;
} else {
Log.i(TAG, "note update, usn=" + remoteNote.getUsn() + ", id=" + remoteNote.getNoteId());
remoteNote.setId(localNote.getId());
localId = localNote.getId();
}
}
remoteNote.setIsDirty(false);
if (remoteNote.isMarkDown()) {
remoteNote.setContent(convertToLocalImageLinkForMD(localId, remoteNote.getContent()));
} else {
remoteNote.setContent(convertToLocalImageLinkForRichText(localId, remoteNote.getContent()));
}
Log.i(TAG, "content=" + remoteNote.getContent());
remoteNote.update();
handleFile(localId, remoteNote.getNoteFiles());
updateTagsToLocal(localId, remoteNote.getTagData());
Account account = AccountService.getCurrent();
account.setNoteUsn(noteUsn);
account.save();
}
} while (notes.size() == MAX_ENTRY);
return true;
}
private static void handleFile(long noteLocalId, List<NoteFile> remoteFiles) {
@@ -229,7 +222,7 @@ public class NoteService {
handleFile(modifiedNote.getId(), note.getNoteFiles());
updateTagsToLocal(modifiedNote.getId(), note.getTagData());
note.save();
updateUsnIfNeed(note.getUsn());
updateNoteUsnIfNeed(note.getUsn());
} else {
throw new IllegalStateException(note.getMsg());
}
@@ -428,7 +421,7 @@ public class NoteService {
ApiProvider.getInstance().getNoteApi().delete(note.getNoteId(), note.getUsn()));
if (response.isOk()) {
AppDataBase.deleteNoteByLocalId(note.getId());
updateUsnIfNeed(response.getUsn());
updateNoteUsnIfNeed(response.getUsn());
} else {
throw new IllegalStateException(response.getMsg());
}
@@ -440,10 +433,10 @@ public class NoteService {
});
}
private static void updateUsnIfNeed(int newUsn) {
private static void updateNoteUsnIfNeed(int newUsn) {
Account account = AccountService.getCurrent();
if (newUsn - account.getLastSyncUsn() == 1) {
account.setLastUsn(newUsn);
if (newUsn - account.getNoteUsn() == 1) {
account.setNoteUsn(newUsn);
account.update();
}
}

4
app/src/main/java/org/houxg/leamonax/service/NotebookService.java
View File

@@ -20,9 +20,9 @@ public class NotebookService {
}
if (notebook.isOk()) {
Account account = AccountService.getCurrent();
if (notebook.getUsn() - account.getLastSyncUsn() == 1) {
if (notebook.getUsn() - account.getNotebookUsn() == 1) {
Log.d(TAG, "update usn=" + notebook.getUsn());
account.setLastUsn(notebook.getUsn());
account.setNotebookUsn(notebook.getUsn());
account.save();
}
notebook.insert();

3
app/src/main/java/org/houxg/leamonax/ui/SettingsActivity.java
View File

@@ -204,7 +204,8 @@ public class SettingsActivity extends BaseActivity {
.where(RelationshipOfNoteTag_Table.userId.eq(currentUser.getUserId()))
.execute();
Account account = AccountService.getCurrent();
account.setLastUsn(0);
account.setNoteUsn(0);
account.setNotebookUsn(0);
account.update();
subscriber.onNext(null);
subscriber.onCompleted();