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

remove redundant method

Browse Source
This commit is contained in:
houxg
2017-02-21 15:55:03 +08:00
parent de94602c97
commit b00ccddbec
1 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -207,7 +207,7 @@ public class NoteService {
if (modifiedNote.isLocalNote()) {
call = ApiProvider.getInstance().getNoteApi().add(requestBodyMap, fileBodies);
} else {
Note remoteNote = RetrofitUtils.excuteWithException(getNoteByServerId(modifiedNote.getNoteId()));
Note remoteNote = RetrofitUtils.excuteWithException(ApiProvider.getInstance().getNoteApi().getNoteAndContent(modifiedNote.getNoteId()));
if (remoteNote.getUsn() != modifiedNote.getUsn()) {
remoteNote.setId(modifiedNote.getId());
remoteNote.update();
@@ -274,20 +274,8 @@ public class NoteService {
});
}
private static Call<List<Note>> getSyncNotes(int afterUsn, int maxEntry) {
return ApiProvider.getInstance().getNoteApi().getSyncNotes(afterUsn, maxEntry);
}
private static Call<List<Notebook>> getSyncNotebooks(int afterUsn, int maxEntry) {
return ApiProvider.getInstance().getNotebookApi().getSyncNotebooks(afterUsn, maxEntry);
}
public static Call<Note> getNoteByServerId(String serverId) {
return ApiProvider.getInstance().getNoteApi().getNoteAndContent(serverId);
}
public static boolean revertNote(String serverId) {
Note serverNote = RetrofitUtils.excute(NoteService.getNoteByServerId(serverId));
Note serverNote = RetrofitUtils.excute(ApiProvider.getInstance().getNoteApi().getNoteAndContent(serverId));
if (serverNote == null) {
return false;
}
@@ -310,8 +298,6 @@ public class NoteService {
return true;
}
@NonNull
private static Map<String, RequestBody> generateCommonBodyMap(Note note) {
Map<String, RequestBody> requestBodyMap = new HashMap<>();
@@ -402,6 +388,7 @@ public class NoteService {
return localIds;
}
//TODO:change to synchonous
public static Observable<Note> deleteNote(final Note note) {
return Observable.create(
new Observable.OnSubscribe<Note>() {
@@ -427,6 +414,7 @@ public class NoteService {
});
}
//TODO:delete this method
private static void updateNoteUsnIfNeed(int newUsn) {
Account account = AccountService.getCurrent();
if (newUsn - account.getNoteUsn() == 1) {
@@ -435,10 +423,6 @@ public class NoteService {
}
}
public static Call<UpdateRe> deleteNote(String noteId, int usn) {
return ApiProvider.getInstance().getNoteApi().delete(noteId, usn);
}
public static void updateTagsToLocal(long noteLocalId, List<String> tags) {
String currentUid = AccountService.getCurrent().getUserId();
if (tags == null) {
@@ -481,7 +465,6 @@ public class NoteService {
}
}
private static RequestBody createPartFromString(String content) {
return RequestBody.create(MediaType.parse(MULTIPART_FORM_DATA), content);
}