|
|
|
@ -47,21 +47,24 @@ import java.util.HashSet;
|
|
|
|
import java.util.Iterator;
|
|
|
|
import java.util.Iterator;
|
|
|
|
import java.util.Map;
|
|
|
|
import java.util.Map;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
|
|
|
* Google任务同步管理器
|
|
|
|
|
|
|
|
* 负责本地Note与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; //取消同步
|
|
|
|
|
|
|
|
|
|
|
|
private static GTaskManager mInstance = null;
|
|
|
|
private static GTaskManager mInstance = null; //单例实例
|
|
|
|
|
|
|
|
|
|
|
|
private Activity mActivity;
|
|
|
|
private Activity mActivity;
|
|
|
|
|
|
|
|
|
|
|
|
@ -69,24 +72,25 @@ public class GTaskManager {
|
|
|
|
|
|
|
|
|
|
|
|
private ContentResolver mContentResolver;
|
|
|
|
private ContentResolver mContentResolver;
|
|
|
|
|
|
|
|
|
|
|
|
private boolean mSyncing;
|
|
|
|
private boolean mSyncing; //同步状态标识：是否正在同步
|
|
|
|
|
|
|
|
|
|
|
|
private boolean mCancelled;
|
|
|
|
private boolean mCancelled; //是否已取消
|
|
|
|
|
|
|
|
|
|
|
|
private HashMap<String, TaskList> mGTaskListHashMap;
|
|
|
|
private HashMap<String, TaskList> mGTaskListHashMap; //远程任务列表（key：任务列表GID）
|
|
|
|
|
|
|
|
|
|
|
|
private HashMap<String, Node> mGTaskHashMap;
|
|
|
|
private HashMap<String, Node> mGTaskHashMap; //所有远程节点（任务/列表，key：节点GID）
|
|
|
|
|
|
|
|
|
|
|
|
private HashMap<String, MetaData> mMetaHashMap;
|
|
|
|
private HashMap<String, MetaData> mMetaHashMap; //元数据（key：关联的任务GID）
|
|
|
|
|
|
|
|
|
|
|
|
private TaskList mMetaList;
|
|
|
|
private TaskList mMetaList; //元数据列表
|
|
|
|
|
|
|
|
|
|
|
|
private HashSet<Long> mLocalDeleteIdMap;
|
|
|
|
private HashSet<Long> mLocalDeleteIdMap; //记录需要从远程删除的本地笔记ID
|
|
|
|
|
|
|
|
|
|
|
|
private HashMap<String, Long> mGidToNid;
|
|
|
|
private HashMap<String, Long> mGidToNid; //远程GID到本地笔记ID的映射关系
|
|
|
|
|
|
|
|
|
|
|
|
private HashMap<Long, String> mNidToGid;
|
|
|
|
private HashMap<Long, String> mNidToGid; //本地笔记ID到远程GID的映射关系
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//初始化所有集合和状态变量（单例模式防止外部实例化）
|
|
|
|
private GTaskManager() {
|
|
|
|
private GTaskManager() {
|
|
|
|
mSyncing = false;
|
|
|
|
mSyncing = false;
|
|
|
|
mCancelled = false;
|
|
|
|
mCancelled = false;
|
|
|
|
@ -99,6 +103,7 @@ public class GTaskManager {
|
|
|
|
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,20 +111,26 @@ public class GTaskManager {
|
|
|
|
return mInstance;
|
|
|
|
return mInstance;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 设置Activity上下文：用于后续登录时获取认证token
|
|
|
|
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");
|
|
|
|
return STATE_SYNC_IN_PROGRESS;
|
|
|
|
return STATE_SYNC_IN_PROGRESS;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// 初始化同步环境
|
|
|
|
mContext = context;
|
|
|
|
mContext = context;
|
|
|
|
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();
|
|
|
|
@ -128,8 +139,9 @@ public class GTaskManager {
|
|
|
|
mNidToGid.clear();
|
|
|
|
mNidToGid.clear();
|
|
|
|
|
|
|
|
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
|
|
|
|
// 获取GTaskClient实例
|
|
|
|
GTaskClient client = GTaskClient.getInstance();
|
|
|
|
GTaskClient client = GTaskClient.getInstance();
|
|
|
|
client.resetUpdateArray();
|
|
|
|
client.resetUpdateArray(); //重置客户端的更新队列
|
|
|
|
|
|
|
|
|
|
|
|
// login google task
|
|
|
|
// login google task
|
|
|
|
if (!mCancelled) {
|
|
|
|
if (!mCancelled) {
|
|
|
|
@ -139,55 +151,61 @@ public class GTaskManager {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// get the task list from google
|
|
|
|
// get the task list from 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
|
|
|
|
// 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) { // 捕获网络异常
|
|
|
|
Log.e(TAG, e.toString());
|
|
|
|
Log.e(TAG, e.toString());
|
|
|
|
return STATE_NETWORK_ERROR;
|
|
|
|
return STATE_NETWORK_ERROR;
|
|
|
|
} catch (ActionFailureException e) {
|
|
|
|
} catch (ActionFailureException e) { // 捕获操作失败异常
|
|
|
|
Log.e(TAG, e.toString());
|
|
|
|
Log.e(TAG, e.toString());
|
|
|
|
return STATE_INTERNAL_ERROR;
|
|
|
|
return STATE_INTERNAL_ERROR;
|
|
|
|
} catch (Exception e) {
|
|
|
|
} catch (Exception e) { // 返回内部错误状态
|
|
|
|
Log.e(TAG, e.toString());
|
|
|
|
Log.e(TAG, e.toString());
|
|
|
|
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();
|
|
|
|
mLocalDeleteIdMap.clear();
|
|
|
|
mLocalDeleteIdMap.clear();
|
|
|
|
mGidToNid.clear();
|
|
|
|
mGidToNid.clear();
|
|
|
|
mNidToGid.clear();
|
|
|
|
mNidToGid.clear();
|
|
|
|
mSyncing = false;
|
|
|
|
mSyncing = false; // 标记为同步结束
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
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;
|
|
|
|
GTaskClient client = GTaskClient.getInstance();
|
|
|
|
GTaskClient client = GTaskClient.getInstance(); // 获取网络客户端
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
|
|
|
|
// 1. 获取所有远程任务列表（JSON数组）
|
|
|
|
JSONArray jsTaskLists = client.getTaskLists();
|
|
|
|
JSONArray jsTaskLists = client.getTaskLists();
|
|
|
|
|
|
|
|
|
|
|
|
// init meta list first
|
|
|
|
// 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);
|
|
|
|
String gid = object.getString(GTaskStringUtils.GTASK_JSON_ID);
|
|
|
|
String gid = object.getString(GTaskStringUtils.GTASK_JSON_ID);
|
|
|
|
String name = object.getString(GTaskStringUtils.GTASK_JSON_NAME);
|
|
|
|
String name = object.getString(GTaskStringUtils.GTASK_JSON_NAME);
|
|
|
|
|
|
|
|
|
|
|
|
if (name
|
|
|
|
// 检查是否为元数据列表（名称符合特定前缀+后缀）
|
|
|
|
.equals(GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_META)) {
|
|
|
|
if (name.equals(GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_META)) {
|
|
|
|
mMetaList = new TaskList();
|
|
|
|
mMetaList = new TaskList();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//用远程JSON初始化元数据列表
|
|
|
|
mMetaList.setContentByRemoteJSON(object);
|
|
|
|
mMetaList.setContentByRemoteJSON(object);
|
|
|
|
|
|
|
|
|
|
|
|
// load meta data
|
|
|
|
// 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);
|
|
|
|
@ -196,6 +214,7 @@ public class GTaskManager {
|
|
|
|
if (metaData.isWorthSaving()) {
|
|
|
|
if (metaData.isWorthSaving()) {
|
|
|
|
mMetaList.addChildTask(metaData);
|
|
|
|
mMetaList.addChildTask(metaData);
|
|
|
|
if (metaData.getGid() != null) {
|
|
|
|
if (metaData.getGid() != null) {
|
|
|
|
|
|
|
|
// 存储元数据（key：关联的任务GID）
|
|
|
|
mMetaHashMap.put(metaData.getRelatedGid(), metaData);
|
|
|
|
mMetaHashMap.put(metaData.getRelatedGid(), metaData);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -204,26 +223,29 @@ public class GTaskManager {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// create meta list if not existed
|
|
|
|
// create meta list if not existed
|
|
|
|
|
|
|
|
// 3. 若元数据列表不存在，则创建一个
|
|
|
|
if (mMetaList == null) {
|
|
|
|
if (mMetaList == null) {
|
|
|
|
mMetaList = new TaskList();
|
|
|
|
mMetaList = new TaskList();
|
|
|
|
mMetaList.setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX
|
|
|
|
mMetaList.setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX
|
|
|
|
+ GTaskStringUtils.FOLDER_META);
|
|
|
|
+ GTaskStringUtils.FOLDER_META); // 设置名称
|
|
|
|
GTaskClient.getInstance().createTaskList(mMetaList);
|
|
|
|
GTaskClient.getInstance().createTaskList(mMetaList); // 调用客户端创建列表
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// init task list
|
|
|
|
// init task list
|
|
|
|
|
|
|
|
// 4. 初始化普通任务列表（排除元数据列表）
|
|
|
|
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);
|
|
|
|
String name = object.getString(GTaskStringUtils.GTASK_JSON_NAME);
|
|
|
|
String name = object.getString(GTaskStringUtils.GTASK_JSON_NAME);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 筛选符合条件的列表：以特定前缀开头，且不是元数据列表
|
|
|
|
if (name.startsWith(GTaskStringUtils.MIUI_FOLDER_PREFFIX)
|
|
|
|
if (name.startsWith(GTaskStringUtils.MIUI_FOLDER_PREFFIX)
|
|
|
|
&& !name.equals(GTaskStringUtils.MIUI_FOLDER_PREFFIX
|
|
|
|
&& !name.equals(GTaskStringUtils.MIUI_FOLDER_PREFFIX
|
|
|
|
+ GTaskStringUtils.FOLDER_META)) {
|
|
|
|
+ GTaskStringUtils.FOLDER_META)) {
|
|
|
|
TaskList tasklist = new TaskList();
|
|
|
|
TaskList tasklist = new TaskList();
|
|
|
|
tasklist.setContentByRemoteJSON(object);
|
|
|
|
tasklist.setContentByRemoteJSON(object); // 用远程JSON初始化列表
|
|
|
|
mGTaskListHashMap.put(gid, tasklist);
|
|
|
|
mGTaskListHashMap.put(gid, tasklist); // 存入任务列表集合
|
|
|
|
mGTaskHashMap.put(gid, tasklist);
|
|
|
|
mGTaskHashMap.put(gid, tasklist); // 同时存入全局节点集合
|
|
|
|
|
|
|
|
|
|
|
|
// load tasks
|
|
|
|
// load tasks
|
|
|
|
JSONArray jsTasks = client.getTaskList(gid);
|
|
|
|
JSONArray jsTasks = client.getTaskList(gid);
|
|
|
|
@ -231,27 +253,28 @@ public class GTaskManager {
|
|
|
|
object = (JSONObject) jsTasks.getJSONObject(j);
|
|
|
|
object = (JSONObject) jsTasks.getJSONObject(j);
|
|
|
|
gid = object.getString(GTaskStringUtils.GTASK_JSON_ID);
|
|
|
|
gid = object.getString(GTaskStringUtils.GTASK_JSON_ID);
|
|
|
|
Task task = new Task();
|
|
|
|
Task task = new Task();
|
|
|
|
task.setContentByRemoteJSON(object);
|
|
|
|
task.setContentByRemoteJSON(object); // 用远程JSON初始化任务
|
|
|
|
if (task.isWorthSaving()) {
|
|
|
|
if (task.isWorthSaving()) {
|
|
|
|
task.setMetaInfo(mMetaHashMap.get(gid));
|
|
|
|
task.setMetaInfo(mMetaHashMap.get(gid)); // 关联元数据
|
|
|
|
tasklist.addChildTask(task);
|
|
|
|
tasklist.addChildTask(task);
|
|
|
|
mGTaskHashMap.put(gid, task);
|
|
|
|
mGTaskHashMap.put(gid, task); // 存入全局节点集合
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} catch (JSONException e) {
|
|
|
|
} catch (JSONException e) { // 处理JSON解析异常
|
|
|
|
Log.e(TAG, e.toString());
|
|
|
|
Log.e(TAG, e.toString());
|
|
|
|
e.printStackTrace();
|
|
|
|
e.printStackTrace();
|
|
|
|
throw new ActionFailureException("initGTaskList: handing JSONObject failed");
|
|
|
|
throw new ActionFailureException("initGTaskList: handing JSONObject failed");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 同步内容：协调本地与远程的任务/列表数据（核心同步逻辑）
|
|
|
|
private void syncContent() throws NetworkFailureException {
|
|
|
|
private void syncContent() throws NetworkFailureException {
|
|
|
|
int syncType;
|
|
|
|
int syncType; // 同步类型（新增/删除/更新等）
|
|
|
|
Cursor c = null;
|
|
|
|
Cursor c = null; // 数据库查询游标
|
|
|
|
String gid;
|
|
|
|
String gid; // 远程GID
|
|
|
|
Node node;
|
|
|
|
Node node; // 远程节点
|
|
|
|
|
|
|
|
|
|
|
|
mLocalDeleteIdMap.clear();
|
|
|
|
mLocalDeleteIdMap.clear();
|
|
|
|
|
|
|
|
|
|
|
|
@ -260,20 +283,23 @@ public class GTaskManager {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// for local deleted note
|
|
|
|
// for local deleted note
|
|
|
|
|
|
|
|
// 1. 处理本地已删除的笔记（在回收站中的非系统类型笔记）
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
|
|
|
|
// 查询条件：不是系统类型+父ID是回收站
|
|
|
|
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[] {
|
|
|
|
String.valueOf(Notes.TYPE_SYSTEM), String.valueOf(Notes.ID_TRASH_FOLER)
|
|
|
|
String.valueOf(Notes.TYPE_SYSTEM), String.valueOf(Notes.ID_TRASH_FOLDER)
|
|
|
|
}, null);
|
|
|
|
}, null);
|
|
|
|
if (c != null) {
|
|
|
|
if (c != null) {
|
|
|
|
while (c.moveToNext()) {
|
|
|
|
while (c.moveToNext()) {
|
|
|
|
gid = c.getString(SqlNote.GTASK_ID_COLUMN);
|
|
|
|
gid = c.getString(SqlNote.GTASK_ID_COLUMN); // 获取笔记关联的远程GID
|
|
|
|
node = mGTaskHashMap.get(gid);
|
|
|
|
node = mGTaskHashMap.get(gid); // 从远程节点集合中查找对应节点
|
|
|
|
if (node != null) {
|
|
|
|
if (node != null) { // 若远程存在该节点，需要删除远程节点
|
|
|
|
mGTaskHashMap.remove(gid);
|
|
|
|
mGTaskHashMap.remove(gid); // 从本地缓存移除
|
|
|
|
doContentSync(Node.SYNC_ACTION_DEL_REMOTE, node, c);
|
|
|
|
doContentSync(Node.SYNC_ACTION_DEL_REMOTE, node, c); // 执行远程删除
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 记录本地已删除的笔记ID（后续会从本地彻底删除）
|
|
|
|
mLocalDeleteIdMap.add(c.getLong(SqlNote.ID_COLUMN));
|
|
|
|
mLocalDeleteIdMap.add(c.getLong(SqlNote.ID_COLUMN));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
@ -287,32 +313,43 @@ public class GTaskManager {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// sync folder first
|
|
|
|
// sync folder first
|
|
|
|
|
|
|
|
// 2. 优先同步文件夹（任务列表）
|
|
|
|
syncFolder();
|
|
|
|
syncFolder();
|
|
|
|
|
|
|
|
|
|
|
|
// for note existing in database
|
|
|
|
// for note existing in database
|
|
|
|
|
|
|
|
// 3. 处理本地已存在的普通笔记（非回收站中的笔记类型）
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
|
|
|
|
// 查询条件：Note类型 + 父ID不是回收站
|
|
|
|
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[] {
|
|
|
|
String.valueOf(Notes.TYPE_NOTE), String.valueOf(Notes.ID_TRASH_FOLER)
|
|
|
|
String.valueOf(Notes.TYPE_NOTE), String.valueOf(Notes.ID_TRASH_FOLDER)
|
|
|
|
}, NoteColumns.TYPE + " DESC");
|
|
|
|
}, NoteColumns.TYPE + " DESC");
|
|
|
|
if (c != null) {
|
|
|
|
if (c != null) {
|
|
|
|
while (c.moveToNext()) {
|
|
|
|
while (c.moveToNext()) {
|
|
|
|
gid = c.getString(SqlNote.GTASK_ID_COLUMN);
|
|
|
|
gid = c.getString(SqlNote.GTASK_ID_COLUMN); // 获取关联的远程GID
|
|
|
|
node = mGTaskHashMap.get(gid);
|
|
|
|
node = mGTaskHashMap.get(gid);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 远程存在对应节点
|
|
|
|
if (node != null) {
|
|
|
|
if (node != null) {
|
|
|
|
mGTaskHashMap.remove(gid);
|
|
|
|
mGTaskHashMap.remove(gid); // 从本地缓存移除
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 记录GID与本地ID的映射关系
|
|
|
|
mGidToNid.put(gid, c.getLong(SqlNote.ID_COLUMN));
|
|
|
|
mGidToNid.put(gid, c.getLong(SqlNote.ID_COLUMN));
|
|
|
|
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().length() == 0) {
|
|
|
|
// local add
|
|
|
|
// local add 本地GID为空：本地新增，需要同步到远程
|
|
|
|
syncType = Node.SYNC_ACTION_ADD_REMOTE;
|
|
|
|
syncType = Node.SYNC_ACTION_ADD_REMOTE;
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
// remote delete
|
|
|
|
// remote delete 本地有GID但远程无：远程已删除，需要删除本地
|
|
|
|
syncType = Node.SYNC_ACTION_DEL_LOCAL;
|
|
|
|
syncType = Node.SYNC_ACTION_DEL_LOCAL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// 执行同步操作
|
|
|
|
doContentSync(syncType, node, c);
|
|
|
|
doContentSync(syncType, node, c);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
@ -327,16 +364,20 @@ public class GTaskManager {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// go through remaining items
|
|
|
|
// go through remaining items
|
|
|
|
|
|
|
|
// 4. 处理远程存在但本地不存在的节点（需要同步到本地）
|
|
|
|
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();
|
|
|
|
node = entry.getValue();
|
|
|
|
node = entry.getValue();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 执行本地新增
|
|
|
|
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
|
|
|
|
// mCancelled can be set by another thread, so we neet to check one by
|
|
|
|
// one
|
|
|
|
// one
|
|
|
|
// clear local delete table
|
|
|
|
// clear local delete table
|
|
|
|
|
|
|
|
// 5. 清理本地已删除的笔记（若未取消同步）
|
|
|
|
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");
|
|
|
|
@ -344,6 +385,7 @@ public class GTaskManager {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// refresh local sync id
|
|
|
|
// refresh local sync id
|
|
|
|
|
|
|
|
// 6. 提交更新并刷新本地同步ID（若未取消）
|
|
|
|
if (!mCancelled) {
|
|
|
|
if (!mCancelled) {
|
|
|
|
GTaskClient.getInstance().commitUpdate();
|
|
|
|
GTaskClient.getInstance().commitUpdate();
|
|
|
|
refreshLocalSyncId();
|
|
|
|
refreshLocalSyncId();
|
|
|
|
@ -351,6 +393,7 @@ public class GTaskManager {
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 同步文件夹（任务列表）：处理本地与远程的文件夹数据
|
|
|
|
private void syncFolder() throws NetworkFailureException {
|
|
|
|
private void syncFolder() throws NetworkFailureException {
|
|
|
|
Cursor c = null;
|
|
|
|
Cursor c = null;
|
|
|
|
String gid;
|
|
|
|
String gid;
|
|
|
|
@ -362,22 +405,30 @@ public class GTaskManager {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// for root folder
|
|
|
|
// for root folder
|
|
|
|
|
|
|
|
// 1. 同步根文件夹
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
|
|
|
|
// 查询根文件夹（ID固定为Notes.ID_ROOT_FOLDER）
|
|
|
|
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);
|
|
|
|
if (c != null) {
|
|
|
|
if (c != null) {
|
|
|
|
c.moveToNext();
|
|
|
|
c.moveToNext();
|
|
|
|
gid = c.getString(SqlNote.GTASK_ID_COLUMN);
|
|
|
|
gid = c.getString(SqlNote.GTASK_ID_COLUMN);
|
|
|
|
node = mGTaskHashMap.get(gid);
|
|
|
|
node = mGTaskHashMap.get(gid);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 远程存在对应节点
|
|
|
|
if (node != null) {
|
|
|
|
if (node != null) {
|
|
|
|
mGTaskHashMap.remove(gid);
|
|
|
|
mGTaskHashMap.remove(gid);
|
|
|
|
|
|
|
|
// 记录映射关系
|
|
|
|
mGidToNid.put(gid, (long) Notes.ID_ROOT_FOLDER);
|
|
|
|
mGidToNid.put(gid, (long) Notes.ID_ROOT_FOLDER);
|
|
|
|
mNidToGid.put((long) Notes.ID_ROOT_FOLDER, gid);
|
|
|
|
mNidToGid.put((long) Notes.ID_ROOT_FOLDER, gid);
|
|
|
|
// for system folder, only update remote name if necessary
|
|
|
|
// for system folder, only update remote name if necessary
|
|
|
|
|
|
|
|
// 系统文件夹只在名称不匹配时更新远程
|
|
|
|
if (!node.getName().equals(
|
|
|
|
if (!node.getName().equals(
|
|
|
|
GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_DEFAULT))
|
|
|
|
GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_DEFAULT))
|
|
|
|
doContentSync(Node.SYNC_ACTION_UPDATE_REMOTE, node, c);
|
|
|
|
doContentSync(Node.SYNC_ACTION_UPDATE_REMOTE, node, c);
|
|
|
|
} else {
|
|
|
|
}
|
|
|
|
|
|
|
|
// 远程不存在，需要新增到远程
|
|
|
|
|
|
|
|
else {
|
|
|
|
doContentSync(Node.SYNC_ACTION_ADD_REMOTE, node, c);
|
|
|
|
doContentSync(Node.SYNC_ACTION_ADD_REMOTE, node, c);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
@ -391,7 +442,9 @@ public class GTaskManager {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// for call-note folder
|
|
|
|
// for call-note folder
|
|
|
|
|
|
|
|
// 2. 同步通话记录文件夹
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
|
|
|
|
// 查询通话记录文件夹（ID固定为Notes.ID_CALL_RECORD_FOLDER）
|
|
|
|
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[] {
|
|
|
|
String.valueOf(Notes.ID_CALL_RECORD_FOLDER)
|
|
|
|
String.valueOf(Notes.ID_CALL_RECORD_FOLDER)
|
|
|
|
@ -400,12 +453,14 @@ public class GTaskManager {
|
|
|
|
if (c.moveToNext()) {
|
|
|
|
if (c.moveToNext()) {
|
|
|
|
gid = c.getString(SqlNote.GTASK_ID_COLUMN);
|
|
|
|
gid = c.getString(SqlNote.GTASK_ID_COLUMN);
|
|
|
|
node = mGTaskHashMap.get(gid);
|
|
|
|
node = mGTaskHashMap.get(gid);
|
|
|
|
|
|
|
|
|
|
|
|
if (node != null) {
|
|
|
|
if (node != null) {
|
|
|
|
mGTaskHashMap.remove(gid);
|
|
|
|
mGTaskHashMap.remove(gid);
|
|
|
|
mGidToNid.put(gid, (long) Notes.ID_CALL_RECORD_FOLDER);
|
|
|
|
mGidToNid.put(gid, (long) Notes.ID_CALL_RECORD_FOLDER);
|
|
|
|
mNidToGid.put((long) Notes.ID_CALL_RECORD_FOLDER, gid);
|
|
|
|
mNidToGid.put((long) Notes.ID_CALL_RECORD_FOLDER, gid);
|
|
|
|
// for system folder, only update remote name if
|
|
|
|
// for system folder, only update remote name if
|
|
|
|
// necessary
|
|
|
|
// necessary
|
|
|
|
|
|
|
|
// 系统文件夹只在名称不匹配时更新远程
|
|
|
|
if (!node.getName().equals(
|
|
|
|
if (!node.getName().equals(
|
|
|
|
GTaskStringUtils.MIUI_FOLDER_PREFFIX
|
|
|
|
GTaskStringUtils.MIUI_FOLDER_PREFFIX
|
|
|
|
+ GTaskStringUtils.FOLDER_CALL_NOTE))
|
|
|
|
+ GTaskStringUtils.FOLDER_CALL_NOTE))
|
|
|
|
@ -425,10 +480,12 @@ public class GTaskManager {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// for local existing folders
|
|
|
|
// for local existing folders
|
|
|
|
|
|
|
|
// 3. 同步本地已存在的普通文件夹（非系统类型，非回收站）
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
|
|
|
|
// 查询条件：文件夹 + 父ID不是回收站
|
|
|
|
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[] {
|
|
|
|
String.valueOf(Notes.TYPE_FOLDER), String.valueOf(Notes.ID_TRASH_FOLER)
|
|
|
|
String.valueOf(Notes.TYPE_FOLDER), String.valueOf(Notes.ID_TRASH_FOLDER)
|
|
|
|
}, NoteColumns.TYPE + " DESC");
|
|
|
|
}, NoteColumns.TYPE + " DESC");
|
|
|
|
if (c != null) {
|
|
|
|
if (c != null) {
|
|
|
|
while (c.moveToNext()) {
|
|
|
|
while (c.moveToNext()) {
|
|
|
|
@ -442,9 +499,11 @@ public class GTaskManager {
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
if (c.getString(SqlNote.GTASK_ID_COLUMN).trim().length() == 0) {
|
|
|
|
if (c.getString(SqlNote.GTASK_ID_COLUMN).trim().length() == 0) {
|
|
|
|
// local add
|
|
|
|
// local add
|
|
|
|
|
|
|
|
// 本地GID为空：本地新增，同步到远程
|
|
|
|
syncType = Node.SYNC_ACTION_ADD_REMOTE;
|
|
|
|
syncType = Node.SYNC_ACTION_ADD_REMOTE;
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
// remote delete
|
|
|
|
// remote delete
|
|
|
|
|
|
|
|
// 本地有GID但远程无：远程已删除，删除本地
|
|
|
|
syncType = Node.SYNC_ACTION_DEL_LOCAL;
|
|
|
|
syncType = Node.SYNC_ACTION_DEL_LOCAL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -461,21 +520,24 @@ public class GTaskManager {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// for remote add folders
|
|
|
|
// for remote add folders
|
|
|
|
|
|
|
|
// 4. 处理远程存在但本地不存在的文件夹（同步到本地）
|
|
|
|
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();
|
|
|
|
gid = entry.getKey();
|
|
|
|
gid = entry.getKey();
|
|
|
|
node = entry.getValue();
|
|
|
|
node = entry.getValue();
|
|
|
|
if (mGTaskHashMap.containsKey(gid)) {
|
|
|
|
if (mGTaskHashMap.containsKey(gid)) { // 若缓存中存在（未被处理）
|
|
|
|
mGTaskHashMap.remove(gid);
|
|
|
|
mGTaskHashMap.remove(gid);
|
|
|
|
doContentSync(Node.SYNC_ACTION_ADD_LOCAL, node, null);
|
|
|
|
doContentSync(Node.SYNC_ACTION_ADD_LOCAL, node, null); // 本地新增
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 若未取消，提交所有文件夹相关的远程更新
|
|
|
|
if (!mCancelled)
|
|
|
|
if (!mCancelled)
|
|
|
|
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;
|
|
|
|
@ -483,52 +545,57 @@ public class GTaskManager {
|
|
|
|
|
|
|
|
|
|
|
|
MetaData meta;
|
|
|
|
MetaData meta;
|
|
|
|
switch (syncType) {
|
|
|
|
switch (syncType) {
|
|
|
|
case Node.SYNC_ACTION_ADD_LOCAL:
|
|
|
|
case Node.SYNC_ACTION_ADD_LOCAL: // 远程新增，同步到本地
|
|
|
|
addLocalNode(node);
|
|
|
|
addLocalNode(node);
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
case Node.SYNC_ACTION_ADD_REMOTE:
|
|
|
|
case Node.SYNC_ACTION_ADD_REMOTE: // 本地新增，同步到远程
|
|
|
|
addRemoteNode(node, c);
|
|
|
|
addRemoteNode(node, c);
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
case Node.SYNC_ACTION_DEL_LOCAL:
|
|
|
|
case Node.SYNC_ACTION_DEL_LOCAL: // 远程已删除，删除本地
|
|
|
|
meta = mMetaHashMap.get(c.getString(SqlNote.GTASK_ID_COLUMN));
|
|
|
|
meta = mMetaHashMap.get(c.getString(SqlNote.GTASK_ID_COLUMN)); // 获取关联元数据
|
|
|
|
if (meta != null) {
|
|
|
|
if (meta != null) {
|
|
|
|
GTaskClient.getInstance().deleteNode(meta);
|
|
|
|
GTaskClient.getInstance().deleteNode(meta); // 删除远程元数据
|
|
|
|
}
|
|
|
|
}
|
|
|
|
mLocalDeleteIdMap.add(c.getLong(SqlNote.ID_COLUMN));
|
|
|
|
mLocalDeleteIdMap.add(c.getLong(SqlNote.ID_COLUMN)); // 记录本地ID待删除
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
case Node.SYNC_ACTION_DEL_REMOTE:
|
|
|
|
case Node.SYNC_ACTION_DEL_REMOTE: // 本地已删除，删除远程
|
|
|
|
meta = mMetaHashMap.get(node.getGid());
|
|
|
|
meta = mMetaHashMap.get(node.getGid());
|
|
|
|
if (meta != null) {
|
|
|
|
if (meta != null) {
|
|
|
|
GTaskClient.getInstance().deleteNode(meta);
|
|
|
|
GTaskClient.getInstance().deleteNode(meta);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
GTaskClient.getInstance().deleteNode(node);
|
|
|
|
GTaskClient.getInstance().deleteNode(node);
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
case Node.SYNC_ACTION_UPDATE_LOCAL:
|
|
|
|
case Node.SYNC_ACTION_UPDATE_LOCAL: // 远程更新，同步到本地
|
|
|
|
updateLocalNode(node, c);
|
|
|
|
updateLocalNode(node, c);
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
case Node.SYNC_ACTION_UPDATE_REMOTE:
|
|
|
|
case Node.SYNC_ACTION_UPDATE_REMOTE: // 本地更新，同步到远程
|
|
|
|
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
|
|
|
|
// merging both modifications maybe a good idea
|
|
|
|
// right now just use local update simply
|
|
|
|
// 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: // 无同步操作
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
case Node.SYNC_ACTION_ERROR:
|
|
|
|
case Node.SYNC_ACTION_ERROR: // 同步错误
|
|
|
|
default:
|
|
|
|
default:
|
|
|
|
throw new ActionFailureException("unkown sync action type");
|
|
|
|
throw new ActionFailureException("unkown sync action type");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 本地新增节点：将远程节点同步到本地数据库
|
|
|
|
private void addLocalNode(Node node) throws NetworkFailureException {
|
|
|
|
private void addLocalNode(Node node) throws NetworkFailureException {
|
|
|
|
if (mCancelled) {
|
|
|
|
if (mCancelled) {
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
SqlNote sqlNote;
|
|
|
|
SqlNote sqlNote;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 节点是任务列表（文件夹）
|
|
|
|
if (node instanceof TaskList) {
|
|
|
|
if (node instanceof TaskList) {
|
|
|
|
|
|
|
|
// 特殊文件夹处理：根目录或通话记录文件夹
|
|
|
|
if (node.getName().equals(
|
|
|
|
if (node.getName().equals(
|
|
|
|
GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_DEFAULT)) {
|
|
|
|
GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_DEFAULT)) {
|
|
|
|
sqlNote = new SqlNote(mContext, Notes.ID_ROOT_FOLDER);
|
|
|
|
sqlNote = new SqlNote(mContext, Notes.ID_ROOT_FOLDER);
|
|
|
|
@ -537,13 +604,14 @@ public class GTaskManager {
|
|
|
|
sqlNote = new SqlNote(mContext, Notes.ID_CALL_RECORD_FOLDER);
|
|
|
|
sqlNote = new SqlNote(mContext, Notes.ID_CALL_RECORD_FOLDER);
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
sqlNote = new SqlNote(mContext);
|
|
|
|
sqlNote = new SqlNote(mContext);
|
|
|
|
sqlNote.setContent(node.getLocalJSONFromContent());
|
|
|
|
sqlNote.setContent(node.getLocalJSONFromContent()); // 用远程数据构建本地JSON
|
|
|
|
sqlNote.setParentId(Notes.ID_ROOT_FOLDER);
|
|
|
|
sqlNote.setParentId(Notes.ID_ROOT_FOLDER);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
} else { // 节点是任务（笔记）
|
|
|
|
sqlNote = new SqlNote(mContext);
|
|
|
|
sqlNote = new SqlNote(mContext);
|
|
|
|
JSONObject js = node.getLocalJSONFromContent();
|
|
|
|
JSONObject js = node.getLocalJSONFromContent(); // 用远程数据构建本地JSON
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
|
|
|
|
// 处理笔记ID冲突：若远程数据中的ID已在本地存在，移除ID（让本地自动生成）
|
|
|
|
if (js.has(GTaskStringUtils.META_HEAD_NOTE)) {
|
|
|
|
if (js.has(GTaskStringUtils.META_HEAD_NOTE)) {
|
|
|
|
JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
|
|
|
|
JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
|
|
|
|
if (note.has(NoteColumns.ID)) {
|
|
|
|
if (note.has(NoteColumns.ID)) {
|
|
|
|
@ -555,6 +623,7 @@ public class GTaskManager {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 处理数据ID冲突：同理移除已存在的ID
|
|
|
|
if (js.has(GTaskStringUtils.META_HEAD_DATA)) {
|
|
|
|
if (js.has(GTaskStringUtils.META_HEAD_DATA)) {
|
|
|
|
JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA);
|
|
|
|
JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA);
|
|
|
|
for (int i = 0; i < dataArray.length(); i++) {
|
|
|
|
for (int i = 0; i < dataArray.length(); i++) {
|
|
|
|
@ -576,26 +645,31 @@ public class GTaskManager {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
sqlNote.setContent(js);
|
|
|
|
sqlNote.setContent(js);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 获取父文件夹的本地ID（通过GID映射）
|
|
|
|
Long parentId = mGidToNid.get(((Task) node).getParent().getGid());
|
|
|
|
Long parentId = mGidToNid.get(((Task) node).getParent().getGid());
|
|
|
|
if (parentId == null) {
|
|
|
|
if (parentId == null) {
|
|
|
|
Log.e(TAG, "cannot find task's parent id locally");
|
|
|
|
Log.e(TAG, "cannot find task's parent id locally");
|
|
|
|
throw new ActionFailureException("cannot add local node");
|
|
|
|
throw new ActionFailureException("cannot add local node");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
sqlNote.setParentId(parentId.longValue());
|
|
|
|
sqlNote.setParentId(parentId.longValue()); // 设置父目录ID
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// create the local node
|
|
|
|
// create the local node
|
|
|
|
|
|
|
|
// 提交本地新增
|
|
|
|
sqlNote.setGtaskId(node.getGid());
|
|
|
|
sqlNote.setGtaskId(node.getGid());
|
|
|
|
sqlNote.commit(false);
|
|
|
|
sqlNote.commit(false);
|
|
|
|
|
|
|
|
|
|
|
|
// update gid-nid mapping
|
|
|
|
// update gid-nid mapping
|
|
|
|
|
|
|
|
// 更新映射关系
|
|
|
|
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
|
|
|
|
// 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;
|
|
|
|
@ -604,8 +678,10 @@ public class GTaskManager {
|
|
|
|
SqlNote sqlNote;
|
|
|
|
SqlNote sqlNote;
|
|
|
|
// update the note locally
|
|
|
|
// update the note locally
|
|
|
|
sqlNote = new SqlNote(mContext, c);
|
|
|
|
sqlNote = new SqlNote(mContext, c);
|
|
|
|
|
|
|
|
// 用远程数据更新本地内容
|
|
|
|
sqlNote.setContent(node.getLocalJSONFromContent());
|
|
|
|
sqlNote.setContent(node.getLocalJSONFromContent());
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 确定父目录ID（任务的父是列表，列表的父是根目录）
|
|
|
|
Long parentId = (node instanceof Task) ? mGidToNid.get(((Task) node).getParent().getGid())
|
|
|
|
Long parentId = (node instanceof Task) ? mGidToNid.get(((Task) node).getParent().getGid())
|
|
|
|
: new Long(Notes.ID_ROOT_FOLDER);
|
|
|
|
: new Long(Notes.ID_ROOT_FOLDER);
|
|
|
|
if (parentId == null) {
|
|
|
|
if (parentId == null) {
|
|
|
|
@ -613,12 +689,14 @@ public class GTaskManager {
|
|
|
|
throw new ActionFailureException("cannot update local node");
|
|
|
|
throw new ActionFailureException("cannot update local node");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
sqlNote.setParentId(parentId.longValue());
|
|
|
|
sqlNote.setParentId(parentId.longValue());
|
|
|
|
sqlNote.commit(true);
|
|
|
|
sqlNote.commit(true); // 提交更新（覆盖本地数据）
|
|
|
|
|
|
|
|
|
|
|
|
// update meta info
|
|
|
|
// 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;
|
|
|
|
@ -628,26 +706,36 @@ public class GTaskManager {
|
|
|
|
Node n;
|
|
|
|
Node n;
|
|
|
|
|
|
|
|
|
|
|
|
// update remotely
|
|
|
|
// update remotely
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
|
|
|
* 区分笔记和文件夹，执行不同远程创建逻辑
|
|
|
|
|
|
|
|
* 本地节点是笔记（对应远程任务）
|
|
|
|
|
|
|
|
*/
|
|
|
|
if (sqlNote.isNoteType()) {
|
|
|
|
if (sqlNote.isNoteType()) {
|
|
|
|
Task task = new Task();
|
|
|
|
Task task = new Task();
|
|
|
|
task.setContentByLocalJSON(sqlNote.getContent());
|
|
|
|
task.setContentByLocalJSON(sqlNote.getContent()); // 用本地JSON初始化远程任务
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 获取父文件夹的远程GID（通过本地ID映射）
|
|
|
|
String parentGid = mNidToGid.get(sqlNote.getParentId());
|
|
|
|
String parentGid = mNidToGid.get(sqlNote.getParentId());
|
|
|
|
if (parentGid == null) {
|
|
|
|
if (parentGid == null) {
|
|
|
|
Log.e(TAG, "cannot find task's parent tasklist");
|
|
|
|
Log.e(TAG, "cannot find task's parent tasklist");
|
|
|
|
throw new ActionFailureException("cannot add remote task");
|
|
|
|
throw new ActionFailureException("cannot add remote task");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// 将任务添加到父列表
|
|
|
|
mGTaskListHashMap.get(parentGid).addChildTask(task);
|
|
|
|
mGTaskListHashMap.get(parentGid).addChildTask(task);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 调用客户端创建远程任务
|
|
|
|
GTaskClient.getInstance().createTask(task);
|
|
|
|
GTaskClient.getInstance().createTask(task);
|
|
|
|
n = (Node) task;
|
|
|
|
n = (Node) task;
|
|
|
|
|
|
|
|
|
|
|
|
// add meta
|
|
|
|
// 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
|
|
|
|
// 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;
|
|
|
|
@ -656,12 +744,14 @@ public class GTaskManager {
|
|
|
|
else
|
|
|
|
else
|
|
|
|
folderName += sqlNote.getSnippet();
|
|
|
|
folderName += sqlNote.getSnippet();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 检查远程是否已存在同名文件夹（避免重复创建）
|
|
|
|
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();
|
|
|
|
String gid = entry.getKey();
|
|
|
|
String gid = entry.getKey();
|
|
|
|
TaskList list = entry.getValue();
|
|
|
|
TaskList list = entry.getValue();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 已存在同名文件夹
|
|
|
|
if (list.getName().equals(folderName)) {
|
|
|
|
if (list.getName().equals(folderName)) {
|
|
|
|
tasklist = list;
|
|
|
|
tasklist = list;
|
|
|
|
if (mGTaskHashMap.containsKey(gid)) {
|
|
|
|
if (mGTaskHashMap.containsKey(gid)) {
|
|
|
|
@ -672,6 +762,7 @@ public class GTaskManager {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// no match we can add now
|
|
|
|
// 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());
|
|
|
|
@ -682,35 +773,40 @@ public class GTaskManager {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// update local note
|
|
|
|
// update local note
|
|
|
|
|
|
|
|
// 更新本地节点的远程GID
|
|
|
|
sqlNote.setGtaskId(n.getGid());
|
|
|
|
sqlNote.setGtaskId(n.getGid());
|
|
|
|
sqlNote.commit(false);
|
|
|
|
sqlNote.commit(false); // 保存GID
|
|
|
|
sqlNote.resetLocalModified();
|
|
|
|
sqlNote.resetLocalModified(); // 重置本地修改标记（避免重复同步）
|
|
|
|
sqlNote.commit(true);
|
|
|
|
sqlNote.commit(true); // 提交修改
|
|
|
|
|
|
|
|
|
|
|
|
// gid-id mapping
|
|
|
|
// gid-id mapping
|
|
|
|
|
|
|
|
// 更新映射关系
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
SqlNote sqlNote = new SqlNote(mContext, c);
|
|
|
|
SqlNote sqlNote = new SqlNote(mContext, c); // 获取本地节点数据
|
|
|
|
|
|
|
|
|
|
|
|
// update remotely
|
|
|
|
// update remotely
|
|
|
|
node.setContentByLocalJSON(sqlNote.getContent());
|
|
|
|
node.setContentByLocalJSON(sqlNote.getContent());
|
|
|
|
GTaskClient.getInstance().addUpdateNode(node);
|
|
|
|
GTaskClient.getInstance().addUpdateNode(node); // 将更新加入客户端的更新队列
|
|
|
|
|
|
|
|
|
|
|
|
// update meta
|
|
|
|
// update meta
|
|
|
|
|
|
|
|
// 更新远程元数据
|
|
|
|
updateRemoteMeta(node.getGid(), sqlNote);
|
|
|
|
updateRemoteMeta(node.getGid(), sqlNote);
|
|
|
|
|
|
|
|
|
|
|
|
// move task if necessary
|
|
|
|
// 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(); // 原父列表
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 获取当前父文件夹的远程GID（通过本地ID映射）
|
|
|
|
String curParentGid = mNidToGid.get(sqlNote.getParentId());
|
|
|
|
String curParentGid = mNidToGid.get(sqlNote.getParentId());
|
|
|
|
if (curParentGid == null) {
|
|
|
|
if (curParentGid == null) {
|
|
|
|
Log.e(TAG, "cannot find task's parent tasklist");
|
|
|
|
Log.e(TAG, "cannot find task's parent tasklist");
|
|
|
|
@ -718,6 +814,7 @@ public class GTaskManager {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
TaskList curParentList = mGTaskListHashMap.get(curParentGid);
|
|
|
|
TaskList curParentList = mGTaskListHashMap.get(curParentGid);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 若父列表变化，执行移动操作
|
|
|
|
if (preParentList != curParentList) {
|
|
|
|
if (preParentList != curParentList) {
|
|
|
|
preParentList.removeChildTask(task);
|
|
|
|
preParentList.removeChildTask(task);
|
|
|
|
curParentList.addChildTask(task);
|
|
|
|
curParentList.addChildTask(task);
|
|
|
|
@ -730,13 +827,15 @@ public class GTaskManager {
|
|
|
|
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);
|
|
|
|
if (metaData != null) {
|
|
|
|
if (metaData != null) { // 元数据已存在，更新内容
|
|
|
|
metaData.setMeta(gid, sqlNote.getContent());
|
|
|
|
metaData.setMeta(gid, sqlNote.getContent());
|
|
|
|
GTaskClient.getInstance().addUpdateNode(metaData);
|
|
|
|
GTaskClient.getInstance().addUpdateNode(metaData); // 加入更新队列
|
|
|
|
} else {
|
|
|
|
} else { // 元数据不存在，创建新的
|
|
|
|
metaData = new MetaData();
|
|
|
|
metaData = new MetaData();
|
|
|
|
metaData.setMeta(gid, sqlNote.getContent());
|
|
|
|
metaData.setMeta(gid, sqlNote.getContent());
|
|
|
|
mMetaList.addChildTask(metaData);
|
|
|
|
mMetaList.addChildTask(metaData);
|
|
|
|
@ -746,12 +845,14 @@ 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
|
|
|
|
// get the latest gtask list
|
|
|
|
|
|
|
|
// 重新获取最新的远程节点数据
|
|
|
|
mGTaskHashMap.clear();
|
|
|
|
mGTaskHashMap.clear();
|
|
|
|
mGTaskListHashMap.clear();
|
|
|
|
mGTaskListHashMap.clear();
|
|
|
|
mMetaHashMap.clear();
|
|
|
|
mMetaHashMap.clear();
|
|
|
|
@ -759,16 +860,18 @@ public class GTaskManager {
|
|
|
|
|
|
|
|
|
|
|
|
Cursor c = null;
|
|
|
|
Cursor c = null;
|
|
|
|
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[] {
|
|
|
|
String.valueOf(Notes.TYPE_SYSTEM), String.valueOf(Notes.ID_TRASH_FOLER)
|
|
|
|
String.valueOf(Notes.TYPE_SYSTEM), String.valueOf(Notes.ID_TRASH_FOLDER)
|
|
|
|
}, NoteColumns.TYPE + " DESC");
|
|
|
|
}, NoteColumns.TYPE + " DESC");
|
|
|
|
if (c != null) {
|
|
|
|
if (c != null) {
|
|
|
|
while (c.moveToNext()) {
|
|
|
|
while (c.moveToNext()) { // 遍历本地节点
|
|
|
|
String gid = c.getString(SqlNote.GTASK_ID_COLUMN);
|
|
|
|
String gid = c.getString(SqlNote.GTASK_ID_COLUMN);
|
|
|
|
Node node = mGTaskHashMap.get(gid);
|
|
|
|
Node node = mGTaskHashMap.get(gid);
|
|
|
|
if (node != null) {
|
|
|
|
if (node != null) {
|
|
|
|
mGTaskHashMap.remove(gid);
|
|
|
|
mGTaskHashMap.remove(gid);
|
|
|
|
|
|
|
|
// 更新本地节点的同步ID（远程最后修改时间）
|
|
|
|
ContentValues values = new ContentValues();
|
|
|
|
ContentValues values = new ContentValues();
|
|
|
|
values.put(NoteColumns.SYNC_ID, node.getLastModified());
|
|
|
|
values.put(NoteColumns.SYNC_ID, node.getLastModified());
|
|
|
|
mContentResolver.update(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI,
|
|
|
|
mContentResolver.update(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI,
|
|
|
|
@ -790,6 +893,7 @@ public class GTaskManager {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 获取同步账户：返回当前登录的Google账户名
|
|
|
|
public String getSyncAccount() {
|
|
|
|
public String getSyncAccount() {
|
|
|
|
return GTaskClient.getInstance().getSyncAccount().name;
|
|
|
|
return GTaskClient.getInstance().getSyncAccount().name;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
