|
|
@ -1,4 +1,4 @@
|
|
|
|
/*
|
|
|
|
/*
|
|
|
|
* Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
|
|
|
|
* Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
@ -16,6 +16,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
package net.micode.notes.gtask.remote;
|
|
|
|
package net.micode.notes.gtask.remote;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import android.annotation.SuppressLint;
|
|
|
|
import android.app.Activity;
|
|
|
|
import android.app.Activity;
|
|
|
|
import android.content.ContentResolver;
|
|
|
|
import android.content.ContentResolver;
|
|
|
|
import android.content.ContentUris;
|
|
|
|
import android.content.ContentUris;
|
|
|
@ -47,46 +48,45 @@ import java.util.HashSet;
|
|
|
|
import java.util.Iterator;
|
|
|
|
import java.util.Iterator;
|
|
|
|
import java.util.Map;
|
|
|
|
import java.util.Map;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
|
|
|
* GTaskManager 类负责管理 Google 任务的同步逻辑,采用单例模式确保全局只有一个实例。
|
|
|
|
|
|
|
|
* 该类处理了与 Google 任务的登录、任务列表初始化、内容同步等操作。
|
|
|
|
|
|
|
|
*/
|
|
|
|
public class GTaskManager {
|
|
|
|
public class GTaskManager {
|
|
|
|
|
|
|
|
|
|
|
|
private static final String TAG = GTaskManager.class.getSimpleName();
|
|
|
|
private static final String TAG = GTaskManager.class.getSimpleName();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 定义同步状态常量
|
|
|
|
public static final int STATE_SUCCESS = 0;
|
|
|
|
public static final int STATE_SUCCESS = 0;
|
|
|
|
|
|
|
|
|
|
|
|
public static final int STATE_NETWORK_ERROR = 1;
|
|
|
|
public static final int STATE_NETWORK_ERROR = 1;
|
|
|
|
|
|
|
|
|
|
|
|
public static final int STATE_INTERNAL_ERROR = 2;
|
|
|
|
public static final int STATE_INTERNAL_ERROR = 2;
|
|
|
|
|
|
|
|
|
|
|
|
public static final int STATE_SYNC_IN_PROGRESS = 3;
|
|
|
|
public static final int STATE_SYNC_IN_PROGRESS = 3;
|
|
|
|
|
|
|
|
|
|
|
|
public static final int STATE_SYNC_CANCELLED = 4;
|
|
|
|
public static final int STATE_SYNC_CANCELLED = 4;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 单例模式实例
|
|
|
|
|
|
|
|
@SuppressLint("StaticFieldLeak")
|
|
|
|
private static GTaskManager mInstance = null;
|
|
|
|
private static GTaskManager mInstance = null;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 相关上下文和解析器
|
|
|
|
private Activity mActivity;
|
|
|
|
private Activity mActivity;
|
|
|
|
|
|
|
|
|
|
|
|
private Context mContext;
|
|
|
|
private Context mContext;
|
|
|
|
|
|
|
|
|
|
|
|
private ContentResolver mContentResolver;
|
|
|
|
private ContentResolver mContentResolver;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 同步状态和取消标志
|
|
|
|
private boolean mSyncing;
|
|
|
|
private boolean mSyncing;
|
|
|
|
|
|
|
|
|
|
|
|
private boolean mCancelled;
|
|
|
|
private boolean mCancelled;
|
|
|
|
|
|
|
|
|
|
|
|
private HashMap<String, TaskList> mGTaskListHashMap;
|
|
|
|
// 存储任务列表、任务、元数据等信息的映射
|
|
|
|
|
|
|
|
private final HashMap<String, TaskList> mGTaskListHashMap;
|
|
|
|
private HashMap<String, Node> mGTaskHashMap;
|
|
|
|
private final HashMap<String, Node> mGTaskHashMap;
|
|
|
|
|
|
|
|
private final HashMap<String, MetaData> mMetaHashMap;
|
|
|
|
private HashMap<String, MetaData> mMetaHashMap;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private TaskList mMetaList;
|
|
|
|
private TaskList mMetaList;
|
|
|
|
|
|
|
|
private final HashSet<Long> mLocalDeleteIdMap;
|
|
|
|
|
|
|
|
private final HashMap<String, Long> mGidToNid;
|
|
|
|
|
|
|
|
private final HashMap<Long, String> mNidToGid;
|
|
|
|
|
|
|
|
|
|
|
|
private HashSet<Long> mLocalDeleteIdMap;
|
|
|
|
// 私有构造函数,确保单例模式
|
|
|
|
|
|
|
|
|
|
|
|
private HashMap<String, Long> mGidToNid;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private HashMap<Long, String> mNidToGid;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private GTaskManager() {
|
|
|
|
private GTaskManager() {
|
|
|
|
mSyncing = false;
|
|
|
|
mSyncing = false;
|
|
|
|
mCancelled = false;
|
|
|
|
mCancelled = false;
|
|
|
@ -98,7 +98,7 @@ public class GTaskManager {
|
|
|
|
mGidToNid = new HashMap<String, Long>();
|
|
|
|
mGidToNid = new HashMap<String, Long>();
|
|
|
|
mNidToGid = new HashMap<Long, String>();
|
|
|
|
mNidToGid = new HashMap<Long, String>();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// 获取单例实例
|
|
|
|
public static synchronized GTaskManager getInstance() {
|
|
|
|
public static synchronized GTaskManager getInstance() {
|
|
|
|
if (mInstance == null) {
|
|
|
|
if (mInstance == null) {
|
|
|
|
mInstance = new GTaskManager();
|
|
|
|
mInstance = new GTaskManager();
|
|
|
@ -106,11 +106,14 @@ public class GTaskManager {
|
|
|
|
return mInstance;
|
|
|
|
return mInstance;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 设置活动上下文,用于获取认证令牌
|
|
|
|
public synchronized void setActivityContext(Activity activity) {
|
|
|
|
public synchronized void setActivityContext(Activity activity) {
|
|
|
|
// used for getting authtoken
|
|
|
|
// used for getting authtoken
|
|
|
|
mActivity = activity;
|
|
|
|
mActivity = activity;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 执行同步操作
|
|
|
|
public int sync(Context context, GTaskASyncTask asyncTask) {
|
|
|
|
public int sync(Context context, GTaskASyncTask asyncTask) {
|
|
|
|
if (mSyncing) {
|
|
|
|
if (mSyncing) {
|
|
|
|
Log.d(TAG, "Sync is in progress");
|
|
|
|
Log.d(TAG, "Sync is in progress");
|
|
|
@ -120,6 +123,7 @@ public class GTaskManager {
|
|
|
|
mContentResolver = mContext.getContentResolver();
|
|
|
|
mContentResolver = mContext.getContentResolver();
|
|
|
|
mSyncing = true;
|
|
|
|
mSyncing = true;
|
|
|
|
mCancelled = false;
|
|
|
|
mCancelled = false;
|
|
|
|
|
|
|
|
// 清空所有映射
|
|
|
|
mGTaskListHashMap.clear();
|
|
|
|
mGTaskListHashMap.clear();
|
|
|
|
mGTaskHashMap.clear();
|
|
|
|
mGTaskHashMap.clear();
|
|
|
|
mMetaHashMap.clear();
|
|
|
|
mMetaHashMap.clear();
|
|
|
@ -131,18 +135,18 @@ public class GTaskManager {
|
|
|
|
GTaskClient client = GTaskClient.getInstance();
|
|
|
|
GTaskClient client = GTaskClient.getInstance();
|
|
|
|
client.resetUpdateArray();
|
|
|
|
client.resetUpdateArray();
|
|
|
|
|
|
|
|
|
|
|
|
// login google task
|
|
|
|
// 登录Google任务
|
|
|
|
if (!mCancelled) {
|
|
|
|
if (!mCancelled) {
|
|
|
|
if (!client.login(mActivity)) {
|
|
|
|
if (!client.login(mActivity)) {
|
|
|
|
throw new NetworkFailureException("login google task failed");
|
|
|
|
throw new NetworkFailureException("login google task failed");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// get the task list from google
|
|
|
|
// 获取 Google 任务列表
|
|
|
|
asyncTask.publishProgess(mContext.getString(R.string.sync_progress_init_list));
|
|
|
|
asyncTask.publishProgess(mContext.getString(R.string.sync_progress_init_list));
|
|
|
|
initGTaskList();
|
|
|
|
initGTaskList();
|
|
|
|
|
|
|
|
|
|
|
|
// do content sync work
|
|
|
|
// 执行内容同步
|
|
|
|
asyncTask.publishProgess(mContext.getString(R.string.sync_progress_syncing));
|
|
|
|
asyncTask.publishProgess(mContext.getString(R.string.sync_progress_syncing));
|
|
|
|
syncContent();
|
|
|
|
syncContent();
|
|
|
|
} catch (NetworkFailureException e) {
|
|
|
|
} catch (NetworkFailureException e) {
|
|
|
@ -156,6 +160,7 @@ public class GTaskManager {
|
|
|
|
e.printStackTrace();
|
|
|
|
e.printStackTrace();
|
|
|
|
return STATE_INTERNAL_ERROR;
|
|
|
|
return STATE_INTERNAL_ERROR;
|
|
|
|
} finally {
|
|
|
|
} finally {
|
|
|
|
|
|
|
|
// 清空所有映射
|
|
|
|
mGTaskListHashMap.clear();
|
|
|
|
mGTaskListHashMap.clear();
|
|
|
|
mGTaskHashMap.clear();
|
|
|
|
mGTaskHashMap.clear();
|
|
|
|
mMetaHashMap.clear();
|
|
|
|
mMetaHashMap.clear();
|
|
|
@ -168,6 +173,8 @@ public class GTaskManager {
|
|
|
|
return mCancelled ? STATE_SYNC_CANCELLED : STATE_SUCCESS;
|
|
|
|
return mCancelled ? STATE_SYNC_CANCELLED : STATE_SUCCESS;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 初始化 Google 任务列表
|
|
|
|
private void initGTaskList() throws NetworkFailureException {
|
|
|
|
private void initGTaskList() throws NetworkFailureException {
|
|
|
|
if (mCancelled)
|
|
|
|
if (mCancelled)
|
|
|
|
return;
|
|
|
|
return;
|
|
|
@ -175,7 +182,7 @@ public class GTaskManager {
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
JSONArray jsTaskLists = client.getTaskLists();
|
|
|
|
JSONArray jsTaskLists = client.getTaskLists();
|
|
|
|
|
|
|
|
|
|
|
|
// init meta list first
|
|
|
|
// 初始化元数据列表
|
|
|
|
mMetaList = null;
|
|
|
|
mMetaList = null;
|
|
|
|
for (int i = 0; i < jsTaskLists.length(); i++) {
|
|
|
|
for (int i = 0; i < jsTaskLists.length(); i++) {
|
|
|
|
JSONObject object = jsTaskLists.getJSONObject(i);
|
|
|
|
JSONObject object = jsTaskLists.getJSONObject(i);
|
|
|
@ -187,7 +194,7 @@ public class GTaskManager {
|
|
|
|
mMetaList = new TaskList();
|
|
|
|
mMetaList = new TaskList();
|
|
|
|
mMetaList.setContentByRemoteJSON(object);
|
|
|
|
mMetaList.setContentByRemoteJSON(object);
|
|
|
|
|
|
|
|
|
|
|
|
// load meta data
|
|
|
|
// 加载元数据
|
|
|
|
JSONArray jsMetas = client.getTaskList(gid);
|
|
|
|
JSONArray jsMetas = client.getTaskList(gid);
|
|
|
|
for (int j = 0; j < jsMetas.length(); j++) {
|
|
|
|
for (int j = 0; j < jsMetas.length(); j++) {
|
|
|
|
object = (JSONObject) jsMetas.getJSONObject(j);
|
|
|
|
object = (JSONObject) jsMetas.getJSONObject(j);
|
|
|
@ -203,7 +210,7 @@ public class GTaskManager {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// create meta list if not existed
|
|
|
|
// 如果元数据列表不存在,则创建
|
|
|
|
if (mMetaList == null) {
|
|
|
|
if (mMetaList == null) {
|
|
|
|
mMetaList = new TaskList();
|
|
|
|
mMetaList = new TaskList();
|
|
|
|
mMetaList.setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX
|
|
|
|
mMetaList.setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX
|
|
|
@ -211,7 +218,7 @@ public class GTaskManager {
|
|
|
|
GTaskClient.getInstance().createTaskList(mMetaList);
|
|
|
|
GTaskClient.getInstance().createTaskList(mMetaList);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// init task list
|
|
|
|
// 初始化任务列表
|
|
|
|
for (int i = 0; i < jsTaskLists.length(); i++) {
|
|
|
|
for (int i = 0; i < jsTaskLists.length(); i++) {
|
|
|
|
JSONObject object = jsTaskLists.getJSONObject(i);
|
|
|
|
JSONObject object = jsTaskLists.getJSONObject(i);
|
|
|
|
String gid = object.getString(GTaskStringUtils.GTASK_JSON_ID);
|
|
|
|
String gid = object.getString(GTaskStringUtils.GTASK_JSON_ID);
|
|
|
@ -225,7 +232,7 @@ public class GTaskManager {
|
|
|
|
mGTaskListHashMap.put(gid, tasklist);
|
|
|
|
mGTaskListHashMap.put(gid, tasklist);
|
|
|
|
mGTaskHashMap.put(gid, tasklist);
|
|
|
|
mGTaskHashMap.put(gid, tasklist);
|
|
|
|
|
|
|
|
|
|
|
|
// load tasks
|
|
|
|
// 加载任务
|
|
|
|
JSONArray jsTasks = client.getTaskList(gid);
|
|
|
|
JSONArray jsTasks = client.getTaskList(gid);
|
|
|
|
for (int j = 0; j < jsTasks.length(); j++) {
|
|
|
|
for (int j = 0; j < jsTasks.length(); j++) {
|
|
|
|
object = (JSONObject) jsTasks.getJSONObject(j);
|
|
|
|
object = (JSONObject) jsTasks.getJSONObject(j);
|
|
|
@ -247,6 +254,7 @@ public class GTaskManager {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 同步内容
|
|
|
|
private void syncContent() throws NetworkFailureException {
|
|
|
|
private void syncContent() throws NetworkFailureException {
|
|
|
|
int syncType;
|
|
|
|
int syncType;
|
|
|
|
Cursor c = null;
|
|
|
|
Cursor c = null;
|
|
|
@ -259,7 +267,7 @@ public class GTaskManager {
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// for local deleted note
|
|
|
|
// 处理本地已删除的笔记
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE,
|
|
|
|
c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE,
|
|
|
|
"(type<>? AND parent_id=?)", new String[] {
|
|
|
|
"(type<>? AND parent_id=?)", new String[] {
|
|
|
@ -286,10 +294,10 @@ public class GTaskManager {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// sync folder first
|
|
|
|
// 先同步文件夹
|
|
|
|
syncFolder();
|
|
|
|
syncFolder();
|
|
|
|
|
|
|
|
|
|
|
|
// for note existing in database
|
|
|
|
//处理数据库中存在的笔记
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE,
|
|
|
|
c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE,
|
|
|
|
"(type=? AND parent_id<>?)", new String[] {
|
|
|
|
"(type=? AND parent_id<>?)", new String[] {
|
|
|
@ -305,11 +313,11 @@ public class GTaskManager {
|
|
|
|
mNidToGid.put(c.getLong(SqlNote.ID_COLUMN), gid);
|
|
|
|
mNidToGid.put(c.getLong(SqlNote.ID_COLUMN), gid);
|
|
|
|
syncType = node.getSyncAction(c);
|
|
|
|
syncType = node.getSyncAction(c);
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
if (c.getString(SqlNote.GTASK_ID_COLUMN).trim().length() == 0) {
|
|
|
|
if (c.getString(SqlNote.GTASK_ID_COLUMN).trim().isEmpty()) {
|
|
|
|
// local add
|
|
|
|
//本地添加
|
|
|
|
syncType = Node.SYNC_ACTION_ADD_REMOTE;
|
|
|
|
syncType = Node.SYNC_ACTION_ADD_REMOTE;
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
// remote delete
|
|
|
|
// 远程删除
|
|
|
|
syncType = Node.SYNC_ACTION_DEL_LOCAL;
|
|
|
|
syncType = Node.SYNC_ACTION_DEL_LOCAL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -326,7 +334,7 @@ public class GTaskManager {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// go through remaining items
|
|
|
|
// 处理剩余的项目
|
|
|
|
Iterator<Map.Entry<String, Node>> iter = mGTaskHashMap.entrySet().iterator();
|
|
|
|
Iterator<Map.Entry<String, Node>> iter = mGTaskHashMap.entrySet().iterator();
|
|
|
|
while (iter.hasNext()) {
|
|
|
|
while (iter.hasNext()) {
|
|
|
|
Map.Entry<String, Node> entry = iter.next();
|
|
|
|
Map.Entry<String, Node> entry = iter.next();
|
|
|
@ -334,16 +342,14 @@ public class GTaskManager {
|
|
|
|
doContentSync(Node.SYNC_ACTION_ADD_LOCAL, node, null);
|
|
|
|
doContentSync(Node.SYNC_ACTION_ADD_LOCAL, node, null);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// mCancelled can be set by another thread, so we neet to check one by
|
|
|
|
// 清空本地删除表
|
|
|
|
// one
|
|
|
|
|
|
|
|
// clear local delete table
|
|
|
|
|
|
|
|
if (!mCancelled) {
|
|
|
|
if (!mCancelled) {
|
|
|
|
if (!DataUtils.batchDeleteNotes(mContentResolver, mLocalDeleteIdMap)) {
|
|
|
|
if (!DataUtils.batchDeleteNotes(mContentResolver, mLocalDeleteIdMap)) {
|
|
|
|
throw new ActionFailureException("failed to batch-delete local deleted notes");
|
|
|
|
throw new ActionFailureException("failed to batch-delete local deleted notes");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// refresh local sync id
|
|
|
|
// 刷新本地同步 ID
|
|
|
|
if (!mCancelled) {
|
|
|
|
if (!mCancelled) {
|
|
|
|
GTaskClient.getInstance().commitUpdate();
|
|
|
|
GTaskClient.getInstance().commitUpdate();
|
|
|
|
refreshLocalSyncId();
|
|
|
|
refreshLocalSyncId();
|
|
|
@ -351,6 +357,7 @@ public class GTaskManager {
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 同步文件夹
|
|
|
|
private void syncFolder() throws NetworkFailureException {
|
|
|
|
private void syncFolder() throws NetworkFailureException {
|
|
|
|
Cursor c = null;
|
|
|
|
Cursor c = null;
|
|
|
|
String gid;
|
|
|
|
String gid;
|
|
|
@ -361,7 +368,7 @@ public class GTaskManager {
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// for root folder
|
|
|
|
// 处理根文件夹
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
c = mContentResolver.query(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI,
|
|
|
|
c = mContentResolver.query(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI,
|
|
|
|
Notes.ID_ROOT_FOLDER), SqlNote.PROJECTION_NOTE, null, null, null);
|
|
|
|
Notes.ID_ROOT_FOLDER), SqlNote.PROJECTION_NOTE, null, null, null);
|
|
|
@ -390,7 +397,7 @@ public class GTaskManager {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// for call-note folder
|
|
|
|
// 处理通话记录文件夹
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE, "(_id=?)",
|
|
|
|
c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE, "(_id=?)",
|
|
|
|
new String[] {
|
|
|
|
new String[] {
|
|
|
@ -424,7 +431,7 @@ public class GTaskManager {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// for local existing folders
|
|
|
|
// 处理本地已存在的文件夹
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE,
|
|
|
|
c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE,
|
|
|
|
"(type=? AND parent_id<>?)", new String[] {
|
|
|
|
"(type=? AND parent_id<>?)", new String[] {
|
|
|
@ -441,10 +448,10 @@ public class GTaskManager {
|
|
|
|
syncType = node.getSyncAction(c);
|
|
|
|
syncType = node.getSyncAction(c);
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
if (c.getString(SqlNote.GTASK_ID_COLUMN).trim().length() == 0) {
|
|
|
|
if (c.getString(SqlNote.GTASK_ID_COLUMN).trim().length() == 0) {
|
|
|
|
// local add
|
|
|
|
// 本地添加
|
|
|
|
syncType = Node.SYNC_ACTION_ADD_REMOTE;
|
|
|
|
syncType = Node.SYNC_ACTION_ADD_REMOTE;
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
// remote delete
|
|
|
|
// 远程删除
|
|
|
|
syncType = Node.SYNC_ACTION_DEL_LOCAL;
|
|
|
|
syncType = Node.SYNC_ACTION_DEL_LOCAL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -460,7 +467,7 @@ public class GTaskManager {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// for remote add folders
|
|
|
|
// 处理远程添加的文件夹
|
|
|
|
Iterator<Map.Entry<String, TaskList>> iter = mGTaskListHashMap.entrySet().iterator();
|
|
|
|
Iterator<Map.Entry<String, TaskList>> iter = mGTaskListHashMap.entrySet().iterator();
|
|
|
|
while (iter.hasNext()) {
|
|
|
|
while (iter.hasNext()) {
|
|
|
|
Map.Entry<String, TaskList> entry = iter.next();
|
|
|
|
Map.Entry<String, TaskList> entry = iter.next();
|
|
|
@ -476,6 +483,7 @@ public class GTaskManager {
|
|
|
|
GTaskClient.getInstance().commitUpdate();
|
|
|
|
GTaskClient.getInstance().commitUpdate();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 执行内容同步操作
|
|
|
|
private void doContentSync(int syncType, Node node, Cursor c) throws NetworkFailureException {
|
|
|
|
private void doContentSync(int syncType, Node node, Cursor c) throws NetworkFailureException {
|
|
|
|
if (mCancelled) {
|
|
|
|
if (mCancelled) {
|
|
|
|
return;
|
|
|
|
return;
|
|
|
@ -510,8 +518,7 @@ public class GTaskManager {
|
|
|
|
updateRemoteNode(node, c);
|
|
|
|
updateRemoteNode(node, c);
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
case Node.SYNC_ACTION_UPDATE_CONFLICT:
|
|
|
|
case Node.SYNC_ACTION_UPDATE_CONFLICT:
|
|
|
|
// merging both modifications maybe a good idea
|
|
|
|
// 目前简单使用本地更新
|
|
|
|
// right now just use local update simply
|
|
|
|
|
|
|
|
updateRemoteNode(node, c);
|
|
|
|
updateRemoteNode(node, c);
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
case Node.SYNC_ACTION_NONE:
|
|
|
|
case Node.SYNC_ACTION_NONE:
|
|
|
@ -522,6 +529,7 @@ public class GTaskManager {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 添加本地节点
|
|
|
|
private void addLocalNode(Node node) throws NetworkFailureException {
|
|
|
|
private void addLocalNode(Node node) throws NetworkFailureException {
|
|
|
|
if (mCancelled) {
|
|
|
|
if (mCancelled) {
|
|
|
|
return;
|
|
|
|
return;
|
|
|
@ -549,7 +557,7 @@ public class GTaskManager {
|
|
|
|
if (note.has(NoteColumns.ID)) {
|
|
|
|
if (note.has(NoteColumns.ID)) {
|
|
|
|
long id = note.getLong(NoteColumns.ID);
|
|
|
|
long id = note.getLong(NoteColumns.ID);
|
|
|
|
if (DataUtils.existInNoteDatabase(mContentResolver, id)) {
|
|
|
|
if (DataUtils.existInNoteDatabase(mContentResolver, id)) {
|
|
|
|
// the id is not available, have to create a new one
|
|
|
|
// 该 ID 不可用,需要创建新的 ID
|
|
|
|
note.remove(NoteColumns.ID);
|
|
|
|
note.remove(NoteColumns.ID);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -562,8 +570,7 @@ public class GTaskManager {
|
|
|
|
if (data.has(DataColumns.ID)) {
|
|
|
|
if (data.has(DataColumns.ID)) {
|
|
|
|
long dataId = data.getLong(DataColumns.ID);
|
|
|
|
long dataId = data.getLong(DataColumns.ID);
|
|
|
|
if (DataUtils.existInDataDatabase(mContentResolver, dataId)) {
|
|
|
|
if (DataUtils.existInDataDatabase(mContentResolver, dataId)) {
|
|
|
|
// the data id is not available, have to create
|
|
|
|
// 该数据 ID 不可用,需要创建新的 ID
|
|
|
|
// a new one
|
|
|
|
|
|
|
|
data.remove(DataColumns.ID);
|
|
|
|
data.remove(DataColumns.ID);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -584,25 +591,26 @@ public class GTaskManager {
|
|
|
|
sqlNote.setParentId(parentId.longValue());
|
|
|
|
sqlNote.setParentId(parentId.longValue());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// create the local node
|
|
|
|
// 创建本地节点
|
|
|
|
sqlNote.setGtaskId(node.getGid());
|
|
|
|
sqlNote.setGtaskId(node.getGid());
|
|
|
|
sqlNote.commit(false);
|
|
|
|
sqlNote.commit(false);
|
|
|
|
|
|
|
|
|
|
|
|
// update gid-nid mapping
|
|
|
|
// 更新 gid-nid 映射
|
|
|
|
mGidToNid.put(node.getGid(), sqlNote.getId());
|
|
|
|
mGidToNid.put(node.getGid(), sqlNote.getId());
|
|
|
|
mNidToGid.put(sqlNote.getId(), node.getGid());
|
|
|
|
mNidToGid.put(sqlNote.getId(), node.getGid());
|
|
|
|
|
|
|
|
|
|
|
|
// update meta
|
|
|
|
//更新元数据
|
|
|
|
updateRemoteMeta(node.getGid(), sqlNote);
|
|
|
|
updateRemoteMeta(node.getGid(), sqlNote);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 更新本地节点
|
|
|
|
private void updateLocalNode(Node node, Cursor c) throws NetworkFailureException {
|
|
|
|
private void updateLocalNode(Node node, Cursor c) throws NetworkFailureException {
|
|
|
|
if (mCancelled) {
|
|
|
|
if (mCancelled) {
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
SqlNote sqlNote;
|
|
|
|
SqlNote sqlNote;
|
|
|
|
// update the note locally
|
|
|
|
// 本地更新笔记
|
|
|
|
sqlNote = new SqlNote(mContext, c);
|
|
|
|
sqlNote = new SqlNote(mContext, c);
|
|
|
|
sqlNote.setContent(node.getLocalJSONFromContent());
|
|
|
|
sqlNote.setContent(node.getLocalJSONFromContent());
|
|
|
|
|
|
|
|
|
|
|
@ -615,10 +623,11 @@ public class GTaskManager {
|
|
|
|
sqlNote.setParentId(parentId.longValue());
|
|
|
|
sqlNote.setParentId(parentId.longValue());
|
|
|
|
sqlNote.commit(true);
|
|
|
|
sqlNote.commit(true);
|
|
|
|
|
|
|
|
|
|
|
|
// update meta info
|
|
|
|
//更新元数据信息
|
|
|
|
updateRemoteMeta(node.getGid(), sqlNote);
|
|
|
|
updateRemoteMeta(node.getGid(), sqlNote);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 添加远程节点
|
|
|
|
private void addRemoteNode(Node node, Cursor c) throws NetworkFailureException {
|
|
|
|
private void addRemoteNode(Node node, Cursor c) throws NetworkFailureException {
|
|
|
|
if (mCancelled) {
|
|
|
|
if (mCancelled) {
|
|
|
|
return;
|
|
|
|
return;
|
|
|
@ -627,7 +636,7 @@ public class GTaskManager {
|
|
|
|
SqlNote sqlNote = new SqlNote(mContext, c);
|
|
|
|
SqlNote sqlNote = new SqlNote(mContext, c);
|
|
|
|
Node n;
|
|
|
|
Node n;
|
|
|
|
|
|
|
|
|
|
|
|
// update remotely
|
|
|
|
//远程更新
|
|
|
|
if (sqlNote.isNoteType()) {
|
|
|
|
if (sqlNote.isNoteType()) {
|
|
|
|
Task task = new Task();
|
|
|
|
Task task = new Task();
|
|
|
|
task.setContentByLocalJSON(sqlNote.getContent());
|
|
|
|
task.setContentByLocalJSON(sqlNote.getContent());
|
|
|
@ -642,12 +651,12 @@ public class GTaskManager {
|
|
|
|
GTaskClient.getInstance().createTask(task);
|
|
|
|
GTaskClient.getInstance().createTask(task);
|
|
|
|
n = (Node) task;
|
|
|
|
n = (Node) task;
|
|
|
|
|
|
|
|
|
|
|
|
// add meta
|
|
|
|
//添加元数据
|
|
|
|
updateRemoteMeta(task.getGid(), sqlNote);
|
|
|
|
updateRemoteMeta(task.getGid(), sqlNote);
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
TaskList tasklist = null;
|
|
|
|
TaskList tasklist = null;
|
|
|
|
|
|
|
|
|
|
|
|
// we need to skip folder if it has already existed
|
|
|
|
//跳过已存在的文件夹
|
|
|
|
String folderName = GTaskStringUtils.MIUI_FOLDER_PREFFIX;
|
|
|
|
String folderName = GTaskStringUtils.MIUI_FOLDER_PREFFIX;
|
|
|
|
if (sqlNote.getId() == Notes.ID_ROOT_FOLDER)
|
|
|
|
if (sqlNote.getId() == Notes.ID_ROOT_FOLDER)
|
|
|
|
folderName += GTaskStringUtils.FOLDER_DEFAULT;
|
|
|
|
folderName += GTaskStringUtils.FOLDER_DEFAULT;
|
|
|
@ -671,7 +680,7 @@ public class GTaskManager {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// no match we can add now
|
|
|
|
// 没有匹配项则添加
|
|
|
|
if (tasklist == null) {
|
|
|
|
if (tasklist == null) {
|
|
|
|
tasklist = new TaskList();
|
|
|
|
tasklist = new TaskList();
|
|
|
|
tasklist.setContentByLocalJSON(sqlNote.getContent());
|
|
|
|
tasklist.setContentByLocalJSON(sqlNote.getContent());
|
|
|
@ -681,17 +690,18 @@ public class GTaskManager {
|
|
|
|
n = (Node) tasklist;
|
|
|
|
n = (Node) tasklist;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// update local note
|
|
|
|
// 更新本地笔记
|
|
|
|
sqlNote.setGtaskId(n.getGid());
|
|
|
|
sqlNote.setGtaskId(n.getGid());
|
|
|
|
sqlNote.commit(false);
|
|
|
|
sqlNote.commit(false);
|
|
|
|
sqlNote.resetLocalModified();
|
|
|
|
sqlNote.resetLocalModified();
|
|
|
|
sqlNote.commit(true);
|
|
|
|
sqlNote.commit(true);
|
|
|
|
|
|
|
|
|
|
|
|
// gid-id mapping
|
|
|
|
// gid-id 映射
|
|
|
|
mGidToNid.put(n.getGid(), sqlNote.getId());
|
|
|
|
mGidToNid.put(n.getGid(), sqlNote.getId());
|
|
|
|
mNidToGid.put(sqlNote.getId(), n.getGid());
|
|
|
|
mNidToGid.put(sqlNote.getId(), n.getGid());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 更新远程节点
|
|
|
|
private void updateRemoteNode(Node node, Cursor c) throws NetworkFailureException {
|
|
|
|
private void updateRemoteNode(Node node, Cursor c) throws NetworkFailureException {
|
|
|
|
if (mCancelled) {
|
|
|
|
if (mCancelled) {
|
|
|
|
return;
|
|
|
|
return;
|
|
|
@ -699,14 +709,14 @@ public class GTaskManager {
|
|
|
|
|
|
|
|
|
|
|
|
SqlNote sqlNote = new SqlNote(mContext, c);
|
|
|
|
SqlNote sqlNote = new SqlNote(mContext, c);
|
|
|
|
|
|
|
|
|
|
|
|
// update remotely
|
|
|
|
// 远程更新
|
|
|
|
node.setContentByLocalJSON(sqlNote.getContent());
|
|
|
|
node.setContentByLocalJSON(sqlNote.getContent());
|
|
|
|
GTaskClient.getInstance().addUpdateNode(node);
|
|
|
|
GTaskClient.getInstance().addUpdateNode(node);
|
|
|
|
|
|
|
|
|
|
|
|
// update meta
|
|
|
|
// 更新元数据
|
|
|
|
updateRemoteMeta(node.getGid(), sqlNote);
|
|
|
|
updateRemoteMeta(node.getGid(), sqlNote);
|
|
|
|
|
|
|
|
|
|
|
|
// move task if necessary
|
|
|
|
// 必要时移动任务
|
|
|
|
if (sqlNote.isNoteType()) {
|
|
|
|
if (sqlNote.isNoteType()) {
|
|
|
|
Task task = (Task) node;
|
|
|
|
Task task = (Task) node;
|
|
|
|
TaskList preParentList = task.getParent();
|
|
|
|
TaskList preParentList = task.getParent();
|
|
|
@ -725,11 +735,12 @@ public class GTaskManager {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// clear local modified flag
|
|
|
|
// 清除本地修改标志
|
|
|
|
sqlNote.resetLocalModified();
|
|
|
|
sqlNote.resetLocalModified();
|
|
|
|
sqlNote.commit(true);
|
|
|
|
sqlNote.commit(true);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 更新远程元数据
|
|
|
|
private void updateRemoteMeta(String gid, SqlNote sqlNote) throws NetworkFailureException {
|
|
|
|
private void updateRemoteMeta(String gid, SqlNote sqlNote) throws NetworkFailureException {
|
|
|
|
if (sqlNote != null && sqlNote.isNoteType()) {
|
|
|
|
if (sqlNote != null && sqlNote.isNoteType()) {
|
|
|
|
MetaData metaData = mMetaHashMap.get(gid);
|
|
|
|
MetaData metaData = mMetaHashMap.get(gid);
|
|
|
@ -746,12 +757,13 @@ public class GTaskManager {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 刷新本地同步 ID
|
|
|
|
private void refreshLocalSyncId() throws NetworkFailureException {
|
|
|
|
private void refreshLocalSyncId() throws NetworkFailureException {
|
|
|
|
if (mCancelled) {
|
|
|
|
if (mCancelled) {
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// get the latest gtask list
|
|
|
|
// 获取最新的任务列表
|
|
|
|
mGTaskHashMap.clear();
|
|
|
|
mGTaskHashMap.clear();
|
|
|
|
mGTaskListHashMap.clear();
|
|
|
|
mGTaskListHashMap.clear();
|
|
|
|
mMetaHashMap.clear();
|
|
|
|
mMetaHashMap.clear();
|
|
|
@ -790,10 +802,12 @@ public class GTaskManager {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 获取同步账户
|
|
|
|
public String getSyncAccount() {
|
|
|
|
public String getSyncAccount() {
|
|
|
|
return GTaskClient.getInstance().getSyncAccount().name;
|
|
|
|
return GTaskClient.getInstance().getSyncAccount().name;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 取消同步
|
|
|
|
public void cancelSync() {
|
|
|
|
public void cancelSync() {
|
|
|
|
mCancelled = true;
|
|
|
|
mCancelled = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|