格式修改

src/Notes1/app/src/main/AndroidManifest.xml.orig

@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="net.micode.notes"
-    android:versionCode="1"
-    android:versionName="0.1" >
-
-<<<<<<< HEAD
-    <uses-sdk android:minSdkVersion="16" />
-=======
-    <uses-sdk android:minSdkVersion="19" />
->>>>>>> origin/ChiYanZhen_branch
-
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"></uses-permission>
-    <uses-permission android:name="android.permission.INTERNET"></uses-permission>
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.READ_CONTACTS" />
-    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
-    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
-    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-<<<<<<< HEAD
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.WRITE_SETTINGS"
-        tools:ignore="ProtectedPermissions" />
-=======
-
->>>>>>> origin/ChiYanZhen_branch
-    <application
-        android:icon="@drawable/icon_app"
-        android:label="@string/app_name" >
-        <activity
-            android:name=".ui.NotesListActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:label="@string/app_name"
-            android:launchMode="singleTop"
-            android:theme="@style/NoteTheme"
-
-            android:windowSoftInputMode="adjustPan" >
-
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-
-        <activity
-            android:name=".ui.NoteEditActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:launchMode="singleTop"
-            android:theme="@style/NoteTheme" >
-
-            <intent-filter android:scheme="http"
-                tools:ignore="AppLinkUrlError">
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="vnd.android.cursor.item/text_note" />
-                <data android:mimeType="vnd.android.cursor.item/call_note" />
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.INSERT_OR_EDIT" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="vnd.android.cursor.item/text_note" />
-                <data android:mimeType="vnd.android.cursor.item/call_note" />
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.SEARCH" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.app.searchable"
-                android:resource="@xml/searchable" />
-        </activity>
-
-<<<<<<< HEAD
-=======
-        <activity
-            android:name=".ui.DrawActivity"
-            android:theme ="@android:style/Theme.NoTitleBar.Fullscreen"
-            />
-
->>>>>>> origin/ChiYanZhen_branch
-        <provider
-            android:authorities="com.example.cameraalbumtest.fileprovider"
-            android:name="androidx.core.content.FileProvider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_paths"
-                />
-        </provider>
-        <provider
-            android:name="net.micode.notes.data.NotesProvider"
-            android:authorities="micode_notes"
-            android:multiprocess="true" />
-
-        <receiver
-            android:name=".widget.NoteWidgetProvider_2x"
-            android:label="@string/app_widget2x2" >
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.appwidget.provider"
-                android:resource="@xml/widget_2x_info" />
-        </receiver>
-        <receiver
-            android:name=".widget.NoteWidgetProvider_4x"
-            android:label="@string/app_widget4x4" >
-
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.appwidget.provider"
-                android:resource="@xml/widget_4x_info" />
-        </receiver>
-
-        <receiver android:name=".ui.AlarmInitReceiver" >
-            <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-            </intent-filter>
-        </receiver>
-
-        <receiver
-            android:name="net.micode.notes.ui.AlarmReceiver"
-            android:process=":remote" >
-        </receiver>
-
-        <activity
-            android:name=".ui.AlarmAlertActivity"
-            android:label="@string/app_name"
-            android:launchMode="singleInstance"
-            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
-        </activity>
-
-        <activity
-            android:name="net.micode.notes.ui.NotesPreferenceActivity"
-            android:label="@string/preferences_title"
-            android:launchMode="singleTop"
-            android:theme="@android:style/Theme.Holo.Light" >
-        </activity>
-
-        <service
-            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
-            android:exported="false" >
-        </service>
-
-        <meta-data
-            android:name="android.app.default_searchable"
-            android:value=".ui.NoteEditActivity" />
-    </application>
-</manifest>

src/Notes1/app/src/main/java/net/micode/notes/data/Contact.java.orig

@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.micode.notes.data;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.provider.ContactsContract.CommonDataKinds.Phone;
-import android.provider.ContactsContract.Data;
-import android.telephony.PhoneNumberUtils;
-import android.util.Log;
-
-import java.util.HashMap;
-
-public class Contact {
-    private static HashMap<String, String> sContactCache;
-    private static final String TAG = "Contact";
-
-    private static final String CALLER_ID_SELECTION = "PHONE_NUMBERS_EQUAL(" + Phone.NUMBER
-    + ",?) AND " + Data.MIMETYPE + "='" + Phone.CONTENT_ITEM_TYPE + "'"
-    + " AND " + Data.RAW_CONTACT_ID + " IN "
-            + "(SELECT raw_contact_id "
-            + " FROM phone_lookup"
-            + " WHERE min_match = '+')";
-
-    public static String getContact(Context context, String phoneNumber) {
-        if(sContactCache == null) {
-            sContactCache = new HashMap<String, String>();
-        }
-
-        if(sContactCache.containsKey(phoneNumber)) {
-            return sContactCache.get(phoneNumber);
-        }
-
-        String selection = CALLER_ID_SELECTION.replace("+",
-                PhoneNumberUtils.toCallerIDMinMatch(phoneNumber));
-        Cursor cursor = context.getContentResolver().query(
-                Data.CONTENT_URI,
-                new String [] { Phone.DISPLAY_NAME },
-                selection,
-                new String[] { phoneNumber },
-                null);
-
-        if (cursor != null && cursor.moveToFirst()) {
-            try {
-                String name = cursor.getString(0);
-                sContactCache.put(phoneNumber, name);
-                return name;
-            } catch (IndexOutOfBoundsException e) {
-                Log.e(TAG, " Cursor get string error " + e.toString());
-                return null;
-            } finally {
-                cursor.close();
-            }
-        } else {
-            Log.d(TAG, "No contact matched with number:" + phoneNumber);
-            return null;
-        }
-    }
-}

src/Notes1/app/src/main/java/net/micode/notes/data/Notes.java.orig

@@ -1,283 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.micode.notes.data;
-
-import android.net.Uri;
-public class Notes {
-    public static final String AUTHORITY = "micode_notes";
-    public static final String TAG = "Notes";
-    public static final int TYPE_NOTE     = 0;
-    public static final int TYPE_FOLDER   = 1;
-    public static final int TYPE_SYSTEM   = 2;
-
-    /**
-     * Following IDs are system folders' identifiers
-     * {@link Notes#ID_ROOT_FOLDER } is default folder
-     * {@link Notes#ID_TEMPARAY_FOLDER } is for notes belonging no folder
-     * {@link Notes#ID_CALL_RECORD_FOLDER} is to store call records
-     */
-    public static final int ID_ROOT_FOLDER = 0;
-    public static final int ID_TEMPARAY_FOLDER = -1;
-    public static final int ID_CALL_RECORD_FOLDER = -2;
-    public static final int ID_TRASH_FOLER = -3;
-
-    public static final String INTENT_EXTRA_ALERT_DATE = "net.micode.notes.alert_date";
-    public static final String INTENT_EXTRA_BACKGROUND_ID = "net.micode.notes.background_color_id";
-    public static final String INTENT_EXTRA_WIDGET_ID = "net.micode.notes.widget_id";
-    public static final String INTENT_EXTRA_WIDGET_TYPE = "net.micode.notes.widget_type";
-    public static final String INTENT_EXTRA_FOLDER_ID = "net.micode.notes.folder_id";
-    public static final String INTENT_EXTRA_CALL_DATE = "net.micode.notes.call_date";
-
-    public static final int TYPE_WIDGET_INVALIDE      = -1;
-    public static final int TYPE_WIDGET_2X            = 0;
-    public static final int TYPE_WIDGET_4X            = 1;
-
-    public static class DataConstants {
-        public static final String NOTE = TextNote.CONTENT_ITEM_TYPE;
-        public static final String CALL_NOTE = CallNote.CONTENT_ITEM_TYPE;
-    }
-
-    /**
-     * Uri to query all notes and folders
-     */
-    public static final Uri CONTENT_NOTE_URI = Uri.parse("content://" + AUTHORITY + "/note");
-
-    /**
-     * Uri to query data
-     */
-    public static final Uri CONTENT_DATA_URI = Uri.parse("content://" + AUTHORITY + "/data");
-
-    public interface NoteColumns {
-        /**
-         * The unique ID for a row
-         * <P> Type: INTEGER (long) </P>
-         */
-        public static final String ID = "_id";
-
-        /**
-         * The parent's id for note or folder
-         * <P> Type: INTEGER (long) </P>
-         */
-        public static final String PARENT_ID = "parent_id";
-
-        /**
-         * Created data for note or folder
-         * <P> Type: INTEGER (long) </P>
-         */
-        public static final String CREATED_DATE = "created_date";
-
-        /**
-         * Latest modified date
-         * <P> Type: INTEGER (long) </P>
-         */
-        public static final String MODIFIED_DATE = "modified_date";
-
-
-        /**
-         * Alert date
-         * <P> Type: INTEGER (long) </P>
-         */
-        public static final String ALERTED_DATE = "alert_date";
-
-        /**
-         * Folder's name or text content of note
-         * <P> Type: TEXT </P>
-         */
-        public static final String SNIPPET = "snippet";
-
-        /**
-         * Note's widget id
-         * <P> Type: INTEGER (long) </P>
-         */
-        public static final String WIDGET_ID = "widget_id";
-
-        /**
-         * Note's widget type
-         * <P> Type: INTEGER (long) </P>
-         */
-        public static final String WIDGET_TYPE = "widget_type";
-
-        /**
-         * Note's background color's id
-         * <P> Type: INTEGER (long) </P>
-         */
-        public static final String BG_COLOR_ID = "bg_color_id";
-
-        /**
-         * For text note, it doesn't has attachment, for multi-media
-         * note, it has at least one attachment
-         * <P> Type: INTEGER </P>
-         */
-        public static final String HAS_ATTACHMENT = "has_attachment";
-
-        /**
-         * Folder's count of notes
-         * <P> Type: INTEGER (long) </P>
-         */
-        public static final String NOTES_COUNT = "notes_count";
-
-        /**
-         * The file type: folder or note
-         * <P> Type: INTEGER </P>
-         */
-        public static final String TYPE = "type";
-
-        /**
-         * The last sync id
-         * <P> Type: INTEGER (long) </P>
-         */
-        public static final String SYNC_ID = "sync_id";
-
-        /**
-         * Sign to indicate local modified or not
-         * <P> Type: INTEGER </P>
-         */
-        public static final String LOCAL_MODIFIED = "local_modified";
-
-        /**
-         * Original parent id before moving into temporary folder
-         * <P> Type : INTEGER </P>
-         */
-        public static final String ORIGIN_PARENT_ID = "origin_parent_id";
-
-        /**
-         * The gtask id
-         * <P> Type : TEXT </P>
-         */
-        public static final String GTASK_ID = "gtask_id";
-
-        /**
-         * The version code
-         * <P> Type : INTEGER (long) </P>
-         */
-        public static final String VERSION = "version";
-<<<<<<< HEAD
-        public static final String GROUP = "group_num";
-=======
->>>>>>> origin/ChiYanZhen_branch
-    }
-
-    public interface DataColumns {
-        /**
-         * The unique ID for a row
-         * <P> Type: INTEGER (long) </P>
-         */
-        public static final String ID = "_id";
-
-        /**
-         * The MIME type of the item represented by this row.
-         * <P> Type: Text </P>
-         */
-        public static final String MIME_TYPE = "mime_type";
-
-        /**
-         * The reference id to note that this data belongs to
-         * <P> Type: INTEGER (long) </P>
-         */
-        public static final String NOTE_ID = "note_id";
-
-        /**
-         * Created data for note or folder
-         * <P> Type: INTEGER (long) </P>
-         */
-        public static final String CREATED_DATE = "created_date";
-
-        /**
-         * Latest modified date
-         * <P> Type: INTEGER (long) </P>
-         */
-        public static final String MODIFIED_DATE = "modified_date";
-
-        /**
-         * Data's content
-         * <P> Type: TEXT </P>
-         */
-        public static final String CONTENT = "content";
-
-
-        /**
-         * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
-         * integer data type
-         * <P> Type: INTEGER </P>
-         */
-        public static final String DATA1 = "data1";
-
-        /**
-         * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
-         * integer data type
-         * <P> Type: INTEGER </P>
-         */
-        public static final String DATA2 = "data2";
-
-        /**
-         * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
-         * TEXT data type
-         * <P> Type: TEXT </P>
-         */
-        public static final String DATA3 = "data3";
-
-        /**
-         * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
-         * TEXT data type
-         * <P> Type: TEXT </P>
-         */
-        public static final String DATA4 = "data4";
-
-        /**
-         * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
-         * TEXT data type
-         * <P> Type: TEXT </P>
-         */
-        public static final String DATA5 = "data5";
-    }
-
-    public static final class TextNote implements DataColumns {
-        /**
-         * Mode to indicate the text in check list mode or not
-         * <P> Type: Integer 1:check list mode 0: normal mode </P>
-         */
-        public static final String MODE = DATA1;
-
-        public static final int MODE_CHECK_LIST = 1;
-
-        public static final String CONTENT_TYPE = "vnd.android.cursor.dir/text_note";
-
-        public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/text_note";
-
-        public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/text_note");
-    }
-
-    public static final class CallNote implements DataColumns {
-        /**
-         * Call date for this record
-         * <P> Type: INTEGER (long) </P>
-         */
-        public static final String CALL_DATE = DATA1;
-
-        /**
-         * Phone number for this record
-         * <P> Type: TEXT </P>
-         */
-        public static final String PHONE_NUMBER = DATA3;
-
-        public static final String CONTENT_TYPE = "vnd.android.cursor.dir/call_note";
-
-        public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/call_note";
-
-        public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/call_note");
-    }
-}

src/Notes1/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java.orig

@@ -1,362 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.micode.notes.data;
-
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteOpenHelper;
-import android.util.Log;
-
-import net.micode.notes.data.Notes.DataColumns;
-import net.micode.notes.data.Notes.DataConstants;
-import net.micode.notes.data.Notes.NoteColumns;
-
-
-public class NotesDatabaseHelper extends SQLiteOpenHelper {
-    private static final String DB_NAME = "note.db";
-
-    private static final int DB_VERSION = 4;
-
-    public interface TABLE {
-        public static final String NOTE = "note";
-
-        public static final String DATA = "data";
-    }
-
-    private static final String TAG = "NotesDatabaseHelper";
-
-    private static NotesDatabaseHelper mInstance;
-
-    private static final String CREATE_NOTE_TABLE_SQL =
-        "CREATE TABLE " + TABLE.NOTE + "(" +
-            NoteColumns.ID + " INTEGER PRIMARY KEY," +
-            NoteColumns.PARENT_ID + " INTEGER NOT NULL DEFAULT 0," +
-            NoteColumns.ALERTED_DATE + " INTEGER NOT NULL DEFAULT 0," +
-            NoteColumns.BG_COLOR_ID + " INTEGER NOT NULL DEFAULT 0," +
-            NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +
-            NoteColumns.HAS_ATTACHMENT + " INTEGER NOT NULL DEFAULT 0," +
-            NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +
-            NoteColumns.NOTES_COUNT + " INTEGER NOT NULL DEFAULT 0," +
-            NoteColumns.SNIPPET + " TEXT NOT NULL DEFAULT ''," +
-            NoteColumns.TYPE + " INTEGER NOT NULL DEFAULT 0," +
-            NoteColumns.WIDGET_ID + " INTEGER NOT NULL DEFAULT 0," +
-            NoteColumns.WIDGET_TYPE + " INTEGER NOT NULL DEFAULT -1," +
-            NoteColumns.SYNC_ID + " INTEGER NOT NULL DEFAULT 0," +
-            NoteColumns.LOCAL_MODIFIED + " INTEGER NOT NULL DEFAULT 0," +
-            NoteColumns.ORIGIN_PARENT_ID + " INTEGER NOT NULL DEFAULT 0," +
-            NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''," +
-            NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0" +
-        ")";
-
-    private static final String CREATE_DATA_TABLE_SQL =
-        "CREATE TABLE " + TABLE.DATA + "(" +
-            DataColumns.ID + " INTEGER PRIMARY KEY," +
-            DataColumns.MIME_TYPE + " TEXT NOT NULL," +
-            DataColumns.NOTE_ID + " INTEGER NOT NULL DEFAULT 0," +
-            NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +
-            NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +
-            DataColumns.CONTENT + " TEXT NOT NULL DEFAULT ''," +
-            DataColumns.DATA1 + " INTEGER," +
-            DataColumns.DATA2 + " INTEGER," +
-            DataColumns.DATA3 + " TEXT NOT NULL DEFAULT ''," +
-            DataColumns.DATA4 + " TEXT NOT NULL DEFAULT ''," +
-            DataColumns.DATA5 + " TEXT NOT NULL DEFAULT ''" +
-        ")";
-
-    private static final String CREATE_DATA_NOTE_ID_INDEX_SQL =
-        "CREATE INDEX IF NOT EXISTS note_id_index ON " +
-        TABLE.DATA + "(" + DataColumns.NOTE_ID + ");";
-
-    /**
-     * Increase folder's note count when move note to the folder
-     */
-    private static final String NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER =
-        "CREATE TRIGGER increase_folder_count_on_update "+
-        " AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE +
-        " BEGIN " +
-        "  UPDATE " + TABLE.NOTE +
-        "   SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + " + 1" +
-        "  WHERE " + NoteColumns.ID + "=new." + NoteColumns.PARENT_ID + ";" +
-        " END";
-
-    /**
-     * Decrease folder's note count when move note from folder
-     */
-    private static final String NOTE_DECREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER =
-        "CREATE TRIGGER decrease_folder_count_on_update " +
-        " AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE +
-        " BEGIN " +
-        "  UPDATE " + TABLE.NOTE +
-        "   SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + "-1" +
-        "  WHERE " + NoteColumns.ID + "=old." + NoteColumns.PARENT_ID +
-        "  AND " + NoteColumns.NOTES_COUNT + ">0" + ";" +
-        " END";
-
-    /**
-     * Increase folder's note count when insert new note to the folder
-     */
-    private static final String NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER =
-        "CREATE TRIGGER increase_folder_count_on_insert " +
-        " AFTER INSERT ON " + TABLE.NOTE +
-        " BEGIN " +
-        "  UPDATE " + TABLE.NOTE +
-        "   SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + " + 1" +
-        "  WHERE " + NoteColumns.ID + "=new." + NoteColumns.PARENT_ID + ";" +
-        " END";
-
-    /**
-     * Decrease folder's note count when delete note from the folder
-     */
-    private static final String NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER =
-        "CREATE TRIGGER decrease_folder_count_on_delete " +
-        " AFTER DELETE ON " + TABLE.NOTE +
-        " BEGIN " +
-        "  UPDATE " + TABLE.NOTE +
-        "   SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + "-1" +
-        "  WHERE " + NoteColumns.ID + "=old." + NoteColumns.PARENT_ID +
-        "  AND " + NoteColumns.NOTES_COUNT + ">0;" +
-        " END";
-
-    /**
-     * Update note's content when insert data with type {@link DataConstants#NOTE}
-     */
-    private static final String DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER =
-        "CREATE TRIGGER update_note_content_on_insert " +
-        " AFTER INSERT ON " + TABLE.DATA +
-        " WHEN new." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" +
-        " BEGIN" +
-        "  UPDATE " + TABLE.NOTE +
-        "   SET " + NoteColumns.SNIPPET + "=new." + DataColumns.CONTENT +
-        "  WHERE " + NoteColumns.ID + "=new." + DataColumns.NOTE_ID + ";" +
-        " END";
-
-    /**
-     * Update note's content when data with {@link DataConstants#NOTE} type has changed
-     */
-    private static final String DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER =
-        "CREATE TRIGGER update_note_content_on_update " +
-        " AFTER UPDATE ON " + TABLE.DATA +
-        " WHEN old." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" +
-        " BEGIN" +
-        "  UPDATE " + TABLE.NOTE +
-        "   SET " + NoteColumns.SNIPPET + "=new." + DataColumns.CONTENT +
-        "  WHERE " + NoteColumns.ID + "=new." + DataColumns.NOTE_ID + ";" +
-        " END";
-
-    /**
-     * Update note's content when data with {@link DataConstants#NOTE} type has deleted
-     */
-    private static final String DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER =
-        "CREATE TRIGGER update_note_content_on_delete " +
-        " AFTER delete ON " + TABLE.DATA +
-        " WHEN old." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" +
-        " BEGIN" +
-        "  UPDATE " + TABLE.NOTE +
-        "   SET " + NoteColumns.SNIPPET + "=''" +
-        "  WHERE " + NoteColumns.ID + "=old." + DataColumns.NOTE_ID + ";" +
-        " END";
-
-    /**
-     * Delete datas belong to note which has been deleted
-     */
-    private static final String NOTE_DELETE_DATA_ON_DELETE_TRIGGER =
-        "CREATE TRIGGER delete_data_on_delete " +
-        " AFTER DELETE ON " + TABLE.NOTE +
-        " BEGIN" +
-        "  DELETE FROM " + TABLE.DATA +
-        "   WHERE " + DataColumns.NOTE_ID + "=old." + NoteColumns.ID + ";" +
-        " END";
-
-    /**
-     * Delete notes belong to folder which has been deleted
-     */
-    private static final String FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER =
-        "CREATE TRIGGER folder_delete_notes_on_delete " +
-        " AFTER DELETE ON " + TABLE.NOTE +
-        " BEGIN" +
-        "  DELETE FROM " + TABLE.NOTE +
-        "   WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" +
-        " END";
-
-    /**
-     * Move notes belong to folder which has been moved to trash folder
-     */
-    private static final String FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER =
-        "CREATE TRIGGER folder_move_notes_on_trash " +
-        " AFTER UPDATE ON " + TABLE.NOTE +
-        " WHEN new." + NoteColumns.PARENT_ID + "=" + Notes.ID_TRASH_FOLER +
-        " BEGIN" +
-        "  UPDATE " + TABLE.NOTE +
-        "   SET " + NoteColumns.PARENT_ID + "=" + Notes.ID_TRASH_FOLER +
-        "  WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" +
-        " END";
-
-    public NotesDatabaseHelper(Context context) {
-        super(context, DB_NAME, null, DB_VERSION);
-    }
-
-    public void createNoteTable(SQLiteDatabase db) {
-        db.execSQL(CREATE_NOTE_TABLE_SQL);
-        reCreateNoteTableTriggers(db);
-        createSystemFolder(db);
-        Log.d(TAG, "note table has been created");
-    }
-
-    private void reCreateNoteTableTriggers(SQLiteDatabase db) {
-        db.execSQL("DROP TRIGGER IF EXISTS increase_folder_count_on_update");
-        db.execSQL("DROP TRIGGER IF EXISTS decrease_folder_count_on_update");
-        db.execSQL("DROP TRIGGER IF EXISTS decrease_folder_count_on_delete");
-        db.execSQL("DROP TRIGGER IF EXISTS delete_data_on_delete");
-        db.execSQL("DROP TRIGGER IF EXISTS increase_folder_count_on_insert");
-        db.execSQL("DROP TRIGGER IF EXISTS folder_delete_notes_on_delete");
-        db.execSQL("DROP TRIGGER IF EXISTS folder_move_notes_on_trash");
-
-        db.execSQL(NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER);
-        db.execSQL(NOTE_DECREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER);
-        db.execSQL(NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER);
-        db.execSQL(NOTE_DELETE_DATA_ON_DELETE_TRIGGER);
-        db.execSQL(NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER);
-        db.execSQL(FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER);
-        db.execSQL(FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER);
-    }
-
-    private void createSystemFolder(SQLiteDatabase db) {
-        ContentValues values = new ContentValues();
-
-        /**
-         * call record foler for call notes
-         */
-        values.put(NoteColumns.ID, Notes.ID_CALL_RECORD_FOLDER);
-        values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
-        db.insert(TABLE.NOTE, null, values);
-
-        /**
-         * root folder which is default folder
-         */
-        values.clear();
-        values.put(NoteColumns.ID, Notes.ID_ROOT_FOLDER);
-        values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
-        db.insert(TABLE.NOTE, null, values);
-
-        /**
-         * temporary folder which is used for moving note
-         */
-        values.clear();
-        values.put(NoteColumns.ID, Notes.ID_TEMPARAY_FOLDER);
-        values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
-        db.insert(TABLE.NOTE, null, values);
-
-        /**
-         * create trash folder
-         */
-        values.clear();
-        values.put(NoteColumns.ID, Notes.ID_TRASH_FOLER);
-        values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
-        db.insert(TABLE.NOTE, null, values);
-    }
-
-    public void createDataTable(SQLiteDatabase db) {
-        db.execSQL(CREATE_DATA_TABLE_SQL);
-        reCreateDataTableTriggers(db);
-        db.execSQL(CREATE_DATA_NOTE_ID_INDEX_SQL);
-        Log.d(TAG, "data table has been created");
-    }
-
-    private void reCreateDataTableTriggers(SQLiteDatabase db) {
-        db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_insert");
-        db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_update");
-        db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_delete");
-
-        db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER);
-        db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER);
-        db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER);
-    }
-
-    static synchronized NotesDatabaseHelper getInstance(Context context) {
-        if (mInstance == null) {
-            mInstance = new NotesDatabaseHelper(context);
-        }
-        return mInstance;
-    }
-
-    @Override
-    public void onCreate(SQLiteDatabase db) {
-        createNoteTable(db);
-        createDataTable(db);
-    }
-
-    @Override
-    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-        boolean reCreateTriggers = false;
-        boolean skipV2 = false;
-
-        if (oldVersion == 1) {
-            upgradeToV2(db);
-            skipV2 = true; // this upgrade including the upgrade from v2 to v3
-            oldVersion++;
-        }
-
-        if (oldVersion == 2 && !skipV2) {
-            upgradeToV3(db);
-            reCreateTriggers = true;
-            oldVersion++;
-        }
-
-        if (oldVersion == 3) {
-            upgradeToV4(db);
-            oldVersion++;
-        }
-
-        if (reCreateTriggers) {
-            reCreateNoteTableTriggers(db);
-            reCreateDataTableTriggers(db);
-        }
-
-        if (oldVersion != newVersion) {
-            throw new IllegalStateException("Upgrade notes database to version " + newVersion
-                    + "fails");
-        }
-    }
-
-    private void upgradeToV2(SQLiteDatabase db) {
-        db.execSQL("DROP TABLE IF EXISTS " + TABLE.NOTE);
-        db.execSQL("DROP TABLE IF EXISTS " + TABLE.DATA);
-        createNoteTable(db);
-        createDataTable(db);
-    }
-
-    private void upgradeToV3(SQLiteDatabase db) {
-        // drop unused triggers
-        db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_insert");
-        db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_delete");
-        db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_update");
-        // add a column for gtask id
-        db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.GTASK_ID
-                + " TEXT NOT NULL DEFAULT ''");
-        // add a trash system folder
-        ContentValues values = new ContentValues();
-        values.put(NoteColumns.ID, Notes.ID_TRASH_FOLER);
-        values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
-        db.insert(TABLE.NOTE, null, values);
-    }
-
-    private void upgradeToV4(SQLiteDatabase db) {
-        db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.VERSION
-                + " INTEGER NOT NULL DEFAULT 0");
-    }
-}

src/Notes1/app/src/main/java/net/micode/notes/data/NotesProvider.java.orig

@@ -1,305 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.micode.notes.data;
-
-
-import android.app.SearchManager;
-import android.content.ContentProvider;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.content.Intent;
-import android.content.UriMatcher;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.net.Uri;
-import android.text.TextUtils;
-import android.util.Log;
-
-import net.micode.notes.R;
-import net.micode.notes.data.Notes.DataColumns;
-import net.micode.notes.data.Notes.NoteColumns;
-import net.micode.notes.data.NotesDatabaseHelper.TABLE;
-
-
-public class NotesProvider extends ContentProvider {
-    private static final UriMatcher mMatcher;
-
-    private NotesDatabaseHelper mHelper;
-
-    private static final String TAG = "NotesProvider";
-
-    private static final int URI_NOTE            = 1;
-    private static final int URI_NOTE_ITEM       = 2;
-    private static final int URI_DATA            = 3;
-    private static final int URI_DATA_ITEM       = 4;
-
-    private static final int URI_SEARCH          = 5;
-    private static final int URI_SEARCH_SUGGEST  = 6;
-
-    static {
-        mMatcher = new UriMatcher(UriMatcher.NO_MATCH);
-        mMatcher.addURI(Notes.AUTHORITY, "note", URI_NOTE);
-        mMatcher.addURI(Notes.AUTHORITY, "note/#", URI_NOTE_ITEM);
-        mMatcher.addURI(Notes.AUTHORITY, "data", URI_DATA);
-        mMatcher.addURI(Notes.AUTHORITY, "data/#", URI_DATA_ITEM);
-        mMatcher.addURI(Notes.AUTHORITY, "search", URI_SEARCH);
-        mMatcher.addURI(Notes.AUTHORITY, SearchManager.SUGGEST_URI_PATH_QUERY, URI_SEARCH_SUGGEST);
-        mMatcher.addURI(Notes.AUTHORITY, SearchManager.SUGGEST_URI_PATH_QUERY + "/*", URI_SEARCH_SUGGEST);
-    }
-
-    /**
-     * x'0A' represents the '\n' character in sqlite. For title and content in the search result,
-     * we will trim '\n' and white space in order to show more information.
-     */
-    private static final String NOTES_SEARCH_PROJECTION = NoteColumns.ID + ","
-        + NoteColumns.ID + " AS " + SearchManager.SUGGEST_COLUMN_INTENT_EXTRA_DATA + ","
-        + "TRIM(REPLACE(" + NoteColumns.SNIPPET + ", x'0A','')) AS " + SearchManager.SUGGEST_COLUMN_TEXT_1 + ","
-        + "TRIM(REPLACE(" + NoteColumns.SNIPPET + ", x'0A','')) AS " + SearchManager.SUGGEST_COLUMN_TEXT_2 + ","
-        + R.drawable.search_result + " AS " + SearchManager.SUGGEST_COLUMN_ICON_1 + ","
-        + "'" + Intent.ACTION_VIEW + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_ACTION + ","
-        + "'" + Notes.TextNote.CONTENT_TYPE + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_DATA;
-
-    private static String NOTES_SNIPPET_SEARCH_QUERY = "SELECT " + NOTES_SEARCH_PROJECTION
-        + " FROM " + TABLE.NOTE
-        + " WHERE " + NoteColumns.SNIPPET + " LIKE ?"
-        + " AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER
-        + " AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE;
-
-    @Override
-    public boolean onCreate() {
-        mHelper = NotesDatabaseHelper.getInstance(getContext());
-        return true;
-    }
-
-    @Override
-    public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
-            String sortOrder) {
-        Cursor c = null;
-        SQLiteDatabase db = mHelper.getReadableDatabase();
-        String id = null;
-        switch (mMatcher.match(uri)) {
-            case URI_NOTE:
-                c = db.query(TABLE.NOTE, projection, selection, selectionArgs, null, null,
-                        sortOrder);
-                break;
-            case URI_NOTE_ITEM:
-                id = uri.getPathSegments().get(1);
-                c = db.query(TABLE.NOTE, projection, NoteColumns.ID + "=" + id
-                        + parseSelection(selection), selectionArgs, null, null, sortOrder);
-                break;
-            case URI_DATA:
-                c = db.query(TABLE.DATA, projection, selection, selectionArgs, null, null,
-                        sortOrder);
-                break;
-            case URI_DATA_ITEM:
-                id = uri.getPathSegments().get(1);
-                c = db.query(TABLE.DATA, projection, DataColumns.ID + "=" + id
-                        + parseSelection(selection), selectionArgs, null, null, sortOrder);
-                break;
-            case URI_SEARCH:
-            case URI_SEARCH_SUGGEST:
-                if (sortOrder != null || projection != null) {
-                    throw new IllegalArgumentException(
-                            "do not specify sortOrder, selection, selectionArgs, or projection" + "with this query");
-                }
-
-                String searchString = null;
-                if (mMatcher.match(uri) == URI_SEARCH_SUGGEST) {
-                    if (uri.getPathSegments().size() > 1) {
-                        searchString = uri.getPathSegments().get(1);
-                    }
-                } else {
-                    searchString = uri.getQueryParameter("pattern");
-                }
-
-                if (TextUtils.isEmpty(searchString)) {
-                    return null;
-                }
-
-                try {
-                    searchString = String.format("%%%s%%", searchString);
-                    c = db.rawQuery(NOTES_SNIPPET_SEARCH_QUERY,
-                            new String[] { searchString });
-                } catch (IllegalStateException ex) {
-                    Log.e(TAG, "got exception: " + ex.toString());
-                }
-                break;
-            default:
-                throw new IllegalArgumentException("Unknown URI " + uri);
-        }
-        if (c != null) {
-            c.setNotificationUri(getContext().getContentResolver(), uri);
-        }
-        return c;
-    }
-
-    @Override
-    public Uri insert(Uri uri, ContentValues values) {
-        SQLiteDatabase db = mHelper.getWritableDatabase();
-        long dataId = 0, noteId = 0, insertedId = 0;
-        switch (mMatcher.match(uri)) {
-            case URI_NOTE:
-                insertedId = noteId = db.insert(TABLE.NOTE, null, values);
-                break;
-            case URI_DATA:
-                if (values.containsKey(DataColumns.NOTE_ID)) {
-                    noteId = values.getAsLong(DataColumns.NOTE_ID);
-                } else {
-                    Log.d(TAG, "Wrong data format without note id:" + values.toString());
-                }
-                insertedId = dataId = db.insert(TABLE.DATA, null, values);
-                break;
-            default:
-                throw new IllegalArgumentException("Unknown URI " + uri);
-        }
-        // Notify the note uri
-        if (noteId > 0) {
-            getContext().getContentResolver().notifyChange(
-                    ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), null);
-        }
-
-        // Notify the data uri
-        if (dataId > 0) {
-            getContext().getContentResolver().notifyChange(
-                    ContentUris.withAppendedId(Notes.CONTENT_DATA_URI, dataId), null);
-        }
-
-        return ContentUris.withAppendedId(uri, insertedId);
-    }
-
-    @Override
-    public int delete(Uri uri, String selection, String[] selectionArgs) {
-        int count = 0;
-        String id = null;
-        SQLiteDatabase db = mHelper.getWritableDatabase();
-        boolean deleteData = false;
-        switch (mMatcher.match(uri)) {
-            case URI_NOTE:
-                selection = "(" + selection + ") AND " + NoteColumns.ID + ">0 ";
-                count = db.delete(TABLE.NOTE, selection, selectionArgs);
-                break;
-            case URI_NOTE_ITEM:
-                id = uri.getPathSegments().get(1);
-                /**
-                 * ID that smaller than 0 is system folder which is not allowed to
-                 * trash
-                 */
-                long noteId = Long.valueOf(id);
-                if (noteId <= 0) {
-                    break;
-                }
-                count = db.delete(TABLE.NOTE,
-                        NoteColumns.ID + "=" + id + parseSelection(selection), selectionArgs);
-                break;
-            case URI_DATA:
-                count = db.delete(TABLE.DATA, selection, selectionArgs);
-                deleteData = true;
-                break;
-            case URI_DATA_ITEM:
-                id = uri.getPathSegments().get(1);
-                count = db.delete(TABLE.DATA,
-                        DataColumns.ID + "=" + id + parseSelection(selection), selectionArgs);
-                deleteData = true;
-                break;
-            default:
-                throw new IllegalArgumentException("Unknown URI " + uri);
-        }
-        if (count > 0) {
-            if (deleteData) {
-                getContext().getContentResolver().notifyChange(Notes.CONTENT_NOTE_URI, null);
-            }
-            getContext().getContentResolver().notifyChange(uri, null);
-        }
-        return count;
-    }
-
-    @Override
-    public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
-        int count = 0;
-        String id = null;
-        SQLiteDatabase db = mHelper.getWritableDatabase();
-        boolean updateData = false;
-        switch (mMatcher.match(uri)) {
-            case URI_NOTE:
-                increaseNoteVersion(-1, selection, selectionArgs);
-                count = db.update(TABLE.NOTE, values, selection, selectionArgs);
-                break;
-            case URI_NOTE_ITEM:
-                id = uri.getPathSegments().get(1);
-                increaseNoteVersion(Long.valueOf(id), selection, selectionArgs);
-                count = db.update(TABLE.NOTE, values, NoteColumns.ID + "=" + id
-                        + parseSelection(selection), selectionArgs);
-                break;
-            case URI_DATA:
-                count = db.update(TABLE.DATA, values, selection, selectionArgs);
-                updateData = true;
-                break;
-            case URI_DATA_ITEM:
-                id = uri.getPathSegments().get(1);
-                count = db.update(TABLE.DATA, values, DataColumns.ID + "=" + id
-                        + parseSelection(selection), selectionArgs);
-                updateData = true;
-                break;
-            default:
-                throw new IllegalArgumentException("Unknown URI " + uri);
-        }
-
-        if (count > 0) {
-            if (updateData) {
-                getContext().getContentResolver().notifyChange(Notes.CONTENT_NOTE_URI, null);
-            }
-            getContext().getContentResolver().notifyChange(uri, null);
-        }
-        return count;
-    }
-
-    private String parseSelection(String selection) {
-        return (!TextUtils.isEmpty(selection) ? " AND (" + selection + ')' : "");
-    }
-
-    private void increaseNoteVersion(long id, String selection, String[] selectionArgs) {
-        StringBuilder sql = new StringBuilder(120);
-        sql.append("UPDATE ");
-        sql.append(TABLE.NOTE);
-        sql.append(" SET ");
-        sql.append(NoteColumns.VERSION);
-        sql.append("=" + NoteColumns.VERSION + "+1 ");
-
-        if (id > 0 || !TextUtils.isEmpty(selection)) {
-            sql.append(" WHERE ");
-        }
-        if (id > 0) {
-            sql.append(NoteColumns.ID + "=" + String.valueOf(id));
-        }
-        if (!TextUtils.isEmpty(selection)) {
-            String selectString = id > 0 ? parseSelection(selection) : selection;
-            for (String args : selectionArgs) {
-                selectString = selectString.replaceFirst("\\?", args);
-            }
-            sql.append(selectString);
-        }
-
-        mHelper.getWritableDatabase().execSQL(sql.toString());
-    }
-
-    @Override
-    public String getType(Uri uri) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-}

src/Notes1/app/src/main/java/net/micode/notes/gtask/data/MetaData.java.orig

@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.micode.notes.gtask.data;
-
-import android.database.Cursor;
-import android.util.Log;
-
-import net.micode.notes.tool.GTaskStringUtils;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-
-public class MetaData extends Task {
-    private final static String TAG = MetaData.class.getSimpleName();
-
-    private String mRelatedGid = null;
-
-    public void setMeta(String gid, JSONObject metaInfo) {
-        try {
-            metaInfo.put(GTaskStringUtils.META_HEAD_GTASK_ID, gid);
-        } catch (JSONException e) {
-            Log.e(TAG, "failed to put related gid");
-        }
-        setNotes(metaInfo.toString());
-        setName(GTaskStringUtils.META_NOTE_NAME);
-    }
-
-    public String getRelatedGid() {
-        return mRelatedGid;
-    }
-
-    @Override
-    public boolean isWorthSaving() {
-        return getNotes() != null;
-    }
-
-    @Override
-    public void setContentByRemoteJSON(JSONObject js) {
-        super.setContentByRemoteJSON(js);
-        if (getNotes() != null) {
-            try {
-                JSONObject metaInfo = new JSONObject(getNotes().trim());
-                mRelatedGid = metaInfo.getString(GTaskStringUtils.META_HEAD_GTASK_ID);
-            } catch (JSONException e) {
-                Log.w(TAG, "failed to get related gid");
-                mRelatedGid = null;
-            }
-        }
-    }
-
-    @Override
-    public void setContentByLocalJSON(JSONObject js) {
-        // this function should not be called
-        throw new IllegalAccessError("MetaData:setContentByLocalJSON should not be called");
-    }
-
-    @Override
-    public JSONObject getLocalJSONFromContent() {
-        throw new IllegalAccessError("MetaData:getLocalJSONFromContent should not be called");
-    }
-
-    @Override
-    public int getSyncAction(Cursor c) {
-        throw new IllegalAccessError("MetaData:getSyncAction should not be called");
-    }
-
-}

src/Notes1/app/src/main/java/net/micode/notes/gtask/data/Node.java.orig

@@ -1,101 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.micode.notes.gtask.data;
-
-import android.database.Cursor;
-
-import org.json.JSONObject;
-
-public abstract class Node {
-    public static final int SYNC_ACTION_NONE = 0;
-
-    public static final int SYNC_ACTION_ADD_REMOTE = 1;
-
-    public static final int SYNC_ACTION_ADD_LOCAL = 2;
-
-    public static final int SYNC_ACTION_DEL_REMOTE = 3;
-
-    public static final int SYNC_ACTION_DEL_LOCAL = 4;
-
-    public static final int SYNC_ACTION_UPDATE_REMOTE = 5;
-
-    public static final int SYNC_ACTION_UPDATE_LOCAL = 6;
-
-    public static final int SYNC_ACTION_UPDATE_CONFLICT = 7;
-
-    public static final int SYNC_ACTION_ERROR = 8;
-
-    private String mGid;
-
-    private String mName;
-
-    private long mLastModified;
-
-    private boolean mDeleted;
-
-    public Node() {
-        mGid = null;
-        mName = "";
-        mLastModified = 0;
-        mDeleted = false;
-    }
-
-    public abstract JSONObject getCreateAction(int actionId);
-
-    public abstract JSONObject getUpdateAction(int actionId);
-
-    public abstract void setContentByRemoteJSON(JSONObject js);
-
-    public abstract void setContentByLocalJSON(JSONObject js);
-
-    public abstract JSONObject getLocalJSONFromContent();
-
-    public abstract int getSyncAction(Cursor c);
-
-    public void setGid(String gid) {
-        this.mGid = gid;
-    }
-
-    public void setName(String name) {
-        this.mName = name;
-    }
-
-    public void setLastModified(long lastModified) {
-        this.mLastModified = lastModified;
-    }
-
-    public void setDeleted(boolean deleted) {
-        this.mDeleted = deleted;
-    }
-
-    public String getGid() {
-        return this.mGid;
-    }
-
-    public String getName() {
-        return this.mName;
-    }
-
-    public long getLastModified() {
-        return this.mLastModified;
-    }
-
-    public boolean getDeleted() {
-        return this.mDeleted;
-    }
-
-}

src/Notes1/app/src/main/java/net/micode/notes/gtask/data/SqlData.java.orig

@@ -1,189 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.micode.notes.gtask.data;
-
-import android.content.ContentResolver;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.net.Uri;
-import android.util.Log;
-
-import net.micode.notes.data.Notes;
-import net.micode.notes.data.Notes.DataColumns;
-import net.micode.notes.data.Notes.DataConstants;
-import net.micode.notes.data.Notes.NoteColumns;
-import net.micode.notes.data.NotesDatabaseHelper.TABLE;
-import net.micode.notes.gtask.exception.ActionFailureException;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-
-public class SqlData {
-    private static final String TAG = SqlData.class.getSimpleName();
-
-    private static final int INVALID_ID = -99999;
-
-    public static final String[] PROJECTION_DATA = new String[] {
-            DataColumns.ID, DataColumns.MIME_TYPE, DataColumns.CONTENT, DataColumns.DATA1,
-            DataColumns.DATA3
-    };
-
-    public static final int DATA_ID_COLUMN = 0;
-
-    public static final int DATA_MIME_TYPE_COLUMN = 1;
-
-    public static final int DATA_CONTENT_COLUMN = 2;
-
-    public static final int DATA_CONTENT_DATA_1_COLUMN = 3;
-
-    public static final int DATA_CONTENT_DATA_3_COLUMN = 4;
-
-    private ContentResolver mContentResolver;
-
-    private boolean mIsCreate;
-
-    private long mDataId;
-
-    private String mDataMimeType;
-
-    private String mDataContent;
-
-    private long mDataContentData1;
-
-    private String mDataContentData3;
-
-    private ContentValues mDiffDataValues;
-
-    public SqlData(Context context) {
-        mContentResolver = context.getContentResolver();
-        mIsCreate = true;
-        mDataId = INVALID_ID;
-        mDataMimeType = DataConstants.NOTE;
-        mDataContent = "";
-        mDataContentData1 = 0;
-        mDataContentData3 = "";
-        mDiffDataValues = new ContentValues();
-    }
-
-    public SqlData(Context context, Cursor c) {
-        mContentResolver = context.getContentResolver();
-        mIsCreate = false;
-        loadFromCursor(c);
-        mDiffDataValues = new ContentValues();
-    }
-
-    private void loadFromCursor(Cursor c) {
-        mDataId = c.getLong(DATA_ID_COLUMN);
-        mDataMimeType = c.getString(DATA_MIME_TYPE_COLUMN);
-        mDataContent = c.getString(DATA_CONTENT_COLUMN);
-        mDataContentData1 = c.getLong(DATA_CONTENT_DATA_1_COLUMN);
-        mDataContentData3 = c.getString(DATA_CONTENT_DATA_3_COLUMN);
-    }
-
-    public void setContent(JSONObject js) throws JSONException {
-        long dataId = js.has(DataColumns.ID) ? js.getLong(DataColumns.ID) : INVALID_ID;
-        if (mIsCreate || mDataId != dataId) {
-            mDiffDataValues.put(DataColumns.ID, dataId);
-        }
-        mDataId = dataId;
-
-        String dataMimeType = js.has(DataColumns.MIME_TYPE) ? js.getString(DataColumns.MIME_TYPE)
-                : DataConstants.NOTE;
-        if (mIsCreate || !mDataMimeType.equals(dataMimeType)) {
-            mDiffDataValues.put(DataColumns.MIME_TYPE, dataMimeType);
-        }
-        mDataMimeType = dataMimeType;
-
-        String dataContent = js.has(DataColumns.CONTENT) ? js.getString(DataColumns.CONTENT) : "";
-        if (mIsCreate || !mDataContent.equals(dataContent)) {
-            mDiffDataValues.put(DataColumns.CONTENT, dataContent);
-        }
-        mDataContent = dataContent;
-
-        long dataContentData1 = js.has(DataColumns.DATA1) ? js.getLong(DataColumns.DATA1) : 0;
-        if (mIsCreate || mDataContentData1 != dataContentData1) {
-            mDiffDataValues.put(DataColumns.DATA1, dataContentData1);
-        }
-        mDataContentData1 = dataContentData1;
-
-        String dataContentData3 = js.has(DataColumns.DATA3) ? js.getString(DataColumns.DATA3) : "";
-        if (mIsCreate || !mDataContentData3.equals(dataContentData3)) {
-            mDiffDataValues.put(DataColumns.DATA3, dataContentData3);
-        }
-        mDataContentData3 = dataContentData3;
-    }
-
-    public JSONObject getContent() throws JSONException {
-        if (mIsCreate) {
-            Log.e(TAG, "it seems that we haven't created this in database yet");
-            return null;
-        }
-        JSONObject js = new JSONObject();
-        js.put(DataColumns.ID, mDataId);
-        js.put(DataColumns.MIME_TYPE, mDataMimeType);
-        js.put(DataColumns.CONTENT, mDataContent);
-        js.put(DataColumns.DATA1, mDataContentData1);
-        js.put(DataColumns.DATA3, mDataContentData3);
-        return js;
-    }
-
-    public void commit(long noteId, boolean validateVersion, long version) {
-
-        if (mIsCreate) {
-            if (mDataId == INVALID_ID && mDiffDataValues.containsKey(DataColumns.ID)) {
-                mDiffDataValues.remove(DataColumns.ID);
-            }
-
-            mDiffDataValues.put(DataColumns.NOTE_ID, noteId);
-            Uri uri = mContentResolver.insert(Notes.CONTENT_DATA_URI, mDiffDataValues);
-            try {
-                mDataId = Long.valueOf(uri.getPathSegments().get(1));
-            } catch (NumberFormatException e) {
-                Log.e(TAG, "Get note id error :" + e.toString());
-                throw new ActionFailureException("create note failed");
-            }
-        } else {
-            if (mDiffDataValues.size() > 0) {
-                int result = 0;
-                if (!validateVersion) {
-                    result = mContentResolver.update(ContentUris.withAppendedId(
-                            Notes.CONTENT_DATA_URI, mDataId), mDiffDataValues, null, null);
-                } else {
-                    result = mContentResolver.update(ContentUris.withAppendedId(
-                            Notes.CONTENT_DATA_URI, mDataId), mDiffDataValues,
-                            " ? in (SELECT " + NoteColumns.ID + " FROM " + TABLE.NOTE
-                                    + " WHERE " + NoteColumns.VERSION + "=?)", new String[] {
-                                    String.valueOf(noteId), String.valueOf(version)
-                            });
-                }
-                if (result == 0) {
-                    Log.w(TAG, "there is no update. maybe user updates note when syncing");
-                }
-            }
-        }
-
-        mDiffDataValues.clear();
-        mIsCreate = false;
-    }
-
-    public long getId() {
-        return mDataId;
-    }
-}

src/Notes1/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java.orig

@@ -1,505 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.micode.notes.gtask.data;
-
-import android.appwidget.AppWidgetManager;
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.net.Uri;
-import android.util.Log;
-
-import net.micode.notes.data.Notes;
-import net.micode.notes.data.Notes.DataColumns;
-import net.micode.notes.data.Notes.NoteColumns;
-import net.micode.notes.gtask.exception.ActionFailureException;
-import net.micode.notes.tool.GTaskStringUtils;
-import net.micode.notes.tool.ResourceParser;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.ArrayList;
-
-
-public class SqlNote {
-    private static final String TAG = SqlNote.class.getSimpleName();
-
-    private static final int INVALID_ID = -99999;
-
-    public static final String[] PROJECTION_NOTE = new String[] {
-            NoteColumns.ID, NoteColumns.ALERTED_DATE, NoteColumns.BG_COLOR_ID,
-            NoteColumns.CREATED_DATE, NoteColumns.HAS_ATTACHMENT, NoteColumns.MODIFIED_DATE,
-            NoteColumns.NOTES_COUNT, NoteColumns.PARENT_ID, NoteColumns.SNIPPET, NoteColumns.TYPE,
-            NoteColumns.WIDGET_ID, NoteColumns.WIDGET_TYPE, NoteColumns.SYNC_ID,
-            NoteColumns.LOCAL_MODIFIED, NoteColumns.ORIGIN_PARENT_ID, NoteColumns.GTASK_ID,
-            NoteColumns.VERSION
-    };
-
-    public static final int ID_COLUMN = 0;
-
-    public static final int ALERTED_DATE_COLUMN = 1;
-
-    public static final int BG_COLOR_ID_COLUMN = 2;
-
-    public static final int CREATED_DATE_COLUMN = 3;
-
-    public static final int HAS_ATTACHMENT_COLUMN = 4;
-
-    public static final int MODIFIED_DATE_COLUMN = 5;
-
-    public static final int NOTES_COUNT_COLUMN = 6;
-
-    public static final int PARENT_ID_COLUMN = 7;
-
-    public static final int SNIPPET_COLUMN = 8;
-
-    public static final int TYPE_COLUMN = 9;
-
-    public static final int WIDGET_ID_COLUMN = 10;
-
-    public static final int WIDGET_TYPE_COLUMN = 11;
-
-    public static final int SYNC_ID_COLUMN = 12;
-
-    public static final int LOCAL_MODIFIED_COLUMN = 13;
-
-    public static final int ORIGIN_PARENT_ID_COLUMN = 14;
-
-    public static final int GTASK_ID_COLUMN = 15;
-
-    public static final int VERSION_COLUMN = 16;
-
-    private Context mContext;
-
-    private ContentResolver mContentResolver;
-
-    private boolean mIsCreate;
-
-    private long mId;
-
-    private long mAlertDate;
-
-    private int mBgColorId;
-
-    private long mCreatedDate;
-
-    private int mHasAttachment;
-
-    private long mModifiedDate;
-
-    private long mParentId;
-
-    private String mSnippet;
-
-    private int mType;
-
-    private int mWidgetId;
-
-    private int mWidgetType;
-
-    private long mOriginParent;
-
-    private long mVersion;
-
-    private ContentValues mDiffNoteValues;
-
-    private ArrayList<SqlData> mDataList;
-
-    public SqlNote(Context context) {
-        mContext = context;
-        mContentResolver = context.getContentResolver();
-        mIsCreate = true;
-        mId = INVALID_ID;
-        mAlertDate = 0;
-        mBgColorId = ResourceParser.getDefaultBgId(context);
-        mCreatedDate = System.currentTimeMillis();
-        mHasAttachment = 0;
-        mModifiedDate = System.currentTimeMillis();
-        mParentId = 0;
-        mSnippet = "";
-        mType = Notes.TYPE_NOTE;
-        mWidgetId = AppWidgetManager.INVALID_APPWIDGET_ID;
-        mWidgetType = Notes.TYPE_WIDGET_INVALIDE;
-        mOriginParent = 0;
-        mVersion = 0;
-        mDiffNoteValues = new ContentValues();
-        mDataList = new ArrayList<SqlData>();
-    }
-
-    public SqlNote(Context context, Cursor c) {
-        mContext = context;
-        mContentResolver = context.getContentResolver();
-        mIsCreate = false;
-        loadFromCursor(c);
-        mDataList = new ArrayList<SqlData>();
-        if (mType == Notes.TYPE_NOTE)
-            loadDataContent();
-        mDiffNoteValues = new ContentValues();
-    }
-
-    public SqlNote(Context context, long id) {
-        mContext = context;
-        mContentResolver = context.getContentResolver();
-        mIsCreate = false;
-        loadFromCursor(id);
-        mDataList = new ArrayList<SqlData>();
-        if (mType == Notes.TYPE_NOTE)
-            loadDataContent();
-        mDiffNoteValues = new ContentValues();
-
-    }
-
-    private void loadFromCursor(long id) {
-        Cursor c = null;
-        try {
-            c = mContentResolver.query(Notes.CONTENT_NOTE_URI, PROJECTION_NOTE, "(_id=?)",
-                    new String[] {
-                        String.valueOf(id)
-                    }, null);
-            if (c != null) {
-                c.moveToNext();
-                loadFromCursor(c);
-            } else {
-                Log.w(TAG, "loadFromCursor: cursor = null");
-            }
-        } finally {
-            if (c != null)
-                c.close();
-        }
-    }
-
-    private void loadFromCursor(Cursor c) {
-        mId = c.getLong(ID_COLUMN);
-        mAlertDate = c.getLong(ALERTED_DATE_COLUMN);
-        mBgColorId = c.getInt(BG_COLOR_ID_COLUMN);
-        mCreatedDate = c.getLong(CREATED_DATE_COLUMN);
-        mHasAttachment = c.getInt(HAS_ATTACHMENT_COLUMN);
-        mModifiedDate = c.getLong(MODIFIED_DATE_COLUMN);
-        mParentId = c.getLong(PARENT_ID_COLUMN);
-        mSnippet = c.getString(SNIPPET_COLUMN);
-        mType = c.getInt(TYPE_COLUMN);
-        mWidgetId = c.getInt(WIDGET_ID_COLUMN);
-        mWidgetType = c.getInt(WIDGET_TYPE_COLUMN);
-        mVersion = c.getLong(VERSION_COLUMN);
-    }
-
-    private void loadDataContent() {
-        Cursor c = null;
-        mDataList.clear();
-        try {
-            c = mContentResolver.query(Notes.CONTENT_DATA_URI, SqlData.PROJECTION_DATA,
-                    "(note_id=?)", new String[] {
-                        String.valueOf(mId)
-                    }, null);
-            if (c != null) {
-                if (c.getCount() == 0) {
-                    Log.w(TAG, "it seems that the note has not data");
-                    return;
-                }
-                while (c.moveToNext()) {
-                    SqlData data = new SqlData(mContext, c);
-                    mDataList.add(data);
-                }
-            } else {
-                Log.w(TAG, "loadDataContent: cursor = null");
-            }
-        } finally {
-            if (c != null)
-                c.close();
-        }
-    }
-
-    public boolean setContent(JSONObject js) {
-        try {
-            JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
-            if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_SYSTEM) {
-                Log.w(TAG, "cannot set system folder");
-            } else if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_FOLDER) {
-                // for folder we can only update the snnipet and type
-                String snippet = note.has(NoteColumns.SNIPPET) ? note
-                        .getString(NoteColumns.SNIPPET) : "";
-                if (mIsCreate || !mSnippet.equals(snippet)) {
-                    mDiffNoteValues.put(NoteColumns.SNIPPET, snippet);
-                }
-                mSnippet = snippet;
-
-                int type = note.has(NoteColumns.TYPE) ? note.getInt(NoteColumns.TYPE)
-                        : Notes.TYPE_NOTE;
-                if (mIsCreate || mType != type) {
-                    mDiffNoteValues.put(NoteColumns.TYPE, type);
-                }
-                mType = type;
-            } else if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_NOTE) {
-                JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA);
-                long id = note.has(NoteColumns.ID) ? note.getLong(NoteColumns.ID) : INVALID_ID;
-                if (mIsCreate || mId != id) {
-                    mDiffNoteValues.put(NoteColumns.ID, id);
-                }
-                mId = id;
-
-                long alertDate = note.has(NoteColumns.ALERTED_DATE) ? note
-                        .getLong(NoteColumns.ALERTED_DATE) : 0;
-                if (mIsCreate || mAlertDate != alertDate) {
-                    mDiffNoteValues.put(NoteColumns.ALERTED_DATE, alertDate);
-                }
-                mAlertDate = alertDate;
-
-                int bgColorId = note.has(NoteColumns.BG_COLOR_ID) ? note
-                        .getInt(NoteColumns.BG_COLOR_ID) : ResourceParser.getDefaultBgId(mContext);
-                if (mIsCreate || mBgColorId != bgColorId) {
-                    mDiffNoteValues.put(NoteColumns.BG_COLOR_ID, bgColorId);
-                }
-                mBgColorId = bgColorId;
-
-                long createDate = note.has(NoteColumns.CREATED_DATE) ? note
-                        .getLong(NoteColumns.CREATED_DATE) : System.currentTimeMillis();
-                if (mIsCreate || mCreatedDate != createDate) {
-                    mDiffNoteValues.put(NoteColumns.CREATED_DATE, createDate);
-                }
-                mCreatedDate = createDate;
-
-                int hasAttachment = note.has(NoteColumns.HAS_ATTACHMENT) ? note
-                        .getInt(NoteColumns.HAS_ATTACHMENT) : 0;
-                if (mIsCreate || mHasAttachment != hasAttachment) {
-                    mDiffNoteValues.put(NoteColumns.HAS_ATTACHMENT, hasAttachment);
-                }
-                mHasAttachment = hasAttachment;
-
-                long modifiedDate = note.has(NoteColumns.MODIFIED_DATE) ? note
-                        .getLong(NoteColumns.MODIFIED_DATE) : System.currentTimeMillis();
-                if (mIsCreate || mModifiedDate != modifiedDate) {
-                    mDiffNoteValues.put(NoteColumns.MODIFIED_DATE, modifiedDate);
-                }
-                mModifiedDate = modifiedDate;
-
-                long parentId = note.has(NoteColumns.PARENT_ID) ? note
-                        .getLong(NoteColumns.PARENT_ID) : 0;
-                if (mIsCreate || mParentId != parentId) {
-                    mDiffNoteValues.put(NoteColumns.PARENT_ID, parentId);
-                }
-                mParentId = parentId;
-
-                String snippet = note.has(NoteColumns.SNIPPET) ? note
-                        .getString(NoteColumns.SNIPPET) : "";
-                if (mIsCreate || !mSnippet.equals(snippet)) {
-                    mDiffNoteValues.put(NoteColumns.SNIPPET, snippet);
-                }
-                mSnippet = snippet;
-
-                int type = note.has(NoteColumns.TYPE) ? note.getInt(NoteColumns.TYPE)
-                        : Notes.TYPE_NOTE;
-                if (mIsCreate || mType != type) {
-                    mDiffNoteValues.put(NoteColumns.TYPE, type);
-                }
-                mType = type;
-
-                int widgetId = note.has(NoteColumns.WIDGET_ID) ? note.getInt(NoteColumns.WIDGET_ID)
-                        : AppWidgetManager.INVALID_APPWIDGET_ID;
-                if (mIsCreate || mWidgetId != widgetId) {
-                    mDiffNoteValues.put(NoteColumns.WIDGET_ID, widgetId);
-                }
-                mWidgetId = widgetId;
-
-                int widgetType = note.has(NoteColumns.WIDGET_TYPE) ? note
-                        .getInt(NoteColumns.WIDGET_TYPE) : Notes.TYPE_WIDGET_INVALIDE;
-                if (mIsCreate || mWidgetType != widgetType) {
-                    mDiffNoteValues.put(NoteColumns.WIDGET_TYPE, widgetType);
-                }
-                mWidgetType = widgetType;
-
-                long originParent = note.has(NoteColumns.ORIGIN_PARENT_ID) ? note
-                        .getLong(NoteColumns.ORIGIN_PARENT_ID) : 0;
-                if (mIsCreate || mOriginParent != originParent) {
-                    mDiffNoteValues.put(NoteColumns.ORIGIN_PARENT_ID, originParent);
-                }
-                mOriginParent = originParent;
-
-                for (int i = 0; i < dataArray.length(); i++) {
-                    JSONObject data = dataArray.getJSONObject(i);
-                    SqlData sqlData = null;
-                    if (data.has(DataColumns.ID)) {
-                        long dataId = data.getLong(DataColumns.ID);
-                        for (SqlData temp : mDataList) {
-                            if (dataId == temp.getId()) {
-                                sqlData = temp;
-                            }
-                        }
-                    }
-
-                    if (sqlData == null) {
-                        sqlData = new SqlData(mContext);
-                        mDataList.add(sqlData);
-                    }
-
-                    sqlData.setContent(data);
-                }
-            }
-        } catch (JSONException e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-            return false;
-        }
-        return true;
-    }
-
-    public JSONObject getContent() {
-        try {
-            JSONObject js = new JSONObject();
-
-            if (mIsCreate) {
-                Log.e(TAG, "it seems that we haven't created this in database yet");
-                return null;
-            }
-
-            JSONObject note = new JSONObject();
-            if (mType == Notes.TYPE_NOTE) {
-                note.put(NoteColumns.ID, mId);
-                note.put(NoteColumns.ALERTED_DATE, mAlertDate);
-                note.put(NoteColumns.BG_COLOR_ID, mBgColorId);
-                note.put(NoteColumns.CREATED_DATE, mCreatedDate);
-                note.put(NoteColumns.HAS_ATTACHMENT, mHasAttachment);
-                note.put(NoteColumns.MODIFIED_DATE, mModifiedDate);
-                note.put(NoteColumns.PARENT_ID, mParentId);
-                note.put(NoteColumns.SNIPPET, mSnippet);
-                note.put(NoteColumns.TYPE, mType);
-                note.put(NoteColumns.WIDGET_ID, mWidgetId);
-                note.put(NoteColumns.WIDGET_TYPE, mWidgetType);
-                note.put(NoteColumns.ORIGIN_PARENT_ID, mOriginParent);
-                js.put(GTaskStringUtils.META_HEAD_NOTE, note);
-
-                JSONArray dataArray = new JSONArray();
-                for (SqlData sqlData : mDataList) {
-                    JSONObject data = sqlData.getContent();
-                    if (data != null) {
-                        dataArray.put(data);
-                    }
-                }
-                js.put(GTaskStringUtils.META_HEAD_DATA, dataArray);
-            } else if (mType == Notes.TYPE_FOLDER || mType == Notes.TYPE_SYSTEM) {
-                note.put(NoteColumns.ID, mId);
-                note.put(NoteColumns.TYPE, mType);
-                note.put(NoteColumns.SNIPPET, mSnippet);
-                js.put(GTaskStringUtils.META_HEAD_NOTE, note);
-            }
-
-            return js;
-        } catch (JSONException e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    public void setParentId(long id) {
-        mParentId = id;
-        mDiffNoteValues.put(NoteColumns.PARENT_ID, id);
-    }
-
-    public void setGtaskId(String gid) {
-        mDiffNoteValues.put(NoteColumns.GTASK_ID, gid);
-    }
-
-    public void setSyncId(long syncId) {
-        mDiffNoteValues.put(NoteColumns.SYNC_ID, syncId);
-    }
-
-    public void resetLocalModified() {
-        mDiffNoteValues.put(NoteColumns.LOCAL_MODIFIED, 0);
-    }
-
-    public long getId() {
-        return mId;
-    }
-
-    public long getParentId() {
-        return mParentId;
-    }
-
-    public String getSnippet() {
-        return mSnippet;
-    }
-
-    public boolean isNoteType() {
-        return mType == Notes.TYPE_NOTE;
-    }
-
-    public void commit(boolean validateVersion) {
-        if (mIsCreate) {
-            if (mId == INVALID_ID && mDiffNoteValues.containsKey(NoteColumns.ID)) {
-                mDiffNoteValues.remove(NoteColumns.ID);
-            }
-
-            Uri uri = mContentResolver.insert(Notes.CONTENT_NOTE_URI, mDiffNoteValues);
-            try {
-                mId = Long.valueOf(uri.getPathSegments().get(1));
-            } catch (NumberFormatException e) {
-                Log.e(TAG, "Get note id error :" + e.toString());
-                throw new ActionFailureException("create note failed");
-            }
-            if (mId == 0) {
-                throw new IllegalStateException("Create thread id failed");
-            }
-
-            if (mType == Notes.TYPE_NOTE) {
-                for (SqlData sqlData : mDataList) {
-                    sqlData.commit(mId, false, -1);
-                }
-            }
-        } else {
-            if (mId <= 0 && mId != Notes.ID_ROOT_FOLDER && mId != Notes.ID_CALL_RECORD_FOLDER) {
-                Log.e(TAG, "No such note");
-                throw new IllegalStateException("Try to update note with invalid id");
-            }
-            if (mDiffNoteValues.size() > 0) {
-                mVersion ++;
-                int result = 0;
-                if (!validateVersion) {
-                    result = mContentResolver.update(Notes.CONTENT_NOTE_URI, mDiffNoteValues, "("
-                            + NoteColumns.ID + "=?)", new String[] {
-                        String.valueOf(mId)
-                    });
-                } else {
-                    result = mContentResolver.update(Notes.CONTENT_NOTE_URI, mDiffNoteValues, "("
-                            + NoteColumns.ID + "=?) AND (" + NoteColumns.VERSION + "<=?)",
-                            new String[] {
-                                    String.valueOf(mId), String.valueOf(mVersion)
-                            });
-                }
-                if (result == 0) {
-                    Log.w(TAG, "there is no update. maybe user updates note when syncing");
-                }
-            }
-
-            if (mType == Notes.TYPE_NOTE) {
-                for (SqlData sqlData : mDataList) {
-                    sqlData.commit(mId, validateVersion, mVersion);
-                }
-            }
-        }
-
-        // refresh local info
-        loadFromCursor(mId);
-        if (mType == Notes.TYPE_NOTE)
-            loadDataContent();
-
-        mDiffNoteValues.clear();
-        mIsCreate = false;
-    }
-}

src/Notes1/app/src/main/java/net/micode/notes/gtask/data/Task.java.orig

@@ -1,376 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.micode.notes.gtask.data;
-
-import android.database.Cursor;
-import android.text.TextUtils;
-import android.util.Log;
-
-import net.micode.notes.data.Notes;
-import net.micode.notes.data.Notes.DataColumns;
-import net.micode.notes.data.Notes.DataConstants;
-import net.micode.notes.data.Notes.NoteColumns;
-import net.micode.notes.gtask.exception.ActionFailureException;
-import net.micode.notes.tool.GTaskStringUtils;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-
-public class Task extends Node {
-    private static final String TAG = Task.class.getSimpleName();
-
-    private boolean mCompleted;
-
-    private String mNotes;
-
-    private JSONObject mMetaInfo;
-
-    private Task mPriorSibling;
-
-    private TaskList mParent;
-
-    public Task() {
-        super();
-        mCompleted = false;
-        mNotes = null;
-        mPriorSibling = null;
-        mParent = null;
-        mMetaInfo = null;
-    }
-
-    public JSONObject getCreateAction(int actionId) {
-        JSONObject js = new JSONObject();
-
-        try {
-            // action_type
-            js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE,
-                    GTaskStringUtils.GTASK_JSON_ACTION_TYPE_CREATE);
-
-            // action_id
-            js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId);
-
-            // index
-            js.put(GTaskStringUtils.GTASK_JSON_INDEX, mParent.getChildTaskIndex(this));
-
-            // entity_delta
-            JSONObject entity = new JSONObject();
-            entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName());
-            entity.put(GTaskStringUtils.GTASK_JSON_CREATOR_ID, "null");
-            entity.put(GTaskStringUtils.GTASK_JSON_ENTITY_TYPE,
-                    GTaskStringUtils.GTASK_JSON_TYPE_TASK);
-            if (getNotes() != null) {
-                entity.put(GTaskStringUtils.GTASK_JSON_NOTES, getNotes());
-            }
-            js.put(GTaskStringUtils.GTASK_JSON_ENTITY_DELTA, entity);
-
-            // parent_id
-            js.put(GTaskStringUtils.GTASK_JSON_PARENT_ID, mParent.getGid());
-
-            // dest_parent_type
-            js.put(GTaskStringUtils.GTASK_JSON_DEST_PARENT_TYPE,
-                    GTaskStringUtils.GTASK_JSON_TYPE_GROUP);
-
-            // list_id
-            js.put(GTaskStringUtils.GTASK_JSON_LIST_ID, mParent.getGid());
-
-            // prior_sibling_id
-            if (mPriorSibling != null) {
-                js.put(GTaskStringUtils.GTASK_JSON_PRIOR_SIBLING_ID, mPriorSibling.getGid());
-            }
-
-        } catch (JSONException e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-            throw new ActionFailureException("fail to generate task-create jsonobject");
-        }
-
-        return js;
-    }
-
-    public JSONObject getUpdateAction(int actionId) {
-        JSONObject js = new JSONObject();
-
-        try {
-            // action_type
-            js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE,
-                    GTaskStringUtils.GTASK_JSON_ACTION_TYPE_UPDATE);
-
-            // action_id
-            js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId);
-
-            // id
-            js.put(GTaskStringUtils.GTASK_JSON_ID, getGid());
-
-            // entity_delta
-            JSONObject entity = new JSONObject();
-            entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName());
-            if (getNotes() != null) {
-                entity.put(GTaskStringUtils.GTASK_JSON_NOTES, getNotes());
-            }
-            entity.put(GTaskStringUtils.GTASK_JSON_DELETED, getDeleted());
-            js.put(GTaskStringUtils.GTASK_JSON_ENTITY_DELTA, entity);
-
-        } catch (JSONException e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-            throw new ActionFailureException("fail to generate task-update jsonobject");
-        }
-
-        return js;
-    }
-
-    public void setContentByRemoteJSON(JSONObject js) {
-        if (js != null) {
-            try {
-                // id
-                if (js.has(GTaskStringUtils.GTASK_JSON_ID)) {
-                    setGid(js.getString(GTaskStringUtils.GTASK_JSON_ID));
-                }
-
-                // last_modified
-                if (js.has(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED)) {
-                    setLastModified(js.getLong(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED));
-                }
-
-                // name
-                if (js.has(GTaskStringUtils.GTASK_JSON_NAME)) {
-                    setName(js.getString(GTaskStringUtils.GTASK_JSON_NAME));
-                }
-
-                // notes
-                if (js.has(GTaskStringUtils.GTASK_JSON_NOTES)) {
-                    setNotes(js.getString(GTaskStringUtils.GTASK_JSON_NOTES));
-                }
-
-                // deleted
-                if (js.has(GTaskStringUtils.GTASK_JSON_DELETED)) {
-                    setDeleted(js.getBoolean(GTaskStringUtils.GTASK_JSON_DELETED));
-                }
-
-                // completed
-                if (js.has(GTaskStringUtils.GTASK_JSON_COMPLETED)) {
-                    setCompleted(js.getBoolean(GTaskStringUtils.GTASK_JSON_COMPLETED));
-                }
-            } catch (JSONException e) {
-                Log.e(TAG, e.toString());
-                e.printStackTrace();
-                throw new ActionFailureException("fail to get task content from jsonobject");
-            }
-        }
-    }
-
-    public void setContentByLocalJSON(JSONObject js) {
-        if (js == null || !js.has(GTaskStringUtils.META_HEAD_NOTE)
-                || !js.has(GTaskStringUtils.META_HEAD_DATA)) {
-            Log.w(TAG, "setContentByLocalJSON: nothing is avaiable");
-        }
-<<<<<<< HEAD
-
-        try {
-            JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
-            JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA);
-
-            if (note.getInt(NoteColumns.TYPE) != Notes.TYPE_NOTE) {
-                Log.e(TAG, "invalid type");
-                return;
-            }
-
-            for (int i = 0; i < dataArray.length(); i++) {
-                JSONObject data = dataArray.getJSONObject(i);
-                if (TextUtils.equals(data.getString(DataColumns.MIME_TYPE), DataConstants.NOTE)) {
-                    setName(data.getString(DataColumns.CONTENT));
-                    break;
-                }
-            }
-
-        } catch (JSONException e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-=======
-        if (js != null) {
-            try {
-                JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
-                JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA);
-
-                if (note.getInt(NoteColumns.TYPE) != Notes.TYPE_NOTE) {
-                    Log.e(TAG, "invalid type");
-                    return;
-                }
-
-                for (int i = 0; i < dataArray.length(); i++) {
-                    JSONObject data = dataArray.getJSONObject(i);
-                    if (TextUtils.equals(data.getString(DataColumns.MIME_TYPE), DataConstants.NOTE)) {
-                        setName(data.getString(DataColumns.CONTENT));
-                        break;
-                    }
-                }
-
-            } catch (JSONException e) {
-                Log.e(TAG, e.toString());
-                e.printStackTrace();
-            }
->>>>>>> origin/ChiYanZhen_branch
-        }
-    }
-
-    public JSONObject getLocalJSONFromContent() {
-        String name = getName();
-        try {
-            if (mMetaInfo == null) {
-                // new task created from web
-                if (name == null) {
-                    Log.w(TAG, "the note seems to be an empty one");
-                    return null;
-                }
-
-                JSONObject js = new JSONObject();
-                JSONObject note = new JSONObject();
-                JSONArray dataArray = new JSONArray();
-                JSONObject data = new JSONObject();
-                data.put(DataColumns.CONTENT, name);
-                dataArray.put(data);
-                js.put(GTaskStringUtils.META_HEAD_DATA, dataArray);
-                note.put(NoteColumns.TYPE, Notes.TYPE_NOTE);
-                js.put(GTaskStringUtils.META_HEAD_NOTE, note);
-                return js;
-            } else {
-                // synced task
-                JSONObject note = mMetaInfo.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
-                JSONArray dataArray = mMetaInfo.getJSONArray(GTaskStringUtils.META_HEAD_DATA);
-
-                for (int i = 0; i < dataArray.length(); i++) {
-                    JSONObject data = dataArray.getJSONObject(i);
-                    if (TextUtils.equals(data.getString(DataColumns.MIME_TYPE), DataConstants.NOTE)) {
-                        data.put(DataColumns.CONTENT, getName());
-                        break;
-                    }
-                }
-
-                note.put(NoteColumns.TYPE, Notes.TYPE_NOTE);
-                return mMetaInfo;
-            }
-        } catch (JSONException e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    public void setMetaInfo(MetaData metaData) {
-        if (metaData != null && metaData.getNotes() != null) {
-            try {
-                mMetaInfo = new JSONObject(metaData.getNotes());
-            } catch (JSONException e) {
-                Log.w(TAG, e.toString());
-                mMetaInfo = null;
-            }
-        }
-    }
-
-    public int getSyncAction(Cursor c) {
-        try {
-            JSONObject noteInfo = null;
-            if (mMetaInfo != null && mMetaInfo.has(GTaskStringUtils.META_HEAD_NOTE)) {
-                noteInfo = mMetaInfo.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
-            }
-
-            if (noteInfo == null) {
-                Log.w(TAG, "it seems that note meta has been deleted");
-                return SYNC_ACTION_UPDATE_REMOTE;
-            }
-
-            if (!noteInfo.has(NoteColumns.ID)) {
-                Log.w(TAG, "remote note id seems to be deleted");
-                return SYNC_ACTION_UPDATE_LOCAL;
-            }
-
-            // validate the note id now
-            if (c.getLong(SqlNote.ID_COLUMN) != noteInfo.getLong(NoteColumns.ID)) {
-                Log.w(TAG, "note id doesn't match");
-                return SYNC_ACTION_UPDATE_LOCAL;
-            }
-
-            if (c.getInt(SqlNote.LOCAL_MODIFIED_COLUMN) == 0) {
-                // there is no local update
-                if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) {
-                    // no update both side
-                    return SYNC_ACTION_NONE;
-                } else {
-                    // apply remote to local
-                    return SYNC_ACTION_UPDATE_LOCAL;
-                }
-            } else {
-                // validate gtask id
-                if (!c.getString(SqlNote.GTASK_ID_COLUMN).equals(getGid())) {
-                    Log.e(TAG, "gtask id doesn't match");
-                    return SYNC_ACTION_ERROR;
-                }
-                if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) {
-                    // local modification only
-                    return SYNC_ACTION_UPDATE_REMOTE;
-                } else {
-                    return SYNC_ACTION_UPDATE_CONFLICT;
-                }
-            }
-        } catch (Exception e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-        }
-
-        return SYNC_ACTION_ERROR;
-    }
-
-    public boolean isWorthSaving() {
-        return mMetaInfo != null || (getName() != null && getName().trim().length() > 0)
-                || (getNotes() != null && getNotes().trim().length() > 0);
-    }
-
-    public void setCompleted(boolean completed) {
-        this.mCompleted = completed;
-    }
-
-    public void setNotes(String notes) {
-        this.mNotes = notes;
-    }
-
-    public void setPriorSibling(Task priorSibling) {
-        this.mPriorSibling = priorSibling;
-    }
-
-    public void setParent(TaskList parent) {
-        this.mParent = parent;
-    }
-
-    public boolean getCompleted() {
-        return this.mCompleted;
-    }
-
-    public String getNotes() {
-        return this.mNotes;
-    }
-
-    public Task getPriorSibling() {
-        return this.mPriorSibling;
-    }
-
-    public TaskList getParent() {
-        return this.mParent;
-    }
-
-}

src/Notes1/app/src/main/java/net/micode/notes/gtask/data/TaskList.java.orig

@@ -1,375 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.micode.notes.gtask.data;
-
-import android.database.Cursor;
-import android.util.Log;
-
-import net.micode.notes.data.Notes;
-import net.micode.notes.data.Notes.NoteColumns;
-import net.micode.notes.gtask.exception.ActionFailureException;
-import net.micode.notes.tool.GTaskStringUtils;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.ArrayList;
-
-
-public class TaskList extends Node {
-    private static final String TAG = TaskList.class.getSimpleName();
-
-    private int mIndex;
-
-    private ArrayList<Task> mChildren;
-
-    public TaskList() {
-        super();
-        mChildren = new ArrayList<Task>();
-        mIndex = 1;
-    }
-
-    public JSONObject getCreateAction(int actionId) {
-        JSONObject js = new JSONObject();
-
-        try {
-            // action_type
-            js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE,
-                    GTaskStringUtils.GTASK_JSON_ACTION_TYPE_CREATE);
-
-            // action_id
-            js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId);
-
-            // index
-            js.put(GTaskStringUtils.GTASK_JSON_INDEX, mIndex);
-
-            // entity_delta
-            JSONObject entity = new JSONObject();
-            entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName());
-            entity.put(GTaskStringUtils.GTASK_JSON_CREATOR_ID, "null");
-            entity.put(GTaskStringUtils.GTASK_JSON_ENTITY_TYPE,
-                    GTaskStringUtils.GTASK_JSON_TYPE_GROUP);
-            js.put(GTaskStringUtils.GTASK_JSON_ENTITY_DELTA, entity);
-
-        } catch (JSONException e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-            throw new ActionFailureException("fail to generate tasklist-create jsonobject");
-        }
-
-        return js;
-    }
-
-    public JSONObject getUpdateAction(int actionId) {
-        JSONObject js = new JSONObject();
-
-        try {
-            // action_type
-            js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE,
-                    GTaskStringUtils.GTASK_JSON_ACTION_TYPE_UPDATE);
-
-            // action_id
-            js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId);
-
-            // id
-            js.put(GTaskStringUtils.GTASK_JSON_ID, getGid());
-
-            // entity_delta
-            JSONObject entity = new JSONObject();
-            entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName());
-            entity.put(GTaskStringUtils.GTASK_JSON_DELETED, getDeleted());
-            js.put(GTaskStringUtils.GTASK_JSON_ENTITY_DELTA, entity);
-
-        } catch (JSONException e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-            throw new ActionFailureException("fail to generate tasklist-update jsonobject");
-        }
-
-        return js;
-    }
-
-    public void setContentByRemoteJSON(JSONObject js) {
-        if (js != null) {
-            try {
-                // id
-                if (js.has(GTaskStringUtils.GTASK_JSON_ID)) {
-                    setGid(js.getString(GTaskStringUtils.GTASK_JSON_ID));
-                }
-
-                // last_modified
-                if (js.has(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED)) {
-                    setLastModified(js.getLong(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED));
-                }
-
-                // name
-                if (js.has(GTaskStringUtils.GTASK_JSON_NAME)) {
-                    setName(js.getString(GTaskStringUtils.GTASK_JSON_NAME));
-                }
-
-            } catch (JSONException e) {
-                Log.e(TAG, e.toString());
-                e.printStackTrace();
-                throw new ActionFailureException("fail to get tasklist content from jsonobject");
-            }
-        }
-    }
-
-    public void setContentByLocalJSON(JSONObject js) {
-        if (js == null || !js.has(GTaskStringUtils.META_HEAD_NOTE)) {
-            Log.w(TAG, "setContentByLocalJSON: nothing is avaiable");
-        }
-<<<<<<< HEAD
-
-        try {
-            JSONObject folder = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
-
-            if (folder.getInt(NoteColumns.TYPE) == Notes.TYPE_FOLDER) {
-                String name = folder.getString(NoteColumns.SNIPPET);
-                setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + name);
-            } else if (folder.getInt(NoteColumns.TYPE) == Notes.TYPE_SYSTEM) {
-                if (folder.getLong(NoteColumns.ID) == Notes.ID_ROOT_FOLDER)
-                    setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_DEFAULT);
-                else if (folder.getLong(NoteColumns.ID) == Notes.ID_CALL_RECORD_FOLDER)
-                    setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX
-                            + GTaskStringUtils.FOLDER_CALL_NOTE);
-                else
-                    Log.e(TAG, "invalid system folder");
-            } else {
-                Log.e(TAG, "error type");
-            }
-        } catch (JSONException e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-        }
-    }
-
-=======
-        if (js != null) {
-            try {
-                JSONObject folder = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
-
-                if (folder.getInt(NoteColumns.TYPE) == Notes.TYPE_FOLDER) {
-                    String name = folder.getString(NoteColumns.SNIPPET);
-                    setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + name);
-                } else if (folder.getInt(NoteColumns.TYPE) == Notes.TYPE_SYSTEM) {
-                    if (folder.getLong(NoteColumns.ID) == Notes.ID_ROOT_FOLDER)
-                        setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_DEFAULT);
-                    else if (folder.getLong(NoteColumns.ID) == Notes.ID_CALL_RECORD_FOLDER)
-                        setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX
-                                + GTaskStringUtils.FOLDER_CALL_NOTE);
-                    else
-                        Log.e(TAG, "invalid system folder");
-                } else {
-                    Log.e(TAG, "error type");
-                }
-            } catch (JSONException e) {
-                Log.e(TAG, e.toString());
-                e.printStackTrace();
-            }
-        }
-
-    }
->>>>>>> origin/ChiYanZhen_branch
-    public JSONObject getLocalJSONFromContent() {
-        try {
-            JSONObject js = new JSONObject();
-            JSONObject folder = new JSONObject();
-
-            String folderName = getName();
-            if (getName().startsWith(GTaskStringUtils.MIUI_FOLDER_PREFFIX))
-                folderName = folderName.substring(GTaskStringUtils.MIUI_FOLDER_PREFFIX.length(),
-                        folderName.length());
-            folder.put(NoteColumns.SNIPPET, folderName);
-            if (folderName.equals(GTaskStringUtils.FOLDER_DEFAULT)
-                    || folderName.equals(GTaskStringUtils.FOLDER_CALL_NOTE))
-                folder.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
-            else
-                folder.put(NoteColumns.TYPE, Notes.TYPE_FOLDER);
-
-            js.put(GTaskStringUtils.META_HEAD_NOTE, folder);
-
-            return js;
-        } catch (JSONException e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    public int getSyncAction(Cursor c) {
-        try {
-            if (c.getInt(SqlNote.LOCAL_MODIFIED_COLUMN) == 0) {
-                // there is no local update
-                if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) {
-                    // no update both side
-                    return SYNC_ACTION_NONE;
-                } else {
-                    // apply remote to local
-                    return SYNC_ACTION_UPDATE_LOCAL;
-                }
-            } else {
-                // validate gtask id
-                if (!c.getString(SqlNote.GTASK_ID_COLUMN).equals(getGid())) {
-                    Log.e(TAG, "gtask id doesn't match");
-                    return SYNC_ACTION_ERROR;
-                }
-<<<<<<< HEAD
-                if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) {
-                    // local modification only
-                    return SYNC_ACTION_UPDATE_REMOTE;
-                } else {
-                    // for folder conflicts, just apply local modification
-                    return SYNC_ACTION_UPDATE_REMOTE;
-                }
-=======
-                return SYNC_ACTION_UPDATE_REMOTE;
->>>>>>> origin/ChiYanZhen_branch
-            }
-        } catch (Exception e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-        }
-
-        return SYNC_ACTION_ERROR;
-    }
-
-    public int getChildTaskCount() {
-        return mChildren.size();
-    }
-
-    public boolean addChildTask(Task task) {
-        boolean ret = false;
-        if (task != null && !mChildren.contains(task)) {
-            ret = mChildren.add(task);
-            if (ret) {
-                // need to set prior sibling and parent
-                task.setPriorSibling(mChildren.isEmpty() ? null : mChildren
-                        .get(mChildren.size() - 1));
-                task.setParent(this);
-            }
-        }
-        return ret;
-    }
-
-    public boolean addChildTask(Task task, int index) {
-        if (index < 0 || index > mChildren.size()) {
-            Log.e(TAG, "add child task: invalid index");
-            return false;
-        }
-
-        int pos = mChildren.indexOf(task);
-        if (task != null && pos == -1) {
-            mChildren.add(index, task);
-
-            // update the task list
-            Task preTask = null;
-            Task afterTask = null;
-            if (index != 0)
-                preTask = mChildren.get(index - 1);
-            if (index != mChildren.size() - 1)
-                afterTask = mChildren.get(index + 1);
-
-            task.setPriorSibling(preTask);
-            if (afterTask != null)
-                afterTask.setPriorSibling(task);
-        }
-
-        return true;
-    }
-
-    public boolean removeChildTask(Task task) {
-        boolean ret = false;
-        int index = mChildren.indexOf(task);
-        if (index != -1) {
-            ret = mChildren.remove(task);
-
-            if (ret) {
-                // reset prior sibling and parent
-                task.setPriorSibling(null);
-                task.setParent(null);
-
-                // update the task list
-                if (index != mChildren.size()) {
-                    mChildren.get(index).setPriorSibling(
-                            index == 0 ? null : mChildren.get(index - 1));
-                }
-            }
-        }
-        return ret;
-    }
-
-    public boolean moveChildTask(Task task, int index) {
-
-        if (index < 0 || index >= mChildren.size()) {
-            Log.e(TAG, "move child task: invalid index");
-            return false;
-        }
-
-        int pos = mChildren.indexOf(task);
-        if (pos == -1) {
-            Log.e(TAG, "move child task: the task should in the list");
-            return false;
-        }
-
-        if (pos == index)
-            return true;
-        return (removeChildTask(task) && addChildTask(task, index));
-    }
-
-    public Task findChildTaskByGid(String gid) {
-        for (int i = 0; i < mChildren.size(); i++) {
-            Task t = mChildren.get(i);
-            if (t.getGid().equals(gid)) {
-                return t;
-            }
-        }
-        return null;
-    }
-
-    public int getChildTaskIndex(Task task) {
-        return mChildren.indexOf(task);
-    }
-
-    public Task getChildTaskByIndex(int index) {
-        if (index < 0 || index >= mChildren.size()) {
-            Log.e(TAG, "getTaskByIndex: invalid index");
-            return null;
-        }
-        return mChildren.get(index);
-    }
-
-    public Task getChilTaskByGid(String gid) {
-        for (Task task : mChildren) {
-            if (task.getGid().equals(gid))
-                return task;
-        }
-        return null;
-    }
-
-    public ArrayList<Task> getChildTaskList() {
-        return this.mChildren;
-    }
-
-    public void setIndex(int index) {
-        this.mIndex = index;
-    }
-
-    public int getIndex() {
-        return this.mIndex;
-    }
-}

src/Notes1/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java.orig

@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.micode.notes.gtask.exception;
-
-public class ActionFailureException extends RuntimeException {
-    private static final long serialVersionUID = 4425249765923293627L;
-
-    public ActionFailureException() {
-        super();
-    }
-
-    public ActionFailureException(String paramString) {
-        super(paramString);
-    }
-
-    public ActionFailureException(String paramString, Throwable paramThrowable) {
-        super(paramString, paramThrowable);
-    }
-}

src/Notes1/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java.orig

@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.micode.notes.gtask.exception;
-
-public class NetworkFailureException extends Exception {
-    private static final long serialVersionUID = 2107610287180234136L;
-
-    public NetworkFailureException() {
-        super();
-    }
-
-    public NetworkFailureException(String paramString) {
-        super(paramString);
-    }
-
-    public NetworkFailureException(String paramString, Throwable paramThrowable) {
-        super(paramString, paramThrowable);
-    }
-}

src/Notes1/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java.orig

@@ -1,145 +0,0 @@
-
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.micode.notes.gtask.remote;
-
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-import android.os.AsyncTask;
-
-import net.micode.notes.R;
-import net.micode.notes.ui.NotesListActivity;
-import net.micode.notes.ui.NotesPreferenceActivity;
-
-
-public class GTaskASyncTask extends AsyncTask<Void, String, Integer> {
-
-    private static int GTASK_SYNC_NOTIFICATION_ID = 5234235;
-
-    public interface OnCompleteListener {
-        void onComplete();
-    }
-
-    private Context mContext;
-
-    private NotificationManager mNotifiManager;
-
-    private GTaskManager mTaskManager;
-
-    private OnCompleteListener mOnCompleteListener;
-
-    public GTaskASyncTask(Context context, OnCompleteListener listener) {
-        mContext = context;
-        mOnCompleteListener = listener;
-        mNotifiManager = (NotificationManager) mContext
-                .getSystemService(Context.NOTIFICATION_SERVICE);
-        mTaskManager = GTaskManager.getInstance();
-    }
-
-    public void cancelSync() {
-        mTaskManager.cancelSync();
-    }
-
-    public void publishProgess(String message) {
-        publishProgress(new String[] {
-            message
-        });
-    }
-
-//    private void showNotification(int tickerId, String content) {
-//        Notification notification = new Notification(R.drawable.notification, mContext
-//                .getString(tickerId), System.currentTimeMillis());
-//        notification.defaults = Notification.DEFAULT_LIGHTS;
-//        notification.flags = Notification.FLAG_AUTO_CANCEL;
-//        PendingIntent pendingIntent;
-//        if (tickerId != R.string.ticker_success) {
-//            pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
-//                    NotesPreferenceActivity.class), 0);
-//
-//        } else {
-//            pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
-//                    NotesListActivity.class), 0);
-//        }
-//        notification.setLatestEventInfo(mContext, mContext.getString(R.string.app_name), content,
-//                pendingIntent);
-//        mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification);
-//    }
-    private void showNotification(int tickerId, String content) {
-        PendingIntent pendingIntent;
-        if (tickerId != R.string.ticker_success) {
-            pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
-                    NotesPreferenceActivity.class), 0);
-
-        } else {
-            pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
-                    NotesListActivity.class), 0);
-        }
-
-
-        Notification.Builder builder = new Notification.Builder(mContext)
-                .setAutoCancel(true)
-                .setContentTitle(mContext.getString(R.string.app_name))
-                .setContentText(content)
-                .setContentIntent(pendingIntent)
-                .setWhen(System.currentTimeMillis())
-                .setOngoing(true);
-        Notification notification = builder.getNotification();
-        mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification);
-    }
-
-    @Override
-    protected Integer doInBackground(Void... unused) {
-        publishProgess(mContext.getString(R.string.sync_progress_login, NotesPreferenceActivity
-                .getSyncAccountName(mContext)));
-        return mTaskManager.sync(mContext, this);
-    }
-
-    @Override
-    protected void onProgressUpdate(String... progress) {
-        showNotification(R.string.ticker_syncing, progress[0]);
-        if (mContext instanceof GTaskSyncService) {
-            ((GTaskSyncService) mContext).sendBroadcast(progress[0]);
-        }
-    }
-
-    @Override
-    protected void onPostExecute(Integer result) {
-        if (result == GTaskManager.STATE_SUCCESS) {
-            showNotification(R.string.ticker_success, mContext.getString(
-                    R.string.success_sync_account, mTaskManager.getSyncAccount()));
-            NotesPreferenceActivity.setLastSyncTime(mContext, System.currentTimeMillis());
-        } else if (result == GTaskManager.STATE_NETWORK_ERROR) {
-            showNotification(R.string.ticker_fail, mContext.getString(R.string.error_sync_network));
-        } else if (result == GTaskManager.STATE_INTERNAL_ERROR) {
-            showNotification(R.string.ticker_fail, mContext.getString(R.string.error_sync_internal));
-        } else if (result == GTaskManager.STATE_SYNC_CANCELLED) {
-            showNotification(R.string.ticker_cancel, mContext
-                    .getString(R.string.error_sync_cancelled));
-        }
-        if (mOnCompleteListener != null) {
-            new Thread(new Runnable() {
-
-                public void run() {
-                    mOnCompleteListener.onComplete();
-                }
-            }).start();
-        }
-    }
-}

src/Notes1/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java.orig

@@ -1,593 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.micode.notes.gtask.remote;
-
-import android.accounts.Account;
-import android.accounts.AccountManager;
-import android.accounts.AccountManagerFuture;
-import android.app.Activity;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.util.Log;
-
-import net.micode.notes.gtask.data.Node;
-import net.micode.notes.gtask.data.Task;
-import net.micode.notes.gtask.data.TaskList;
-import net.micode.notes.gtask.exception.ActionFailureException;
-import net.micode.notes.gtask.exception.NetworkFailureException;
-import net.micode.notes.tool.GTaskStringUtils;
-import net.micode.notes.ui.NotesPreferenceActivity;
-
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.cookie.Cookie;
-import org.apache.http.impl.client.BasicCookieStore;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.message.BasicNameValuePair;
-import org.apache.http.params.BasicHttpParams;
-import org.apache.http.params.HttpConnectionParams;
-import org.apache.http.params.HttpParams;
-import org.apache.http.params.HttpProtocolParams;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.zip.GZIPInputStream;
-import java.util.zip.Inflater;
-import java.util.zip.InflaterInputStream;
-
-
-public class GTaskClient {
-    private static final String TAG = GTaskClient.class.getSimpleName();
-
-    private static final String GTASK_URL = "https://mail.google.com/tasks/";
-
-    private static final String GTASK_GET_URL = "https://mail.google.com/tasks/ig";
-
-    private static final String GTASK_POST_URL = "https://mail.google.com/tasks/r/ig";
-
-    private static GTaskClient mInstance = null;
-
-    private DefaultHttpClient mHttpClient;
-
-    private String mGetUrl;
-
-    private String mPostUrl;
-
-    private long mClientVersion;
-
-    private boolean mLoggedin;
-
-    private long mLastLoginTime;
-
-    private int mActionId;
-
-    private Account mAccount;
-
-    private JSONArray mUpdateArray;
-
-    private GTaskClient() {
-        mHttpClient = null;
-        mGetUrl = GTASK_GET_URL;
-        mPostUrl = GTASK_POST_URL;
-        mClientVersion = -1;
-        mLoggedin = false;
-        mLastLoginTime = 0;
-        mActionId = 1;
-        mAccount = null;
-        mUpdateArray = null;
-    }
-
-    public static synchronized GTaskClient getInstance() {
-        if (mInstance == null) {
-            mInstance = new GTaskClient();
-        }
-        return mInstance;
-    }
-
-    public boolean login(Activity activity) {
-        // we suppose that the cookie would expire after 5 minutes
-        // then we need to re-login
-<<<<<<< HEAD
-        final long interval = 1000 * 60 * 5;
-=======
-        final long interval = 1000L * 60 * 5;
->>>>>>> origin/ChiYanZhen_branch
-        if (mLastLoginTime + interval < System.currentTimeMillis()) {
-            mLoggedin = false;
-        }
-
-        // need to re-login after account switch
-        if (mLoggedin
-                && !TextUtils.equals(getSyncAccount().name, NotesPreferenceActivity
-                        .getSyncAccountName(activity))) {
-            mLoggedin = false;
-        }
-
-        if (mLoggedin) {
-            Log.d(TAG, "already logged in");
-            return true;
-        }
-
-        mLastLoginTime = System.currentTimeMillis();
-        String authToken = loginGoogleAccount(activity, false);
-        if (authToken == null) {
-            Log.e(TAG, "login google account failed");
-            return false;
-        }
-
-        // login with custom domain if necessary
-        if (!(mAccount.name.toLowerCase().endsWith("gmail.com") || mAccount.name.toLowerCase()
-                .endsWith("googlemail.com"))) {
-            StringBuilder url = new StringBuilder(GTASK_URL).append("a/");
-            int index = mAccount.name.indexOf('@') + 1;
-            String suffix = mAccount.name.substring(index);
-            url.append(suffix + "/");
-            mGetUrl = url.toString() + "ig";
-            mPostUrl = url.toString() + "r/ig";
-
-            if (tryToLoginGtask(activity, authToken)) {
-                mLoggedin = true;
-            }
-        }
-
-        // try to login with google official url
-        if (!mLoggedin) {
-            mGetUrl = GTASK_GET_URL;
-            mPostUrl = GTASK_POST_URL;
-            if (!tryToLoginGtask(activity, authToken)) {
-                return false;
-            }
-        }
-
-        mLoggedin = true;
-        return true;
-    }
-
-    private String loginGoogleAccount(Activity activity, boolean invalidateToken) {
-        String authToken;
-        AccountManager accountManager = AccountManager.get(activity);
-        Account[] accounts = accountManager.getAccountsByType("com.google");
-
-        if (accounts.length == 0) {
-            Log.e(TAG, "there is no available google account");
-            return null;
-        }
-
-        String accountName = NotesPreferenceActivity.getSyncAccountName(activity);
-        Account account = null;
-        for (Account a : accounts) {
-            if (a.name.equals(accountName)) {
-                account = a;
-                break;
-            }
-        }
-        if (account != null) {
-            mAccount = account;
-        } else {
-            Log.e(TAG, "unable to get an account with the same name in the settings");
-            return null;
-        }
-
-        // get the token now
-        AccountManagerFuture<Bundle> accountManagerFuture = accountManager.getAuthToken(account,
-                "goanna_mobile", null, activity, null, null);
-        try {
-            Bundle authTokenBundle = accountManagerFuture.getResult();
-            authToken = authTokenBundle.getString(AccountManager.KEY_AUTHTOKEN);
-            if (invalidateToken) {
-                accountManager.invalidateAuthToken("com.google", authToken);
-                loginGoogleAccount(activity, false);
-            }
-        } catch (Exception e) {
-            Log.e(TAG, "get auth token failed");
-            authToken = null;
-        }
-
-        return authToken;
-    }
-
-    private boolean tryToLoginGtask(Activity activity, String authToken) {
-        if (!loginGtask(authToken)) {
-            // maybe the auth token is out of date, now let's invalidate the
-            // token and try again
-            authToken = loginGoogleAccount(activity, true);
-            if (authToken == null) {
-                Log.e(TAG, "login google account failed");
-                return false;
-            }
-
-            if (!loginGtask(authToken)) {
-                Log.e(TAG, "login gtask failed");
-                return false;
-            }
-        }
-        return true;
-    }
-
-    private boolean loginGtask(String authToken) {
-        int timeoutConnection = 10000;
-        int timeoutSocket = 15000;
-        HttpParams httpParameters = new BasicHttpParams();
-        HttpConnectionParams.setConnectionTimeout(httpParameters, timeoutConnection);
-        HttpConnectionParams.setSoTimeout(httpParameters, timeoutSocket);
-        mHttpClient = new DefaultHttpClient(httpParameters);
-        BasicCookieStore localBasicCookieStore = new BasicCookieStore();
-        mHttpClient.setCookieStore(localBasicCookieStore);
-        HttpProtocolParams.setUseExpectContinue(mHttpClient.getParams(), false);
-
-        // login gtask
-        try {
-            String loginUrl = mGetUrl + "?auth=" + authToken;
-            HttpGet httpGet = new HttpGet(loginUrl);
-            HttpResponse response = null;
-            response = mHttpClient.execute(httpGet);
-
-            // get the cookie now
-            List<Cookie> cookies = mHttpClient.getCookieStore().getCookies();
-            boolean hasAuthCookie = false;
-            for (Cookie cookie : cookies) {
-                if (cookie.getName().contains("GTL")) {
-                    hasAuthCookie = true;
-                }
-            }
-            if (!hasAuthCookie) {
-                Log.w(TAG, "it seems that there is no auth cookie");
-            }
-
-            // get the client version
-            String resString = getResponseContent(response.getEntity());
-            String jsBegin = "_setup(";
-            String jsEnd = ")}</script>";
-            int begin = resString.indexOf(jsBegin);
-            int end = resString.lastIndexOf(jsEnd);
-            String jsString = null;
-            if (begin != -1 && end != -1 && begin < end) {
-                jsString = resString.substring(begin + jsBegin.length(), end);
-            }
-            JSONObject js = new JSONObject(jsString);
-            mClientVersion = js.getLong("v");
-        } catch (JSONException e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-            return false;
-        } catch (Exception e) {
-            // simply catch all exceptions
-            Log.e(TAG, "httpget gtask_url failed");
-            return false;
-        }
-
-        return true;
-    }
-
-    private int getActionId() {
-        return mActionId++;
-    }
-
-    private HttpPost createHttpPost() {
-        HttpPost httpPost = new HttpPost(mPostUrl);
-        httpPost.setHeader("Content-Type", "application/x-www-form-urlencoded;charset=utf-8");
-        httpPost.setHeader("AT", "1");
-        return httpPost;
-    }
-
-    private String getResponseContent(HttpEntity entity) throws IOException {
-        String contentEncoding = null;
-        if (entity.getContentEncoding() != null) {
-            contentEncoding = entity.getContentEncoding().getValue();
-            Log.d(TAG, "encoding: " + contentEncoding);
-        }
-
-        InputStream input = entity.getContent();
-        if (contentEncoding != null && contentEncoding.equalsIgnoreCase("gzip")) {
-            input = new GZIPInputStream(entity.getContent());
-        } else if (contentEncoding != null && contentEncoding.equalsIgnoreCase("deflate")) {
-            Inflater inflater = new Inflater(true);
-            input = new InflaterInputStream(entity.getContent(), inflater);
-        }
-
-<<<<<<< HEAD
-        try {
-            InputStreamReader isr = new InputStreamReader(input);
-=======
-        try(InputStreamReader isr = new InputStreamReader(input)) {
->>>>>>> origin/ChiYanZhen_branch
-            BufferedReader br = new BufferedReader(isr);
-            StringBuilder sb = new StringBuilder();
-
-            while (true) {
-                String buff = br.readLine();
-                if (buff == null) {
-                    return sb.toString();
-                }
-                sb = sb.append(buff);
-            }
-        } finally {
-            input.close();
-        }
-    }
-
-    private JSONObject postRequest(JSONObject js) throws NetworkFailureException {
-        if (!mLoggedin) {
-            Log.e(TAG, "please login first");
-            throw new ActionFailureException("not logged in");
-        }
-
-        HttpPost httpPost = createHttpPost();
-        try {
-            LinkedList<BasicNameValuePair> list = new LinkedList<BasicNameValuePair>();
-            list.add(new BasicNameValuePair("r", js.toString()));
-            UrlEncodedFormEntity entity = new UrlEncodedFormEntity(list, "UTF-8");
-            httpPost.setEntity(entity);
-
-            // execute the post
-            HttpResponse response = mHttpClient.execute(httpPost);
-            String jsString = getResponseContent(response.getEntity());
-            return new JSONObject(jsString);
-
-        } catch (ClientProtocolException e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-            throw new NetworkFailureException("postRequest failed");
-        } catch (IOException e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-            throw new NetworkFailureException("postRequest failed");
-        } catch (JSONException e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-            throw new ActionFailureException("unable to convert response content to jsonobject");
-        } catch (Exception e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-            throw new ActionFailureException("error occurs when posting request");
-        }
-    }
-
-    public void createTask(Task task) throws NetworkFailureException {
-        commitUpdate();
-        try {
-            JSONObject jsPost = new JSONObject();
-            JSONArray actionList = new JSONArray();
-
-            // action_list
-            actionList.put(task.getCreateAction(getActionId()));
-            jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList);
-
-            // client_version
-            jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion);
-
-            // post
-            JSONObject jsResponse = postRequest(jsPost);
-            JSONObject jsResult = (JSONObject) jsResponse.getJSONArray(
-                    GTaskStringUtils.GTASK_JSON_RESULTS).get(0);
-            task.setGid(jsResult.getString(GTaskStringUtils.GTASK_JSON_NEW_ID));
-
-        } catch (JSONException e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-            throw new ActionFailureException("create task: handing jsonobject failed");
-        }
-    }
-
-    public void createTaskList(TaskList tasklist) throws NetworkFailureException {
-        commitUpdate();
-        try {
-            JSONObject jsPost = new JSONObject();
-            JSONArray actionList = new JSONArray();
-
-            // action_list
-            actionList.put(tasklist.getCreateAction(getActionId()));
-            jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList);
-
-            // client version
-            jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion);
-
-            // post
-            JSONObject jsResponse = postRequest(jsPost);
-            JSONObject jsResult = (JSONObject) jsResponse.getJSONArray(
-                    GTaskStringUtils.GTASK_JSON_RESULTS).get(0);
-            tasklist.setGid(jsResult.getString(GTaskStringUtils.GTASK_JSON_NEW_ID));
-
-        } catch (JSONException e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-            throw new ActionFailureException("create tasklist: handing jsonobject failed");
-        }
-    }
-
-    public void commitUpdate() throws NetworkFailureException {
-        if (mUpdateArray != null) {
-            try {
-                JSONObject jsPost = new JSONObject();
-
-                // action_list
-                jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, mUpdateArray);
-
-                // client_version
-                jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion);
-
-                postRequest(jsPost);
-                mUpdateArray = null;
-            } catch (JSONException e) {
-                Log.e(TAG, e.toString());
-                e.printStackTrace();
-                throw new ActionFailureException("commit update: handing jsonobject failed");
-            }
-        }
-    }
-
-    public void addUpdateNode(Node node) throws NetworkFailureException {
-        if (node != null) {
-            // too many update items may result in an error
-            // set max to 10 items
-            if (mUpdateArray != null && mUpdateArray.length() > 10) {
-                commitUpdate();
-            }
-
-            if (mUpdateArray == null)
-                mUpdateArray = new JSONArray();
-            mUpdateArray.put(node.getUpdateAction(getActionId()));
-        }
-    }
-
-    public void moveTask(Task task, TaskList preParent, TaskList curParent)
-            throws NetworkFailureException {
-        commitUpdate();
-        try {
-            JSONObject jsPost = new JSONObject();
-            JSONArray actionList = new JSONArray();
-            JSONObject action = new JSONObject();
-
-            // action_list
-            action.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE,
-                    GTaskStringUtils.GTASK_JSON_ACTION_TYPE_MOVE);
-            action.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, getActionId());
-            action.put(GTaskStringUtils.GTASK_JSON_ID, task.getGid());
-            if (preParent == curParent && task.getPriorSibling() != null) {
-                // put prioring_sibing_id only if moving within the tasklist and
-                // it is not the first one
-                action.put(GTaskStringUtils.GTASK_JSON_PRIOR_SIBLING_ID, task.getPriorSibling());
-            }
-            action.put(GTaskStringUtils.GTASK_JSON_SOURCE_LIST, preParent.getGid());
-            action.put(GTaskStringUtils.GTASK_JSON_DEST_PARENT, curParent.getGid());
-            if (preParent != curParent) {
-                // put the dest_list only if moving between tasklists
-                action.put(GTaskStringUtils.GTASK_JSON_DEST_LIST, curParent.getGid());
-            }
-            actionList.put(action);
-            jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList);
-
-            // client_version
-            jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion);
-
-            postRequest(jsPost);
-
-        } catch (JSONException e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-            throw new ActionFailureException("move task: handing jsonobject failed");
-        }
-    }
-
-    public void deleteNode(Node node) throws NetworkFailureException {
-        commitUpdate();
-        try {
-            JSONObject jsPost = new JSONObject();
-            JSONArray actionList = new JSONArray();
-
-            // action_list
-            node.setDeleted(true);
-            actionList.put(node.getUpdateAction(getActionId()));
-            jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList);
-
-            // client_version
-            jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion);
-
-            postRequest(jsPost);
-            mUpdateArray = null;
-        } catch (JSONException e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-            throw new ActionFailureException("delete node: handing jsonobject failed");
-        }
-    }
-
-    public JSONArray getTaskLists() throws NetworkFailureException {
-        if (!mLoggedin) {
-            Log.e(TAG, "please login first");
-            throw new ActionFailureException("not logged in");
-        }
-
-        try {
-            HttpGet httpGet = new HttpGet(mGetUrl);
-            HttpResponse response = null;
-            response = mHttpClient.execute(httpGet);
-
-            // get the task list
-            String resString = getResponseContent(response.getEntity());
-            String jsBegin = "_setup(";
-            String jsEnd = ")}</script>";
-            int begin = resString.indexOf(jsBegin);
-            int end = resString.lastIndexOf(jsEnd);
-            String jsString = null;
-            if (begin != -1 && end != -1 && begin < end) {
-                jsString = resString.substring(begin + jsBegin.length(), end);
-            }
-            JSONObject js = new JSONObject(jsString);
-            return js.getJSONObject("t").getJSONArray(GTaskStringUtils.GTASK_JSON_LISTS);
-        } catch (ClientProtocolException e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-            throw new NetworkFailureException("gettasklists: httpget failed");
-        } catch (IOException e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-            throw new NetworkFailureException("gettasklists: httpget failed");
-        } catch (JSONException e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-            throw new ActionFailureException("get task lists: handing jasonobject failed");
-        }
-    }
-
-    public JSONArray getTaskList(String listGid) throws NetworkFailureException {
-        commitUpdate();
-        try {
-            JSONObject jsPost = new JSONObject();
-            JSONArray actionList = new JSONArray();
-            JSONObject action = new JSONObject();
-
-            // action_list
-            action.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE,
-                    GTaskStringUtils.GTASK_JSON_ACTION_TYPE_GETALL);
-            action.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, getActionId());
-            action.put(GTaskStringUtils.GTASK_JSON_LIST_ID, listGid);
-            action.put(GTaskStringUtils.GTASK_JSON_GET_DELETED, false);
-            actionList.put(action);
-            jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList);
-
-            // client_version
-            jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion);
-
-            JSONObject jsResponse = postRequest(jsPost);
-            return jsResponse.getJSONArray(GTaskStringUtils.GTASK_JSON_TASKS);
-        } catch (JSONException e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-            throw new ActionFailureException("get task list: handing jsonobject failed");
-        }
-    }
-
-    public Account getSyncAccount() {
-        return mAccount;
-    }
-
-    public void resetUpdateArray() {
-        mUpdateArray = null;
-    }
-}

src/Notes1/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java.orig

@@ -1,813 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.micode.notes.gtask.remote;
-
-import android.app.Activity;
-import android.content.ContentResolver;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.util.Log;
-
-import net.micode.notes.R;
-import net.micode.notes.data.Notes;
-import net.micode.notes.data.Notes.DataColumns;
-import net.micode.notes.data.Notes.NoteColumns;
-import net.micode.notes.gtask.data.MetaData;
-import net.micode.notes.gtask.data.Node;
-import net.micode.notes.gtask.data.SqlNote;
-import net.micode.notes.gtask.data.Task;
-import net.micode.notes.gtask.data.TaskList;
-import net.micode.notes.gtask.exception.ActionFailureException;
-import net.micode.notes.gtask.exception.NetworkFailureException;
-import net.micode.notes.tool.DataUtils;
-import net.micode.notes.tool.GTaskStringUtils;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-
-
-public class GTaskManager {
-    private static final String TAG = GTaskManager.class.getSimpleName();
-
-    public static final int STATE_SUCCESS = 0;
-
-    public static final int STATE_NETWORK_ERROR = 1;
-
-    public static final int STATE_INTERNAL_ERROR = 2;
-
-    public static final int STATE_SYNC_IN_PROGRESS = 3;
-
-    public static final int STATE_SYNC_CANCELLED = 4;
-
-    private static GTaskManager mInstance = null;
-
-    private Activity mActivity;
-
-    private Context mContext;
-
-    private ContentResolver mContentResolver;
-
-    private boolean mSyncing;
-
-    private boolean mCancelled;
-
-    private HashMap<String, TaskList> mGTaskListHashMap;
-
-    private HashMap<String, Node> mGTaskHashMap;
-
-    private HashMap<String, MetaData> mMetaHashMap;
-
-    private TaskList mMetaList;
-
-    private HashSet<Long> mLocalDeleteIdMap;
-
-    private HashMap<String, Long> mGidToNid;
-
-    private HashMap<Long, String> mNidToGid;
-
-    private GTaskManager() {
-        mSyncing = false;
-        mCancelled = false;
-        mGTaskListHashMap = new HashMap<String, TaskList>();
-        mGTaskHashMap = new HashMap<String, Node>();
-        mMetaHashMap = new HashMap<String, MetaData>();
-        mMetaList = null;
-        mLocalDeleteIdMap = new HashSet<Long>();
-        mGidToNid = new HashMap<String, Long>();
-        mNidToGid = new HashMap<Long, String>();
-    }
-
-    public static synchronized GTaskManager getInstance() {
-        if (mInstance == null) {
-            mInstance = new GTaskManager();
-        }
-        return mInstance;
-    }
-
-    public synchronized void setActivityContext(Activity activity) {
-        // used for getting authtoken
-        mActivity = activity;
-    }
-
-    public int sync(Context context, GTaskASyncTask asyncTask) {
-        if (mSyncing) {
-            Log.d(TAG, "Sync is in progress");
-            return STATE_SYNC_IN_PROGRESS;
-        }
-        mContext = context;
-        mContentResolver = mContext.getContentResolver();
-        mSyncing = true;
-        mCancelled = false;
-        mGTaskListHashMap.clear();
-        mGTaskHashMap.clear();
-        mMetaHashMap.clear();
-        mLocalDeleteIdMap.clear();
-        mGidToNid.clear();
-        mNidToGid.clear();
-
-        try {
-            GTaskClient client = GTaskClient.getInstance();
-            client.resetUpdateArray();
-
-            // login google task
-            if (!mCancelled) {
-                if (!client.login(mActivity)) {
-                    throw new NetworkFailureException("login google task failed");
-                }
-            }
-
-            // get the task list from google
-            asyncTask.publishProgess(mContext.getString(R.string.sync_progress_init_list));
-            initGTaskList();
-
-            // do content sync work
-            asyncTask.publishProgess(mContext.getString(R.string.sync_progress_syncing));
-            syncContent();
-        } catch (NetworkFailureException e) {
-            Log.e(TAG, e.toString());
-            return STATE_NETWORK_ERROR;
-        } catch (ActionFailureException e) {
-            Log.e(TAG, e.toString());
-            return STATE_INTERNAL_ERROR;
-        } catch (Exception e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-            return STATE_INTERNAL_ERROR;
-        } finally {
-            mGTaskListHashMap.clear();
-            mGTaskHashMap.clear();
-            mMetaHashMap.clear();
-            mLocalDeleteIdMap.clear();
-            mGidToNid.clear();
-            mNidToGid.clear();
-            mSyncing = false;
-        }
-
-        return mCancelled ? STATE_SYNC_CANCELLED : STATE_SUCCESS;
-    }
-
-    private void initGTaskList() throws NetworkFailureException {
-        if (mCancelled)
-            return;
-        GTaskClient client = GTaskClient.getInstance();
-        try {
-            JSONArray jsTaskLists = client.getTaskLists();
-
-            // init meta list first
-            mMetaList = null;
-            for (int i = 0; i < jsTaskLists.length(); i++) {
-                JSONObject object = jsTaskLists.getJSONObject(i);
-                String gid = object.getString(GTaskStringUtils.GTASK_JSON_ID);
-                String name = object.getString(GTaskStringUtils.GTASK_JSON_NAME);
-
-                if (name
-                        .equals(GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_META)) {
-                    mMetaList = new TaskList();
-                    mMetaList.setContentByRemoteJSON(object);
-
-                    // load meta data
-                    JSONArray jsMetas = client.getTaskList(gid);
-                    for (int j = 0; j < jsMetas.length(); j++) {
-                        object = (JSONObject) jsMetas.getJSONObject(j);
-                        MetaData metaData = new MetaData();
-                        metaData.setContentByRemoteJSON(object);
-                        if (metaData.isWorthSaving()) {
-                            mMetaList.addChildTask(metaData);
-                            if (metaData.getGid() != null) {
-                                mMetaHashMap.put(metaData.getRelatedGid(), metaData);
-                            }
-                        }
-                    }
-                }
-            }
-
-            // create meta list if not existed
-            if (mMetaList == null) {
-                mMetaList = new TaskList();
-                mMetaList.setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX
-                        + GTaskStringUtils.FOLDER_META);
-                GTaskClient.getInstance().createTaskList(mMetaList);
-            }
-
-            // init task list
-            for (int i = 0; i < jsTaskLists.length(); i++) {
-                JSONObject object = jsTaskLists.getJSONObject(i);
-                String gid = object.getString(GTaskStringUtils.GTASK_JSON_ID);
-                String name = object.getString(GTaskStringUtils.GTASK_JSON_NAME);
-
-                if (name.startsWith(GTaskStringUtils.MIUI_FOLDER_PREFFIX)
-                        && !name.equals(GTaskStringUtils.MIUI_FOLDER_PREFFIX
-                                + GTaskStringUtils.FOLDER_META)) {
-                    TaskList tasklist = new TaskList();
-                    tasklist.setContentByRemoteJSON(object);
-                    mGTaskListHashMap.put(gid, tasklist);
-                    mGTaskHashMap.put(gid, tasklist);
-
-                    // load tasks
-                    JSONArray jsTasks = client.getTaskList(gid);
-                    for (int j = 0; j < jsTasks.length(); j++) {
-                        object = (JSONObject) jsTasks.getJSONObject(j);
-                        gid = object.getString(GTaskStringUtils.GTASK_JSON_ID);
-                        Task task = new Task();
-                        task.setContentByRemoteJSON(object);
-                        if (task.isWorthSaving()) {
-                            task.setMetaInfo(mMetaHashMap.get(gid));
-                            tasklist.addChildTask(task);
-                            mGTaskHashMap.put(gid, task);
-                        }
-                    }
-                }
-            }
-        } catch (JSONException e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-            throw new ActionFailureException("initGTaskList: handing JSONObject failed");
-        }
-    }
-
-    private void syncContent() throws NetworkFailureException {
-        int syncType;
-        Cursor c = null;
-        String gid;
-        Node node;
-
-        mLocalDeleteIdMap.clear();
-
-        if (mCancelled) {
-            return;
-        }
-
-        // for local deleted note
-        try {
-            c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE,
-                    "(type<>? AND parent_id=?)", new String[] {
-                            String.valueOf(Notes.TYPE_SYSTEM), String.valueOf(Notes.ID_TRASH_FOLER)
-                    }, null);
-            if (c != null) {
-                while (c.moveToNext()) {
-                    gid = c.getString(SqlNote.GTASK_ID_COLUMN);
-                    node = mGTaskHashMap.get(gid);
-                    if (node != null) {
-                        mGTaskHashMap.remove(gid);
-                        doContentSync(Node.SYNC_ACTION_DEL_REMOTE, node, c);
-                    }
-
-                    mLocalDeleteIdMap.add(c.getLong(SqlNote.ID_COLUMN));
-                }
-            } else {
-                Log.w(TAG, "failed to query trash folder");
-            }
-        } finally {
-            if (c != null) {
-                c.close();
-                c = null;
-            }
-        }
-
-        // sync folder first
-        syncFolder();
-
-        // for note existing in database
-        try {
-            c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE,
-                    "(type=? AND parent_id<>?)", new String[] {
-                            String.valueOf(Notes.TYPE_NOTE), String.valueOf(Notes.ID_TRASH_FOLER)
-                    }, NoteColumns.TYPE + " DESC");
-<<<<<<< HEAD
-=======
-            Iterator<Map.Entry<String, Node>> iter = mGTaskHashMap.entrySet().iterator();
-            while (iter.hasNext()) {
-                Map.Entry<String, Node> entry = iter.next();
-                node = entry.getValue();
-                doContentSync(Node.SYNC_ACTION_ADD_LOCAL, node, c);
-            }
->>>>>>> origin/ChiYanZhen_branch
-            if (c != null) {
-                while (c.moveToNext()) {
-                    gid = c.getString(SqlNote.GTASK_ID_COLUMN);
-                    node = mGTaskHashMap.get(gid);
-                    if (node != null) {
-                        mGTaskHashMap.remove(gid);
-                        mGidToNid.put(gid, c.getLong(SqlNote.ID_COLUMN));
-                        mNidToGid.put(c.getLong(SqlNote.ID_COLUMN), gid);
-                        syncType = node.getSyncAction(c);
-                    } else {
-                        if (c.getString(SqlNote.GTASK_ID_COLUMN).trim().length() == 0) {
-                            // local add
-                            syncType = Node.SYNC_ACTION_ADD_REMOTE;
-                        } else {
-                            // remote delete
-                            syncType = Node.SYNC_ACTION_DEL_LOCAL;
-                        }
-                    }
-                    doContentSync(syncType, node, c);
-                }
-            } else {
-                Log.w(TAG, "failed to query existing note in database");
-            }
-
-        } finally {
-            if (c != null) {
-                c.close();
-                c = null;
-            }
-        }
-
-        // go through remaining items
-<<<<<<< HEAD
-        Iterator<Map.Entry<String, Node>> iter = mGTaskHashMap.entrySet().iterator();
-        while (iter.hasNext()) {
-            Map.Entry<String, Node> entry = iter.next();
-            node = entry.getValue();
-            doContentSync(Node.SYNC_ACTION_ADD_LOCAL, node, null);
-        }
-=======
-
->>>>>>> origin/ChiYanZhen_branch
-
-        // mCancelled can be set by another thread, so we neet to check one by
-        // one
-        // clear local delete table
-        if (!mCancelled) {
-            if (!DataUtils.batchDeleteNotes(mContentResolver, mLocalDeleteIdMap)) {
-                throw new ActionFailureException("failed to batch-delete local deleted notes");
-            }
-        }
-
-        // refresh local sync id
-        if (!mCancelled) {
-            GTaskClient.getInstance().commitUpdate();
-            refreshLocalSyncId();
-        }
-
-    }
-
-    private void syncFolder() throws NetworkFailureException {
-        Cursor c = null;
-        String gid;
-        Node node;
-        int syncType;
-
-        if (mCancelled) {
-            return;
-        }
-
-        // for root folder
-        try {
-            c = mContentResolver.query(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI,
-                    Notes.ID_ROOT_FOLDER), SqlNote.PROJECTION_NOTE, null, null, null);
-            if (c != null) {
-                c.moveToNext();
-                gid = c.getString(SqlNote.GTASK_ID_COLUMN);
-                node = mGTaskHashMap.get(gid);
-                if (node != null) {
-                    mGTaskHashMap.remove(gid);
-                    mGidToNid.put(gid, (long) Notes.ID_ROOT_FOLDER);
-                    mNidToGid.put((long) Notes.ID_ROOT_FOLDER, gid);
-                    // for system folder, only update remote name if necessary
-                    if (!node.getName().equals(
-                            GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_DEFAULT))
-                        doContentSync(Node.SYNC_ACTION_UPDATE_REMOTE, node, c);
-                } else {
-                    doContentSync(Node.SYNC_ACTION_ADD_REMOTE, node, c);
-                }
-            } else {
-                Log.w(TAG, "failed to query root folder");
-            }
-        } finally {
-            if (c != null) {
-                c.close();
-                c = null;
-            }
-        }
-
-        // for call-note folder
-        try {
-            c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE, "(_id=?)",
-                    new String[] {
-                        String.valueOf(Notes.ID_CALL_RECORD_FOLDER)
-                    }, null);
-            if (c != null) {
-                if (c.moveToNext()) {
-                    gid = c.getString(SqlNote.GTASK_ID_COLUMN);
-                    node = mGTaskHashMap.get(gid);
-                    if (node != null) {
-                        mGTaskHashMap.remove(gid);
-                        mGidToNid.put(gid, (long) Notes.ID_CALL_RECORD_FOLDER);
-                        mNidToGid.put((long) Notes.ID_CALL_RECORD_FOLDER, gid);
-                        // for system folder, only update remote name if
-                        // necessary
-                        if (!node.getName().equals(
-                                GTaskStringUtils.MIUI_FOLDER_PREFFIX
-                                        + GTaskStringUtils.FOLDER_CALL_NOTE))
-                            doContentSync(Node.SYNC_ACTION_UPDATE_REMOTE, node, c);
-                    } else {
-                        doContentSync(Node.SYNC_ACTION_ADD_REMOTE, node, c);
-                    }
-                }
-            } else {
-                Log.w(TAG, "failed to query call note folder");
-            }
-        } finally {
-            if (c != null) {
-                c.close();
-                c = null;
-            }
-        }
-
-        // for local existing folders
-        try {
-            c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE,
-                    "(type=? AND parent_id<>?)", new String[] {
-                            String.valueOf(Notes.TYPE_FOLDER), String.valueOf(Notes.ID_TRASH_FOLER)
-                    }, NoteColumns.TYPE + " DESC");
-            if (c != null) {
-                while (c.moveToNext()) {
-                    gid = c.getString(SqlNote.GTASK_ID_COLUMN);
-                    node = mGTaskHashMap.get(gid);
-                    if (node != null) {
-                        mGTaskHashMap.remove(gid);
-                        mGidToNid.put(gid, c.getLong(SqlNote.ID_COLUMN));
-                        mNidToGid.put(c.getLong(SqlNote.ID_COLUMN), gid);
-                        syncType = node.getSyncAction(c);
-                    } else {
-                        if (c.getString(SqlNote.GTASK_ID_COLUMN).trim().length() == 0) {
-                            // local add
-                            syncType = Node.SYNC_ACTION_ADD_REMOTE;
-                        } else {
-                            // remote delete
-                            syncType = Node.SYNC_ACTION_DEL_LOCAL;
-                        }
-                    }
-                    doContentSync(syncType, node, c);
-                }
-            } else {
-                Log.w(TAG, "failed to query existing folder");
-            }
-        } finally {
-            if (c != null) {
-                c.close();
-                c = null;
-            }
-        }
-
-        // for remote add folders
-        Iterator<Map.Entry<String, TaskList>> iter = mGTaskListHashMap.entrySet().iterator();
-        while (iter.hasNext()) {
-            Map.Entry<String, TaskList> entry = iter.next();
-            gid = entry.getKey();
-            node = entry.getValue();
-            if (mGTaskHashMap.containsKey(gid)) {
-                mGTaskHashMap.remove(gid);
-                doContentSync(Node.SYNC_ACTION_ADD_LOCAL, node, null);
-            }
-        }
-
-        if (!mCancelled)
-            GTaskClient.getInstance().commitUpdate();
-    }
-
-    private void doContentSync(int syncType, Node node, Cursor c) throws NetworkFailureException {
-        if (mCancelled) {
-            return;
-        }
-
-        MetaData meta;
-        switch (syncType) {
-            case Node.SYNC_ACTION_ADD_LOCAL:
-                addLocalNode(node);
-                break;
-            case Node.SYNC_ACTION_ADD_REMOTE:
-                addRemoteNode(node, c);
-                break;
-            case Node.SYNC_ACTION_DEL_LOCAL:
-                meta = mMetaHashMap.get(c.getString(SqlNote.GTASK_ID_COLUMN));
-                if (meta != null) {
-                    GTaskClient.getInstance().deleteNode(meta);
-                }
-                mLocalDeleteIdMap.add(c.getLong(SqlNote.ID_COLUMN));
-                break;
-            case Node.SYNC_ACTION_DEL_REMOTE:
-                meta = mMetaHashMap.get(node.getGid());
-                if (meta != null) {
-                    GTaskClient.getInstance().deleteNode(meta);
-                }
-                GTaskClient.getInstance().deleteNode(node);
-                break;
-            case Node.SYNC_ACTION_UPDATE_LOCAL:
-                updateLocalNode(node, c);
-                break;
-            case Node.SYNC_ACTION_UPDATE_REMOTE:
-                updateRemoteNode(node, c);
-                break;
-            case Node.SYNC_ACTION_UPDATE_CONFLICT:
-                // merging both modifications maybe a good idea
-                // right now just use local update simply
-                updateRemoteNode(node, c);
-                break;
-            case Node.SYNC_ACTION_NONE:
-                break;
-            case Node.SYNC_ACTION_ERROR:
-            default:
-                throw new ActionFailureException("unkown sync action type");
-        }
-    }
-
-    private void addLocalNode(Node node) throws NetworkFailureException {
-        if (mCancelled) {
-            return;
-        }
-
-        SqlNote sqlNote;
-        if (node instanceof TaskList) {
-            if (node.getName().equals(
-                    GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_DEFAULT)) {
-                sqlNote = new SqlNote(mContext, Notes.ID_ROOT_FOLDER);
-            } else if (node.getName().equals(
-                    GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_CALL_NOTE)) {
-                sqlNote = new SqlNote(mContext, Notes.ID_CALL_RECORD_FOLDER);
-            } else {
-                sqlNote = new SqlNote(mContext);
-                sqlNote.setContent(node.getLocalJSONFromContent());
-                sqlNote.setParentId(Notes.ID_ROOT_FOLDER);
-            }
-        } else {
-            sqlNote = new SqlNote(mContext);
-            JSONObject js = node.getLocalJSONFromContent();
-            try {
-                if (js.has(GTaskStringUtils.META_HEAD_NOTE)) {
-                    JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
-                    if (note.has(NoteColumns.ID)) {
-                        long id = note.getLong(NoteColumns.ID);
-                        if (DataUtils.existInNoteDatabase(mContentResolver, id)) {
-                            // the id is not available, have to create a new one
-                            note.remove(NoteColumns.ID);
-                        }
-                    }
-                }
-
-                if (js.has(GTaskStringUtils.META_HEAD_DATA)) {
-                    JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA);
-                    for (int i = 0; i < dataArray.length(); i++) {
-                        JSONObject data = dataArray.getJSONObject(i);
-                        if (data.has(DataColumns.ID)) {
-                            long dataId = data.getLong(DataColumns.ID);
-                            if (DataUtils.existInDataDatabase(mContentResolver, dataId)) {
-                                // the data id is not available, have to create
-                                // a new one
-                                data.remove(DataColumns.ID);
-                            }
-                        }
-                    }
-
-                }
-            } catch (JSONException e) {
-                Log.w(TAG, e.toString());
-                e.printStackTrace();
-            }
-            sqlNote.setContent(js);
-
-            Long parentId = mGidToNid.get(((Task) node).getParent().getGid());
-            if (parentId == null) {
-                Log.e(TAG, "cannot find task's parent id locally");
-                throw new ActionFailureException("cannot add local node");
-            }
-            sqlNote.setParentId(parentId.longValue());
-        }
-
-        // create the local node
-        sqlNote.setGtaskId(node.getGid());
-        sqlNote.commit(false);
-
-        // update gid-nid mapping
-        mGidToNid.put(node.getGid(), sqlNote.getId());
-        mNidToGid.put(sqlNote.getId(), node.getGid());
-
-        // update meta
-        updateRemoteMeta(node.getGid(), sqlNote);
-    }
-
-    private void updateLocalNode(Node node, Cursor c) throws NetworkFailureException {
-        if (mCancelled) {
-            return;
-        }
-
-        SqlNote sqlNote;
-        // update the note locally
-        sqlNote = new SqlNote(mContext, c);
-        sqlNote.setContent(node.getLocalJSONFromContent());
-
-        Long parentId = (node instanceof Task) ? mGidToNid.get(((Task) node).getParent().getGid())
-                : new Long(Notes.ID_ROOT_FOLDER);
-        if (parentId == null) {
-            Log.e(TAG, "cannot find task's parent id locally");
-            throw new ActionFailureException("cannot update local node");
-        }
-        sqlNote.setParentId(parentId.longValue());
-        sqlNote.commit(true);
-
-        // update meta info
-        updateRemoteMeta(node.getGid(), sqlNote);
-    }
-
-    private void addRemoteNode(Node node, Cursor c) throws NetworkFailureException {
-        if (mCancelled) {
-            return;
-        }
-
-        SqlNote sqlNote = new SqlNote(mContext, c);
-        Node n;
-
-        // update remotely
-        if (sqlNote.isNoteType()) {
-            Task task = new Task();
-            task.setContentByLocalJSON(sqlNote.getContent());
-
-            String parentGid = mNidToGid.get(sqlNote.getParentId());
-            if (parentGid == null) {
-                Log.e(TAG, "cannot find task's parent tasklist");
-                throw new ActionFailureException("cannot add remote task");
-            }
-            mGTaskListHashMap.get(parentGid).addChildTask(task);
-
-            GTaskClient.getInstance().createTask(task);
-            n = (Node) task;
-
-            // add meta
-            updateRemoteMeta(task.getGid(), sqlNote);
-        } else {
-            TaskList tasklist = null;
-
-            // we need to skip folder if it has already existed
-            String folderName = GTaskStringUtils.MIUI_FOLDER_PREFFIX;
-            if (sqlNote.getId() == Notes.ID_ROOT_FOLDER)
-                folderName += GTaskStringUtils.FOLDER_DEFAULT;
-            else if (sqlNote.getId() == Notes.ID_CALL_RECORD_FOLDER)
-                folderName += GTaskStringUtils.FOLDER_CALL_NOTE;
-            else
-                folderName += sqlNote.getSnippet();
-
-            Iterator<Map.Entry<String, TaskList>> iter = mGTaskListHashMap.entrySet().iterator();
-            while (iter.hasNext()) {
-                Map.Entry<String, TaskList> entry = iter.next();
-                String gid = entry.getKey();
-                TaskList list = entry.getValue();
-
-                if (list.getName().equals(folderName)) {
-                    tasklist = list;
-                    if (mGTaskHashMap.containsKey(gid)) {
-                        mGTaskHashMap.remove(gid);
-                    }
-                    break;
-                }
-            }
-
-            // no match we can add now
-            if (tasklist == null) {
-                tasklist = new TaskList();
-                tasklist.setContentByLocalJSON(sqlNote.getContent());
-                GTaskClient.getInstance().createTaskList(tasklist);
-                mGTaskListHashMap.put(tasklist.getGid(), tasklist);
-            }
-            n = (Node) tasklist;
-        }
-
-        // update local note
-        sqlNote.setGtaskId(n.getGid());
-        sqlNote.commit(false);
-        sqlNote.resetLocalModified();
-        sqlNote.commit(true);
-
-        // gid-id mapping
-        mGidToNid.put(n.getGid(), sqlNote.getId());
-        mNidToGid.put(sqlNote.getId(), n.getGid());
-    }
-
-    private void updateRemoteNode(Node node, Cursor c) throws NetworkFailureException {
-        if (mCancelled) {
-            return;
-        }
-
-        SqlNote sqlNote = new SqlNote(mContext, c);
-
-        // update remotely
-        node.setContentByLocalJSON(sqlNote.getContent());
-        GTaskClient.getInstance().addUpdateNode(node);
-
-        // update meta
-        updateRemoteMeta(node.getGid(), sqlNote);
-
-        // move task if necessary
-        if (sqlNote.isNoteType()) {
-            Task task = (Task) node;
-            TaskList preParentList = task.getParent();
-
-            String curParentGid = mNidToGid.get(sqlNote.getParentId());
-            if (curParentGid == null) {
-                Log.e(TAG, "cannot find task's parent tasklist");
-                throw new ActionFailureException("cannot update remote task");
-            }
-            TaskList curParentList = mGTaskListHashMap.get(curParentGid);
-
-            if (preParentList != curParentList) {
-                preParentList.removeChildTask(task);
-                curParentList.addChildTask(task);
-                GTaskClient.getInstance().moveTask(task, preParentList, curParentList);
-            }
-        }
-
-        // clear local modified flag
-        sqlNote.resetLocalModified();
-        sqlNote.commit(true);
-    }
-
-    private void updateRemoteMeta(String gid, SqlNote sqlNote) throws NetworkFailureException {
-        if (sqlNote != null && sqlNote.isNoteType()) {
-            MetaData metaData = mMetaHashMap.get(gid);
-            if (metaData != null) {
-                metaData.setMeta(gid, sqlNote.getContent());
-                GTaskClient.getInstance().addUpdateNode(metaData);
-            } else {
-                metaData = new MetaData();
-                metaData.setMeta(gid, sqlNote.getContent());
-                mMetaList.addChildTask(metaData);
-                mMetaHashMap.put(gid, metaData);
-                GTaskClient.getInstance().createTask(metaData);
-            }
-        }
-    }
-
-    private void refreshLocalSyncId() throws NetworkFailureException {
-        if (mCancelled) {
-            return;
-        }
-
-        // get the latest gtask list
-        mGTaskHashMap.clear();
-        mGTaskListHashMap.clear();
-        mMetaHashMap.clear();
-        initGTaskList();
-
-        Cursor c = null;
-        try {
-            c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE,
-                    "(type<>? AND parent_id<>?)", new String[] {
-                            String.valueOf(Notes.TYPE_SYSTEM), String.valueOf(Notes.ID_TRASH_FOLER)
-                    }, NoteColumns.TYPE + " DESC");
-            if (c != null) {
-                while (c.moveToNext()) {
-                    String gid = c.getString(SqlNote.GTASK_ID_COLUMN);
-                    Node node = mGTaskHashMap.get(gid);
-                    if (node != null) {
-                        mGTaskHashMap.remove(gid);
-                        ContentValues values = new ContentValues();
-                        values.put(NoteColumns.SYNC_ID, node.getLastModified());
-                        mContentResolver.update(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI,
-                                c.getLong(SqlNote.ID_COLUMN)), values, null, null);
-                    } else {
-                        Log.e(TAG, "something is missed");
-                        throw new ActionFailureException(
-                                "some local items don't have gid after sync");
-                    }
-                }
-            } else {
-                Log.w(TAG, "failed to query local note to refresh sync id");
-            }
-        } finally {
-            if (c != null) {
-                c.close();
-                c = null;
-            }
-        }
-    }
-
-    public String getSyncAccount() {
-        return GTaskClient.getInstance().getSyncAccount().name;
-    }
-
-    public void cancelSync() {
-        mCancelled = true;
-    }
-}

src/Notes1/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java.orig

@@ -1,128 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.micode.notes.gtask.remote;
-
-import android.app.Activity;
-import android.app.Service;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.IBinder;
-
-public class GTaskSyncService extends Service {
-    public final static String ACTION_STRING_NAME = "sync_action_type";
-
-    public final static int ACTION_START_SYNC = 0;
-
-    public final static int ACTION_CANCEL_SYNC = 1;
-
-    public final static int ACTION_INVALID = 2;
-
-    public final static String GTASK_SERVICE_BROADCAST_NAME = "net.micode.notes.gtask.remote.gtask_sync_service";
-
-    public final static String GTASK_SERVICE_BROADCAST_IS_SYNCING = "isSyncing";
-
-    public final static String GTASK_SERVICE_BROADCAST_PROGRESS_MSG = "progressMsg";
-
-    private static GTaskASyncTask mSyncTask = null;
-
-    private static String mSyncProgress = "";
-
-    private void startSync() {
-        if (mSyncTask == null) {
-            mSyncTask = new GTaskASyncTask(this, new GTaskASyncTask.OnCompleteListener() {
-                public void onComplete() {
-                    mSyncTask = null;
-                    sendBroadcast("");
-                    stopSelf();
-                }
-            });
-            sendBroadcast("");
-            mSyncTask.execute();
-        }
-    }
-
-    private void cancelSync() {
-        if (mSyncTask != null) {
-            mSyncTask.cancelSync();
-        }
-    }
-
-    @Override
-    public void onCreate() {
-        mSyncTask = null;
-    }
-
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-        Bundle bundle = intent.getExtras();
-        if (bundle != null && bundle.containsKey(ACTION_STRING_NAME)) {
-            switch (bundle.getInt(ACTION_STRING_NAME, ACTION_INVALID)) {
-                case ACTION_START_SYNC:
-                    startSync();
-                    break;
-                case ACTION_CANCEL_SYNC:
-                    cancelSync();
-                    break;
-                default:
-                    break;
-            }
-            return START_STICKY;
-        }
-        return super.onStartCommand(intent, flags, startId);
-    }
-
-    @Override
-    public void onLowMemory() {
-        if (mSyncTask != null) {
-            mSyncTask.cancelSync();
-        }
-    }
-
-    public IBinder onBind(Intent intent) {
-        return null;
-    }
-
-    public void sendBroadcast(String msg) {
-        mSyncProgress = msg;
-        Intent intent = new Intent(GTASK_SERVICE_BROADCAST_NAME);
-        intent.putExtra(GTASK_SERVICE_BROADCAST_IS_SYNCING, mSyncTask != null);
-        intent.putExtra(GTASK_SERVICE_BROADCAST_PROGRESS_MSG, msg);
-        sendBroadcast(intent);
-    }
-
-    public static void startSync(Activity activity) {
-        GTaskManager.getInstance().setActivityContext(activity);
-        Intent intent = new Intent(activity, GTaskSyncService.class);
-        intent.putExtra(GTaskSyncService.ACTION_STRING_NAME, GTaskSyncService.ACTION_START_SYNC);
-        activity.startService(intent);
-    }
-
-    public static void cancelSync(Context context) {
-        Intent intent = new Intent(context, GTaskSyncService.class);
-        intent.putExtra(GTaskSyncService.ACTION_STRING_NAME, GTaskSyncService.ACTION_CANCEL_SYNC);
-        context.startService(intent);
-    }
-
-    public static boolean isSyncing() {
-        return mSyncTask != null;
-    }
-
-    public static String getProgressString() {
-        return mSyncProgress;
-    }
-}

src/Notes1/app/src/main/java/net/micode/notes/model/Note.java.orig

@@ -1,253 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.micode.notes.model;
-import android.content.ContentProviderOperation;
-import android.content.ContentProviderResult;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.OperationApplicationException;
-import android.net.Uri;
-import android.os.RemoteException;
-import android.util.Log;
-
-import net.micode.notes.data.Notes;
-import net.micode.notes.data.Notes.CallNote;
-import net.micode.notes.data.Notes.DataColumns;
-import net.micode.notes.data.Notes.NoteColumns;
-import net.micode.notes.data.Notes.TextNote;
-
-import java.util.ArrayList;
-
-
-public class Note {
-    private ContentValues mNoteDiffValues;
-    private NoteData mNoteData;
-    private static final String TAG = "Note";
-    /**
-     * Create a new note id for adding a new note to databases
-     */
-    public static synchronized long getNewNoteId(Context context, long folderId) {
-        // Create a new note in the database
-        ContentValues values = new ContentValues();
-        long createdTime = System.currentTimeMillis();
-        values.put(NoteColumns.CREATED_DATE, createdTime);
-        values.put(NoteColumns.MODIFIED_DATE, createdTime);
-        values.put(NoteColumns.TYPE, Notes.TYPE_NOTE);
-        values.put(NoteColumns.LOCAL_MODIFIED, 1);
-        values.put(NoteColumns.PARENT_ID, folderId);
-        Uri uri = context.getContentResolver().insert(Notes.CONTENT_NOTE_URI, values);
-
-        long noteId = 0;
-        try {
-            noteId = Long.valueOf(uri.getPathSegments().get(1));
-        } catch (NumberFormatException e) {
-            Log.e(TAG, "Get note id error :" + e.toString());
-            noteId = 0;
-        }
-        if (noteId == -1) {
-            throw new IllegalStateException("Wrong note id:" + noteId);
-        }
-        return noteId;
-    }
-
-    public Note() {
-        mNoteDiffValues = new ContentValues();
-        mNoteData = new NoteData();
-    }
-
-    public void setNoteValue(String key, String value) {
-        mNoteDiffValues.put(key, value);
-        mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1);
-        mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis());
-    }
-
-    public void setTextData(String key, String value) {
-        mNoteData.setTextData(key, value);
-    }
-
-    public void setTextDataId(long id) {
-        mNoteData.setTextDataId(id);
-    }
-
-    public long getTextDataId() {
-        return mNoteData.mTextDataId;
-    }
-
-    public void setCallDataId(long id) {
-        mNoteData.setCallDataId(id);
-    }
-
-    public void setCallData(String key, String value) {
-        mNoteData.setCallData(key, value);
-    }
-
-    public boolean isLocalModified() {
-        return mNoteDiffValues.size() > 0 || mNoteData.isLocalModified();
-    }
-
-    public boolean syncNote(Context context, long noteId) {
-        if (noteId <= 0) {
-            throw new IllegalArgumentException("Wrong note id:" + noteId);
-        }
-
-        if (!isLocalModified()) {
-            return true;
-        }
-
-        /**
-         * In theory, once data changed, the note should be updated on {@link NoteColumns#LOCAL_MODIFIED} and
-         * {@link NoteColumns#MODIFIED_DATE}. For data safety, though update note fails, we also update the
-         * note data info
-         */
-        if (context.getContentResolver().update(
-                ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), mNoteDiffValues, null,
-                null) == 0) {
-            Log.e(TAG, "Update note error, should not happen");
-            // Do not return, fall through
-        }
-        mNoteDiffValues.clear();
-
-        if (mNoteData.isLocalModified()
-                && (mNoteData.pushIntoContentResolver(context, noteId) == null)) {
-            return false;
-        }
-
-        return true;
-    }
-
-    private class NoteData {
-        private long mTextDataId;
-
-        private ContentValues mTextDataValues;
-
-        private long mCallDataId;
-
-        private ContentValues mCallDataValues;
-
-        private static final String TAG = "NoteData";
-
-        public NoteData() {
-            mTextDataValues = new ContentValues();
-            mCallDataValues = new ContentValues();
-            mTextDataId = 0;
-            mCallDataId = 0;
-        }
-
-        boolean isLocalModified() {
-            return mTextDataValues.size() > 0 || mCallDataValues.size() > 0;
-        }
-
-        void setTextDataId(long id) {
-            if(id <= 0) {
-                throw new IllegalArgumentException("Text data id should larger than 0");
-            }
-            mTextDataId = id;
-        }
-
-        void setCallDataId(long id) {
-            if (id <= 0) {
-                throw new IllegalArgumentException("Call data id should larger than 0");
-            }
-            mCallDataId = id;
-        }
-
-        void setCallData(String key, String value) {
-            mCallDataValues.put(key, value);
-            mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1);
-            mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis());
-        }
-
-        void setTextData(String key, String value) {
-            mTextDataValues.put(key, value);
-            mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1);
-            mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis());
-        }
-
-        Uri pushIntoContentResolver(Context context, long noteId) {
-            /**
-             * Check for safety
-             */
-            if (noteId <= 0) {
-                throw new IllegalArgumentException("Wrong note id:" + noteId);
-            }
-
-            ArrayList<ContentProviderOperation> operationList = new ArrayList<ContentProviderOperation>();
-            ContentProviderOperation.Builder builder = null;
-
-            if(mTextDataValues.size() > 0) {
-                mTextDataValues.put(DataColumns.NOTE_ID, noteId);
-                if (mTextDataId == 0) {
-                    mTextDataValues.put(DataColumns.MIME_TYPE, TextNote.CONTENT_ITEM_TYPE);
-                    Uri uri = context.getContentResolver().insert(Notes.CONTENT_DATA_URI,
-                            mTextDataValues);
-                    try {
-                        setTextDataId(Long.valueOf(uri.getPathSegments().get(1)));
-                    } catch (NumberFormatException e) {
-                        Log.e(TAG, "Insert new text data fail with noteId" + noteId);
-                        mTextDataValues.clear();
-                        return null;
-                    }
-                } else {
-                    builder = ContentProviderOperation.newUpdate(ContentUris.withAppendedId(
-                            Notes.CONTENT_DATA_URI, mTextDataId));
-                    builder.withValues(mTextDataValues);
-                    operationList.add(builder.build());
-                }
-                mTextDataValues.clear();
-            }
-
-            if(mCallDataValues.size() > 0) {
-                mCallDataValues.put(DataColumns.NOTE_ID, noteId);
-                if (mCallDataId == 0) {
-                    mCallDataValues.put(DataColumns.MIME_TYPE, CallNote.CONTENT_ITEM_TYPE);
-                    Uri uri = context.getContentResolver().insert(Notes.CONTENT_DATA_URI,
-                            mCallDataValues);
-                    try {
-                        setCallDataId(Long.valueOf(uri.getPathSegments().get(1)));
-                    } catch (NumberFormatException e) {
-                        Log.e(TAG, "Insert new call data fail with noteId" + noteId);
-                        mCallDataValues.clear();
-                        return null;
-                    }
-                } else {
-                    builder = ContentProviderOperation.newUpdate(ContentUris.withAppendedId(
-                            Notes.CONTENT_DATA_URI, mCallDataId));
-                    builder.withValues(mCallDataValues);
-                    operationList.add(builder.build());
-                }
-                mCallDataValues.clear();
-            }
-
-            if (operationList.size() > 0) {
-                try {
-                    ContentProviderResult[] results = context.getContentResolver().applyBatch(
-                            Notes.AUTHORITY, operationList);
-                    return (results == null || results.length == 0 || results[0] == null) ? null
-                            : ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId);
-                } catch (RemoteException e) {
-                    Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage()));
-                    return null;
-                } catch (OperationApplicationException e) {
-                    Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage()));
-                    return null;
-                }
-            }
-            return null;
-        }
-    }
-}

src/Notes1/app/src/main/java/net/micode/notes/model/WorkingNote.java.orig

@@ -1,368 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.micode.notes.model;
-
-import android.appwidget.AppWidgetManager;
-import android.content.ContentUris;
-import android.content.Context;
-import android.database.Cursor;
-import android.text.TextUtils;
-import android.util.Log;
-
-import net.micode.notes.data.Notes;
-import net.micode.notes.data.Notes.CallNote;
-import net.micode.notes.data.Notes.DataColumns;
-import net.micode.notes.data.Notes.DataConstants;
-import net.micode.notes.data.Notes.NoteColumns;
-import net.micode.notes.data.Notes.TextNote;
-import net.micode.notes.tool.ResourceParser.NoteBgResources;
-
-
-public class WorkingNote {
-    // Note for the working note
-    private Note mNote;
-    // Note Id
-    private long mNoteId;
-    // Note content
-    private String mContent;
-    // Note mode
-    private int mMode;
-
-    private long mAlertDate;
-
-    private long mModifiedDate;
-
-    private int mBgColorId;
-
-    private int mWidgetId;
-
-    private int mWidgetType;
-
-    private long mFolderId;
-
-    private Context mContext;
-
-    private static final String TAG = "WorkingNote";
-
-    private boolean mIsDeleted;
-
-    private NoteSettingChangedListener mNoteSettingStatusListener;
-
-    public static final String[] DATA_PROJECTION = new String[] {
-            DataColumns.ID,
-            DataColumns.CONTENT,
-            DataColumns.MIME_TYPE,
-            DataColumns.DATA1,
-            DataColumns.DATA2,
-            DataColumns.DATA3,
-            DataColumns.DATA4,
-    };
-
-    public static final String[] NOTE_PROJECTION = new String[] {
-            NoteColumns.PARENT_ID,
-            NoteColumns.ALERTED_DATE,
-            NoteColumns.BG_COLOR_ID,
-            NoteColumns.WIDGET_ID,
-            NoteColumns.WIDGET_TYPE,
-            NoteColumns.MODIFIED_DATE
-    };
-
-    private static final int DATA_ID_COLUMN = 0;
-
-    private static final int DATA_CONTENT_COLUMN = 1;
-
-    private static final int DATA_MIME_TYPE_COLUMN = 2;
-
-    private static final int DATA_MODE_COLUMN = 3;
-
-    private static final int NOTE_PARENT_ID_COLUMN = 0;
-
-    private static final int NOTE_ALERTED_DATE_COLUMN = 1;
-
-    private static final int NOTE_BG_COLOR_ID_COLUMN = 2;
-
-    private static final int NOTE_WIDGET_ID_COLUMN = 3;
-
-    private static final int NOTE_WIDGET_TYPE_COLUMN = 4;
-
-    private static final int NOTE_MODIFIED_DATE_COLUMN = 5;
-
-    // New note construct
-    private WorkingNote(Context context, long folderId) {
-        mContext = context;
-        mAlertDate = 0;
-        mModifiedDate = System.currentTimeMillis();
-        mFolderId = folderId;
-        mNote = new Note();
-        mNoteId = 0;
-        mIsDeleted = false;
-        mMode = 0;
-        mWidgetType = Notes.TYPE_WIDGET_INVALIDE;
-    }
-
-    // Existing note construct
-    private WorkingNote(Context context, long noteId, long folderId) {
-        mContext = context;
-        mNoteId = noteId;
-        mFolderId = folderId;
-        mIsDeleted = false;
-        mNote = new Note();
-        loadNote();
-    }
-
-    private void loadNote() {
-        Cursor cursor = mContext.getContentResolver().query(
-                ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mNoteId), NOTE_PROJECTION, null,
-                null, null);
-
-        if (cursor != null) {
-            if (cursor.moveToFirst()) {
-                mFolderId = cursor.getLong(NOTE_PARENT_ID_COLUMN);
-                mBgColorId = cursor.getInt(NOTE_BG_COLOR_ID_COLUMN);
-                mWidgetId = cursor.getInt(NOTE_WIDGET_ID_COLUMN);
-                mWidgetType = cursor.getInt(NOTE_WIDGET_TYPE_COLUMN);
-                mAlertDate = cursor.getLong(NOTE_ALERTED_DATE_COLUMN);
-                mModifiedDate = cursor.getLong(NOTE_MODIFIED_DATE_COLUMN);
-            }
-            cursor.close();
-        } else {
-            Log.e(TAG, "No note with id:" + mNoteId);
-            throw new IllegalArgumentException("Unable to find note with id " + mNoteId);
-        }
-        loadNoteData();
-    }
-
-    private void loadNoteData() {
-        Cursor cursor = mContext.getContentResolver().query(Notes.CONTENT_DATA_URI, DATA_PROJECTION,
-                DataColumns.NOTE_ID + "=?", new String[] {
-                    String.valueOf(mNoteId)
-                }, null);
-
-        if (cursor != null) {
-            if (cursor.moveToFirst()) {
-                do {
-                    String type = cursor.getString(DATA_MIME_TYPE_COLUMN);
-                    if (DataConstants.NOTE.equals(type)) {
-                        mContent = cursor.getString(DATA_CONTENT_COLUMN);
-                        mMode = cursor.getInt(DATA_MODE_COLUMN);
-                        mNote.setTextDataId(cursor.getLong(DATA_ID_COLUMN));
-                    } else if (DataConstants.CALL_NOTE.equals(type)) {
-                        mNote.setCallDataId(cursor.getLong(DATA_ID_COLUMN));
-                    } else {
-                        Log.d(TAG, "Wrong note type with type:" + type);
-                    }
-                } while (cursor.moveToNext());
-            }
-            cursor.close();
-        } else {
-            Log.e(TAG, "No data with id:" + mNoteId);
-            throw new IllegalArgumentException("Unable to find note's data with id " + mNoteId);
-        }
-    }
-
-    public static WorkingNote createEmptyNote(Context context, long folderId, int widgetId,
-            int widgetType, int defaultBgColorId) {
-        WorkingNote note = new WorkingNote(context, folderId);
-        note.setBgColorId(defaultBgColorId);
-        note.setWidgetId(widgetId);
-        note.setWidgetType(widgetType);
-        return note;
-    }
-
-    public static WorkingNote load(Context context, long id) {
-        return new WorkingNote(context, id, 0);
-    }
-
-    public synchronized boolean saveNote() {
-        if (isWorthSaving()) {
-            if (!existInDatabase()) {
-                if ((mNoteId = Note.getNewNoteId(mContext, mFolderId)) == 0) {
-                    Log.e(TAG, "Create new note fail with id:" + mNoteId);
-                    return false;
-                }
-            }
-
-            mNote.syncNote(mContext, mNoteId);
-
-            /**
-             * Update widget content if there exist any widget of this note
-             */
-            if (mWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID
-                    && mWidgetType != Notes.TYPE_WIDGET_INVALIDE
-                    && mNoteSettingStatusListener != null) {
-                mNoteSettingStatusListener.onWidgetChanged();
-            }
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    public boolean existInDatabase() {
-        return mNoteId > 0;
-    }
-
-    private boolean isWorthSaving() {
-        if (mIsDeleted || (!existInDatabase() && TextUtils.isEmpty(mContent))
-                || (existInDatabase() && !mNote.isLocalModified())) {
-            return false;
-        } else {
-            return true;
-        }
-    }
-
-    public void setOnSettingStatusChangedListener(NoteSettingChangedListener l) {
-        mNoteSettingStatusListener = l;
-    }
-
-    public void setAlertDate(long date, boolean set) {
-        if (date != mAlertDate) {
-            mAlertDate = date;
-            mNote.setNoteValue(NoteColumns.ALERTED_DATE, String.valueOf(mAlertDate));
-        }
-        if (mNoteSettingStatusListener != null) {
-            mNoteSettingStatusListener.onClockAlertChanged(date, set);
-        }
-    }
-
-    public void markDeleted(boolean mark) {
-        mIsDeleted = mark;
-        if (mWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID
-                && mWidgetType != Notes.TYPE_WIDGET_INVALIDE && mNoteSettingStatusListener != null) {
-                mNoteSettingStatusListener.onWidgetChanged();
-        }
-    }
-
-    public void setBgColorId(int id) {
-        if (id != mBgColorId) {
-            mBgColorId = id;
-            if (mNoteSettingStatusListener != null) {
-                mNoteSettingStatusListener.onBackgroundColorChanged();
-            }
-            mNote.setNoteValue(NoteColumns.BG_COLOR_ID, String.valueOf(id));
-        }
-    }
-
-    public void setCheckListMode(int mode) {
-        if (mMode != mode) {
-            if (mNoteSettingStatusListener != null) {
-                mNoteSettingStatusListener.onCheckListModeChanged(mMode, mode);
-            }
-            mMode = mode;
-            mNote.setTextData(TextNote.MODE, String.valueOf(mMode));
-        }
-    }
-
-    public void setWidgetType(int type) {
-        if (type != mWidgetType) {
-            mWidgetType = type;
-            mNote.setNoteValue(NoteColumns.WIDGET_TYPE, String.valueOf(mWidgetType));
-        }
-    }
-
-    public void setWidgetId(int id) {
-        if (id != mWidgetId) {
-            mWidgetId = id;
-            mNote.setNoteValue(NoteColumns.WIDGET_ID, String.valueOf(mWidgetId));
-        }
-    }
-
-    public void setWorkingText(String text) {
-        if (!TextUtils.equals(mContent, text)) {
-            mContent = text;
-            mNote.setTextData(DataColumns.CONTENT, mContent);
-        }
-    }
-
-    public void convertToCallNote(String phoneNumber, long callDate) {
-        mNote.setCallData(CallNote.CALL_DATE, String.valueOf(callDate));
-        mNote.setCallData(CallNote.PHONE_NUMBER, phoneNumber);
-        mNote.setNoteValue(NoteColumns.PARENT_ID, String.valueOf(Notes.ID_CALL_RECORD_FOLDER));
-    }
-
-    public boolean hasClockAlert() {
-        return (mAlertDate > 0 ? true : false);
-    }
-
-    public String getContent() {
-        return mContent;
-    }
-
-    public long getAlertDate() {
-        return mAlertDate;
-    }
-
-    public long getModifiedDate() {
-        return mModifiedDate;
-    }
-
-    public int getBgColorResId() {
-        return NoteBgResources.getNoteBgResource(mBgColorId);
-    }
-
-    public int getBgColorId() {
-        return mBgColorId;
-    }
-
-    public int getTitleBgResId() {
-        return NoteBgResources.getNoteTitleBgResource(mBgColorId);
-    }
-
-    public int getCheckListMode() {
-        return mMode;
-    }
-
-    public long getNoteId() {
-        return mNoteId;
-    }
-
-    public long getFolderId() {
-        return mFolderId;
-    }
-
-    public int getWidgetId() {
-        return mWidgetId;
-    }
-
-    public int getWidgetType() {
-        return mWidgetType;
-    }
-
-    public interface NoteSettingChangedListener {
-        /**
-         * Called when the background color of current note has just changed
-         */
-        void onBackgroundColorChanged();
-
-        /**
-         * Called when user set clock
-         */
-        void onClockAlertChanged(long date, boolean set);
-
-        /**
-         * Call when user create note from widget
-         */
-        void onWidgetChanged();
-
-        /**
-         * Call when switch between check list mode and normal mode
-         * @param oldMode is previous mode before change
-         * @param newMode is new mode
-         */
-        void onCheckListModeChanged(int oldMode, int newMode);
-    }
-}

src/Notes1/app/src/main/java/net/micode/notes/tool/BackupUtils.java.orig

@@ -1,354 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.micode.notes.tool;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.os.Environment;
-import android.text.TextUtils;
-import android.text.format.DateFormat;
-import android.util.Log;
-
-import net.micode.notes.R;
-import net.micode.notes.data.Notes;
-import net.micode.notes.data.Notes.DataColumns;
-import net.micode.notes.data.Notes.DataConstants;
-import net.micode.notes.data.Notes.NoteColumns;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.PrintStream;
-
-
-public class BackupUtils {
-    private static final String TAG = "BackupUtils";
-    // Singleton stuff
-    private static BackupUtils sInstance;
-
-    public static synchronized BackupUtils getInstance(Context context) {
-        if (sInstance == null) {
-            sInstance = new BackupUtils(context);
-        }
-        return sInstance;
-    }
-
-    /**
-     * Following states are signs to represents backup or restore
-     * status
-     */
-    // Currently, the sdcard is not mounted
-    public static final int STATE_SD_CARD_UNMOUONTED           = 0;
-    // The backup file not exist
-    public static final int STATE_BACKUP_FILE_NOT_EXIST        = 1;
-    // The data is not well formated, may be changed by other programs
-    public static final int STATE_DATA_DESTROIED               = 2;
-    // Some run-time exception which causes restore or backup fails
-    public static final int STATE_SYSTEM_ERROR                 = 3;
-    // Backup or restore success
-    public static final int STATE_SUCCESS                      = 4;
-
-    private TextExport mTextExport;
-
-    private BackupUtils(Context context) {
-        mTextExport = new TextExport(context);
-    }
-
-    private static boolean externalStorageAvailable() {
-        return Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState());
-    }
-
-    public int exportToText() {
-        return mTextExport.exportToText();
-    }
-
-    public String getExportedTextFileName() {
-        return mTextExport.mFileName;
-    }
-
-    public String getExportedTextFileDir() {
-        return mTextExport.mFileDirectory;
-    }
-
-    private static class TextExport {
-        private static final String[] NOTE_PROJECTION = {
-                NoteColumns.ID,
-                NoteColumns.MODIFIED_DATE,
-                NoteColumns.SNIPPET,
-                NoteColumns.TYPE
-        };
-
-        private static final int NOTE_COLUMN_ID = 0;
-
-        private static final int NOTE_COLUMN_MODIFIED_DATE = 1;
-
-        private static final int NOTE_COLUMN_SNIPPET = 2;
-
-        private static final String[] DATA_PROJECTION = {
-                DataColumns.CONTENT,
-                DataColumns.MIME_TYPE,
-                DataColumns.DATA1,
-                DataColumns.DATA2,
-                DataColumns.DATA3,
-                DataColumns.DATA4,
-        };
-
-        private static final int DATA_COLUMN_CONTENT = 0;
-
-        private static final int DATA_COLUMN_MIME_TYPE = 1;
-
-        private static final int DATA_COLUMN_CALL_DATE = 2;
-
-        private static final int DATA_COLUMN_PHONE_NUMBER = 4;
-
-        private final String [] TEXT_FORMAT;
-        private static final int FORMAT_FOLDER_NAME          = 0;
-        private static final int FORMAT_NOTE_DATE            = 1;
-        private static final int FORMAT_NOTE_CONTENT         = 2;
-
-        private Context mContext;
-        private String mFileName;
-        private String mFileDirectory;
-
-        public TextExport(Context context) {
-            TEXT_FORMAT = context.getResources().getStringArray(R.array.format_for_exported_note);
-            mContext = context;
-            mFileName = "";
-            mFileDirectory = "";
-        }
-
-        private String getFormat(int id) {
-            return TEXT_FORMAT[id];
-        }
-
-        /**
-         * Export the folder identified by folder id to text
-         */
-        private void exportFolderToText(String folderId, PrintStream ps) {
-            // Query notes belong to this folder
-            Cursor notesCursor = mContext.getContentResolver().query(Notes.CONTENT_NOTE_URI,
-                    NOTE_PROJECTION, NoteColumns.PARENT_ID + "=?", new String[] {
-                        folderId
-                    }, null);
-
-            if (notesCursor != null) {
-                if (notesCursor.moveToFirst()) {
-                    do {
-                        // Print note's last modified date
-                        ps.println(String.format(getFormat(FORMAT_NOTE_DATE), DateFormat.format(
-                                mContext.getString(R.string.format_datetime_mdhm),
-                                notesCursor.getLong(NOTE_COLUMN_MODIFIED_DATE))));
-                        // Query data belong to this note
-                        String noteId = notesCursor.getString(NOTE_COLUMN_ID);
-                        exportNoteToText(noteId, ps);
-                    } while (notesCursor.moveToNext());
-                }
-                notesCursor.close();
-            }
-        }
-
-        /**
-         * Export note identified by id to a print stream
-         */
-        private void exportNoteToText(String noteId, PrintStream ps) {
-            Cursor dataCursor = mContext.getContentResolver().query(Notes.CONTENT_DATA_URI,
-                    DATA_PROJECTION, DataColumns.NOTE_ID + "=?", new String[] {
-                        noteId
-                    }, null);
-
-            if (dataCursor != null) {
-                if (dataCursor.moveToFirst()) {
-                    do {
-                        String mimeType = dataCursor.getString(DATA_COLUMN_MIME_TYPE);
-                        if (DataConstants.CALL_NOTE.equals(mimeType)) {
-                            // Print phone number
-                            String phoneNumber = dataCursor.getString(DATA_COLUMN_PHONE_NUMBER);
-                            long callDate = dataCursor.getLong(DATA_COLUMN_CALL_DATE);
-                            String location = dataCursor.getString(DATA_COLUMN_CONTENT);
-
-                            if (!TextUtils.isEmpty(phoneNumber)) {
-                                ps.println(String.format(getFormat(FORMAT_NOTE_CONTENT),
-                                        phoneNumber));
-                            }
-                            // Print call date
-                            ps.println(String.format(getFormat(FORMAT_NOTE_CONTENT), DateFormat
-                                    .format(mContext.getString(R.string.format_datetime_mdhm),
-                                            callDate)));
-                            // Print call attachment location
-                            if (!TextUtils.isEmpty(location)) {
-                                ps.println(String.format(getFormat(FORMAT_NOTE_CONTENT),
-                                        location));
-                            }
-                        } else if (DataConstants.NOTE.equals(mimeType)) {
-                            String content = dataCursor.getString(DATA_COLUMN_CONTENT);
-                            if (!TextUtils.isEmpty(content)) {
-                                ps.println(String.format(getFormat(FORMAT_NOTE_CONTENT),
-                                        content));
-                            }
-                        }
-                    } while (dataCursor.moveToNext());
-                }
-                dataCursor.close();
-            }
-            // print a line separator between note
-            try {
-                ps.write(new byte[] {
-                        Character.LINE_SEPARATOR, Character.LETTER_NUMBER
-                });
-            } catch (IOException e) {
-                Log.e(TAG, e.toString());
-            }
-        }
-
-        /**
-         * Note will be exported as text which is user readable
-         */
-        public int exportToText() {
-            if (!externalStorageAvailable()) {
-                Log.d(TAG, "Media was not mounted");
-                return STATE_SD_CARD_UNMOUONTED;
-            }
-
-            PrintStream ps = getExportToTextPrintStream();
-            if (ps == null) {
-                Log.e(TAG, "get print stream error");
-                return STATE_SYSTEM_ERROR;
-            }
-            // First export folder and its notes
-            Cursor folderCursor = mContext.getContentResolver().query(
-                    Notes.CONTENT_NOTE_URI,
-                    NOTE_PROJECTION,
-                    "(" + NoteColumns.TYPE + "=" + Notes.TYPE_FOLDER + " AND "
-                            + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER + ") OR "
-                            + NoteColumns.ID + "=" + Notes.ID_CALL_RECORD_FOLDER, null, null);
-
-            if (folderCursor != null) {
-                if (folderCursor.moveToFirst()) {
-                    do {
-                        // Print folder's name
-                        String folderName = "";
-                        if(folderCursor.getLong(NOTE_COLUMN_ID) == Notes.ID_CALL_RECORD_FOLDER) {
-                            folderName = mContext.getString(R.string.call_record_folder_name);
-                        } else {
-                            folderName = folderCursor.getString(NOTE_COLUMN_SNIPPET);
-                        }
-                        if (!TextUtils.isEmpty(folderName)) {
-                            ps.println(String.format(getFormat(FORMAT_FOLDER_NAME), folderName));
-                        }
-                        String folderId = folderCursor.getString(NOTE_COLUMN_ID);
-                        exportFolderToText(folderId, ps);
-                    } while (folderCursor.moveToNext());
-                }
-                folderCursor.close();
-            }
-
-            // Export notes in root's folder
-            Cursor noteCursor = mContext.getContentResolver().query(
-                    Notes.CONTENT_NOTE_URI,
-                    NOTE_PROJECTION,
-                    NoteColumns.TYPE + "=" + +Notes.TYPE_NOTE + " AND " + NoteColumns.PARENT_ID
-                            + "=0", null, null);
-
-            if (noteCursor != null) {
-                if (noteCursor.moveToFirst()) {
-                    do {
-                        ps.println(String.format(getFormat(FORMAT_NOTE_DATE), DateFormat.format(
-                                mContext.getString(R.string.format_datetime_mdhm),
-                                noteCursor.getLong(NOTE_COLUMN_MODIFIED_DATE))));
-                        // Query data belong to this note
-                        String noteId = noteCursor.getString(NOTE_COLUMN_ID);
-                        exportNoteToText(noteId, ps);
-                    } while (noteCursor.moveToNext());
-                }
-                noteCursor.close();
-            }
-            ps.close();
-
-            return STATE_SUCCESS;
-        }
-
-        /**
-         * Get a print stream pointed to the file {@generateExportedTextFile}
-         */
-        private PrintStream getExportToTextPrintStream() {
-            File file = generateFileMountedOnSDcard(mContext, R.string.file_path,
-                    R.string.file_name_txt_format);
-            if (file == null) {
-                Log.e(TAG, "create file to exported failed");
-                return null;
-            }
-            mFileName = file.getName();
-            mFileDirectory = mContext.getString(R.string.file_path);
-            PrintStream ps = null;
-<<<<<<< HEAD
-            try {
-                FileOutputStream fos = new FileOutputStream(file);
-=======
-            try (FileOutputStream fos = new FileOutputStream(file)){
->>>>>>> origin/ChiYanZhen_branch
-                ps = new PrintStream(fos);
-            } catch (FileNotFoundException e) {
-                e.printStackTrace();
-                return null;
-            } catch (NullPointerException e) {
-                e.printStackTrace();
-                return null;
-<<<<<<< HEAD
-=======
-            } catch (IOException e) {
-                e.printStackTrace();
-                return null;
->>>>>>> origin/ChiYanZhen_branch
-            }
-            return ps;
-        }
-    }
-
-    /**
-     * Generate the text file to store imported data
-     */
-    private static File generateFileMountedOnSDcard(Context context, int filePathResId, int fileNameFormatResId) {
-        StringBuilder sb = new StringBuilder();
-        sb.append(Environment.getExternalStorageDirectory());
-        sb.append(context.getString(filePathResId));
-        File filedir = new File(sb.toString());
-        sb.append(context.getString(
-                fileNameFormatResId,
-                DateFormat.format(context.getString(R.string.format_date_ymd),
-                        System.currentTimeMillis())));
-        File file = new File(sb.toString());
-
-        try {
-            if (!filedir.exists()) {
-                filedir.mkdir();
-            }
-            if (!file.exists()) {
-                file.createNewFile();
-            }
-            return file;
-        } catch (SecurityException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-        return null;
-    }
-}
-
-

src/Notes1/app/src/main/java/net/micode/notes/tool/DataUtils.java.orig

@@ -1,300 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.micode.notes.tool;
-
-import android.content.ContentProviderOperation;
-import android.content.ContentProviderResult;
-import android.content.ContentResolver;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.content.OperationApplicationException;
-import android.database.Cursor;
-import android.os.RemoteException;
-import android.util.Log;
-
-import net.micode.notes.data.Notes;
-import net.micode.notes.data.Notes.CallNote;
-import net.micode.notes.data.Notes.NoteColumns;
-import net.micode.notes.ui.NotesListAdapter.AppWidgetAttribute;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-
-
-public class DataUtils {
-    public static final String TAG = "DataUtils";
-    public static boolean batchDeleteNotes(ContentResolver resolver, HashSet<Long> ids) {
-        if (ids == null) {
-            Log.d(TAG, "the ids is null");
-            return true;
-        }
-        if (ids.size() == 0) {
-            Log.d(TAG, "no id is in the hashset");
-            return true;
-        }
-
-        ArrayList<ContentProviderOperation> operationList = new ArrayList<ContentProviderOperation>();
-        for (long id : ids) {
-            if(id == Notes.ID_ROOT_FOLDER) {
-                Log.e(TAG, "Don't delete system folder root");
-                continue;
-            }
-            ContentProviderOperation.Builder builder = ContentProviderOperation
-                    .newDelete(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id));
-            operationList.add(builder.build());
-        }
-        try {
-            ContentProviderResult[] results = resolver.applyBatch(Notes.AUTHORITY, operationList);
-            if (results == null || results.length == 0 || results[0] == null) {
-                Log.d(TAG, "delete notes failed, ids:" + ids.toString());
-                return false;
-            }
-            return true;
-        } catch (RemoteException e) {
-            Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage()));
-        } catch (OperationApplicationException e) {
-            Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage()));
-        }
-        return false;
-    }
-
-    public static void moveNoteToFoler(ContentResolver resolver, long id, long srcFolderId, long desFolderId) {
-        ContentValues values = new ContentValues();
-        values.put(NoteColumns.PARENT_ID, desFolderId);
-        values.put(NoteColumns.ORIGIN_PARENT_ID, srcFolderId);
-        values.put(NoteColumns.LOCAL_MODIFIED, 1);
-        resolver.update(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id), values, null, null);
-    }
-
-    public static boolean batchMoveToFolder(ContentResolver resolver, HashSet<Long> ids,
-            long folderId) {
-        if (ids == null) {
-            Log.d(TAG, "the ids is null");
-<<<<<<< HEAD
-
-=======
->>>>>>> origin/ChiYanZhen_branch
-            return true;
-        }
-
-        ArrayList<ContentProviderOperation> operationList = new ArrayList<ContentProviderOperation>();
-        for (long id : ids) {
-            ContentProviderOperation.Builder builder = ContentProviderOperation
-                    .newUpdate(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id));
-            builder.withValue(NoteColumns.PARENT_ID, folderId);
-            builder.withValue(NoteColumns.LOCAL_MODIFIED, 1);
-            operationList.add(builder.build());
-        }
-
-        try {
-            ContentProviderResult[] results = resolver.applyBatch(Notes.AUTHORITY, operationList);
-            if (results == null || results.length == 0 || results[0] == null) {
-                Log.d(TAG, "delete notes failed, ids:" + ids.toString());
-                return false;
-            }
-
-            return true;
-        } catch (RemoteException e) {
-            Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage()));
-        } catch (OperationApplicationException e) {
-            Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage()));
-        }
-        return false;
-    }
-
-    /**
-     * Get the all folder count except system folders {@link Notes#TYPE_SYSTEM}}
-     */
-    public static int getUserFolderCount(ContentResolver resolver) {
-        Cursor cursor =resolver.query(Notes.CONTENT_NOTE_URI,
-                new String[] { "COUNT(*)" },
-                NoteColumns.TYPE + "=? AND " + NoteColumns.PARENT_ID + "<>?",
-                new String[] { String.valueOf(Notes.TYPE_FOLDER), String.valueOf(Notes.ID_TRASH_FOLER)},
-                null);
-
-        int count = 0;
-        if(cursor != null) {
-            if(cursor.moveToFirst()) {
-                try {
-                    count = cursor.getInt(0);
-                } catch (IndexOutOfBoundsException e) {
-                    Log.e(TAG, "get folder count failed:" + e.toString());
-                } finally {
-                    cursor.close();
-                }
-            }
-        }
-        return count;
-    }
-
-    public static boolean visibleInNoteDatabase(ContentResolver resolver, long noteId, int type) {
-        Cursor cursor = resolver.query(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId),
-                null,
-                NoteColumns.TYPE + "=? AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER,
-                new String [] {String.valueOf(type)},
-                null);
-
-        boolean exist = false;
-        if (cursor != null) {
-            if (cursor.getCount() > 0) {
-                exist = true;
-            }
-            cursor.close();
-        }
-        return exist;
-    }
-
-    public static boolean existInNoteDatabase(ContentResolver resolver, long noteId) {
-        Cursor cursor = resolver.query(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId),
-                null, null, null, null);
-
-        boolean exist = false;
-        if (cursor != null) {
-            if (cursor.getCount() > 0) {
-                exist = true;
-            }
-            cursor.close();
-        }
-        return exist;
-    }
-
-    public static boolean existInDataDatabase(ContentResolver resolver, long dataId) {
-        Cursor cursor = resolver.query(ContentUris.withAppendedId(Notes.CONTENT_DATA_URI, dataId),
-                null, null, null, null);
-
-        boolean exist = false;
-        if (cursor != null) {
-            if (cursor.getCount() > 0) {
-                exist = true;
-            }
-            cursor.close();
-        }
-        return exist;
-    }
-
-    public static boolean checkVisibleFolderName(ContentResolver resolver, String name) {
-        Cursor cursor = resolver.query(Notes.CONTENT_NOTE_URI, null,
-                NoteColumns.TYPE + "=" + Notes.TYPE_FOLDER +
-                " AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER +
-                " AND " + NoteColumns.SNIPPET + "=?",
-                new String[] { name }, null);
-        boolean exist = false;
-        if(cursor != null) {
-            if(cursor.getCount() > 0) {
-                exist = true;
-            }
-            cursor.close();
-        }
-        return exist;
-    }
-
-    public static HashSet<AppWidgetAttribute> getFolderNoteWidget(ContentResolver resolver, long folderId) {
-        Cursor c = resolver.query(Notes.CONTENT_NOTE_URI,
-                new String[] { NoteColumns.WIDGET_ID, NoteColumns.WIDGET_TYPE },
-                NoteColumns.PARENT_ID + "=?",
-                new String[] { String.valueOf(folderId) },
-                null);
-
-        HashSet<AppWidgetAttribute> set = null;
-        if (c != null) {
-            if (c.moveToFirst()) {
-                set = new HashSet<AppWidgetAttribute>();
-                do {
-                    try {
-                        AppWidgetAttribute widget = new AppWidgetAttribute();
-                        widget.widgetId = c.getInt(0);
-                        widget.widgetType = c.getInt(1);
-                        set.add(widget);
-                    } catch (IndexOutOfBoundsException e) {
-                        Log.e(TAG, e.toString());
-                    }
-                } while (c.moveToNext());
-            }
-            c.close();
-        }
-        return set;
-    }
-
-    public static String getCallNumberByNoteId(ContentResolver resolver, long noteId) {
-        Cursor cursor = resolver.query(Notes.CONTENT_DATA_URI,
-                new String [] { CallNote.PHONE_NUMBER },
-                CallNote.NOTE_ID + "=? AND " + CallNote.MIME_TYPE + "=?",
-                new String [] { String.valueOf(noteId), CallNote.CONTENT_ITEM_TYPE },
-                null);
-
-        if (cursor != null && cursor.moveToFirst()) {
-            try {
-                return cursor.getString(0);
-            } catch (IndexOutOfBoundsException e) {
-                Log.e(TAG, "Get call number fails " + e.toString());
-            } finally {
-                cursor.close();
-            }
-        }
-        return "";
-    }
-
-    public static long getNoteIdByPhoneNumberAndCallDate(ContentResolver resolver, String phoneNumber, long callDate) {
-        Cursor cursor = resolver.query(Notes.CONTENT_DATA_URI,
-                new String [] { CallNote.NOTE_ID },
-                CallNote.CALL_DATE + "=? AND " + CallNote.MIME_TYPE + "=? AND PHONE_NUMBERS_EQUAL("
-                + CallNote.PHONE_NUMBER + ",?)",
-                new String [] { String.valueOf(callDate), CallNote.CONTENT_ITEM_TYPE, phoneNumber },
-                null);
-
-        if (cursor != null) {
-            if (cursor.moveToFirst()) {
-                try {
-                    return cursor.getLong(0);
-                } catch (IndexOutOfBoundsException e) {
-                    Log.e(TAG, "Get call note id fails " + e.toString());
-                }
-            }
-            cursor.close();
-        }
-        return 0;
-    }
-
-    public static String getSnippetById(ContentResolver resolver, long noteId) {
-        Cursor cursor = resolver.query(Notes.CONTENT_NOTE_URI,
-                new String [] { NoteColumns.SNIPPET },
-                NoteColumns.ID + "=?",
-                new String [] { String.valueOf(noteId)},
-                null);
-
-        if (cursor != null) {
-            String snippet = "";
-            if (cursor.moveToFirst()) {
-                snippet = cursor.getString(0);
-            }
-            cursor.close();
-            return snippet;
-        }
-        throw new IllegalArgumentException("Note is not found with id: " + noteId);
-    }
-
-    public static String getFormattedSnippet(String snippet) {
-        if (snippet != null) {
-            snippet = snippet.trim();
-            int index = snippet.indexOf('\n');
-            if (index != -1) {
-                snippet = snippet.substring(0, index);
-            }
-        }
-        return snippet;
-    }
-}

src/Notes1/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java.orig

@@ -1,113 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.micode.notes.tool;
-
-public class GTaskStringUtils {
-
-    public final static String GTASK_JSON_ACTION_ID = "action_id";
-
-    public final static String GTASK_JSON_ACTION_LIST = "action_list";
-
-    public final static String GTASK_JSON_ACTION_TYPE = "action_type";
-
-    public final static String GTASK_JSON_ACTION_TYPE_CREATE = "create";
-
-    public final static String GTASK_JSON_ACTION_TYPE_GETALL = "get_all";
-
-    public final static String GTASK_JSON_ACTION_TYPE_MOVE = "move";
-
-    public final static String GTASK_JSON_ACTION_TYPE_UPDATE = "update";
-
-    public final static String GTASK_JSON_CREATOR_ID = "creator_id";
-
-    public final static String GTASK_JSON_CHILD_ENTITY = "child_entity";
-
-    public final static String GTASK_JSON_CLIENT_VERSION = "client_version";
-
-    public final static String GTASK_JSON_COMPLETED = "completed";
-
-    public final static String GTASK_JSON_CURRENT_LIST_ID = "current_list_id";
-
-    public final static String GTASK_JSON_DEFAULT_LIST_ID = "default_list_id";
-
-    public final static String GTASK_JSON_DELETED = "deleted";
-
-    public final static String GTASK_JSON_DEST_LIST = "dest_list";
-
-    public final static String GTASK_JSON_DEST_PARENT = "dest_parent";
-
-    public final static String GTASK_JSON_DEST_PARENT_TYPE = "dest_parent_type";
-
-    public final static String GTASK_JSON_ENTITY_DELTA = "entity_delta";
-
-    public final static String GTASK_JSON_ENTITY_TYPE = "entity_type";
-
-    public final static String GTASK_JSON_GET_DELETED = "get_deleted";
-
-    public final static String GTASK_JSON_ID = "id";
-
-    public final static String GTASK_JSON_INDEX = "index";
-
-    public final static String GTASK_JSON_LAST_MODIFIED = "last_modified";
-
-    public final static String GTASK_JSON_LATEST_SYNC_POINT = "latest_sync_point";
-
-    public final static String GTASK_JSON_LIST_ID = "list_id";
-
-    public final static String GTASK_JSON_LISTS = "lists";
-
-    public final static String GTASK_JSON_NAME = "name";
-
-    public final static String GTASK_JSON_NEW_ID = "new_id";
-
-    public final static String GTASK_JSON_NOTES = "notes";
-
-    public final static String GTASK_JSON_PARENT_ID = "parent_id";
-
-    public final static String GTASK_JSON_PRIOR_SIBLING_ID = "prior_sibling_id";
-
-    public final static String GTASK_JSON_RESULTS = "results";
-
-    public final static String GTASK_JSON_SOURCE_LIST = "source_list";
-
-    public final static String GTASK_JSON_TASKS = "tasks";
-
-    public final static String GTASK_JSON_TYPE = "type";
-
-    public final static String GTASK_JSON_TYPE_GROUP = "GROUP";
-
-    public final static String GTASK_JSON_TYPE_TASK = "TASK";
-
-    public final static String GTASK_JSON_USER = "user";
-
-    public final static String MIUI_FOLDER_PREFFIX = "[MIUI_Notes]";
-
-    public final static String FOLDER_DEFAULT = "Default";
-
-    public final static String FOLDER_CALL_NOTE = "Call_Note";
-
-    public final static String FOLDER_META = "METADATA";
-
-    public final static String META_HEAD_GTASK_ID = "meta_gid";
-
-    public final static String META_HEAD_NOTE = "meta_note";
-
-    public final static String META_HEAD_DATA = "meta_data";
-
-    public final static String META_NOTE_NAME = "[META INFO] DON'T UPDATE AND DELETE";
-
-}

src/Notes1/app/src/main/java/net/micode/notes/tool/ResourceParser.java.orig

@@ -1,181 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.micode.notes.tool;
-
-import android.content.Context;
-import android.preference.PreferenceManager;
-
-import net.micode.notes.R;
-import net.micode.notes.ui.NotesPreferenceActivity;
-
-public class ResourceParser {
-
-    public static final int YELLOW           = 0;
-    public static final int BLUE             = 1;
-    public static final int WHITE            = 2;
-    public static final int GREEN            = 3;
-    public static final int RED              = 4;
-
-    public static final int BG_DEFAULT_COLOR = YELLOW;
-
-    public static final int TEXT_SMALL       = 0;
-    public static final int TEXT_MEDIUM      = 1;
-    public static final int TEXT_LARGE       = 2;
-    public static final int TEXT_SUPER       = 3;
-
-    public static final int BG_DEFAULT_FONT_SIZE = TEXT_MEDIUM;
-
-    public static class NoteBgResources {
-        private final static int [] BG_EDIT_RESOURCES = new int [] {
-            R.drawable.edit_yellow,
-            R.drawable.edit_blue,
-            R.drawable.edit_white,
-            R.drawable.edit_green,
-            R.drawable.edit_red
-        };
-
-        private final static int [] BG_EDIT_TITLE_RESOURCES = new int [] {
-            R.drawable.edit_title_yellow,
-            R.drawable.edit_title_blue,
-            R.drawable.edit_title_white,
-            R.drawable.edit_title_green,
-            R.drawable.edit_title_red
-        };
-
-        public static int getNoteBgResource(int id) {
-            return BG_EDIT_RESOURCES[id];
-        }
-
-        public static int getNoteTitleBgResource(int id) {
-            return BG_EDIT_TITLE_RESOURCES[id];
-        }
-    }
-
-    public static int getDefaultBgId(Context context) {
-        if (PreferenceManager.getDefaultSharedPreferences(context).getBoolean(
-                NotesPreferenceActivity.PREFERENCE_SET_BG_COLOR_KEY, false)) {
-            return (int) (Math.random() * NoteBgResources.BG_EDIT_RESOURCES.length);
-        } else {
-            return BG_DEFAULT_COLOR;
-        }
-    }
-
-    public static class NoteItemBgResources {
-        private final static int [] BG_FIRST_RESOURCES = new int [] {
-            R.drawable.list_yellow_up,
-            R.drawable.list_blue_up,
-            R.drawable.list_white_up,
-            R.drawable.list_green_up,
-            R.drawable.list_red_up
-        };
-
-        private final static int [] BG_NORMAL_RESOURCES = new int [] {
-            R.drawable.list_yellow_middle,
-            R.drawable.list_blue_middle,
-            R.drawable.list_white_middle,
-            R.drawable.list_green_middle,
-            R.drawable.list_red_middle
-        };
-
-        private final static int [] BG_LAST_RESOURCES = new int [] {
-            R.drawable.list_yellow_down,
-            R.drawable.list_blue_down,
-            R.drawable.list_white_down,
-            R.drawable.list_green_down,
-            R.drawable.list_red_down,
-        };
-
-        private final static int [] BG_SINGLE_RESOURCES = new int [] {
-            R.drawable.list_yellow_single,
-            R.drawable.list_blue_single,
-            R.drawable.list_white_single,
-            R.drawable.list_green_single,
-            R.drawable.list_red_single
-        };
-
-        public static int getNoteBgFirstRes(int id) {
-            return BG_FIRST_RESOURCES[id];
-        }
-
-        public static int getNoteBgLastRes(int id) {
-            return BG_LAST_RESOURCES[id];
-        }
-
-        public static int getNoteBgSingleRes(int id) {
-            return BG_SINGLE_RESOURCES[id];
-        }
-
-        public static int getNoteBgNormalRes(int id) {
-            return BG_NORMAL_RESOURCES[id];
-        }
-
-        public static int getFolderBgRes() {
-            return R.drawable.list_folder;
-        }
-    }
-
-    public static class WidgetBgResources {
-        private final static int [] BG_2X_RESOURCES = new int [] {
-            R.drawable.widget_2x_yellow,
-            R.drawable.widget_2x_blue,
-            R.drawable.widget_2x_white,
-            R.drawable.widget_2x_green,
-            R.drawable.widget_2x_red,
-        };
-
-        public static int getWidget2xBgResource(int id) {
-            return BG_2X_RESOURCES[id];
-        }
-
-        private final static int [] BG_4X_RESOURCES = new int [] {
-            R.drawable.widget_4x_yellow,
-            R.drawable.widget_4x_blue,
-            R.drawable.widget_4x_white,
-            R.drawable.widget_4x_green,
-            R.drawable.widget_4x_red
-        };
-
-        public static int getWidget4xBgResource(int id) {
-            return BG_4X_RESOURCES[id];
-        }
-    }
-
-    public static class TextAppearanceResources {
-        private final static int [] TEXTAPPEARANCE_RESOURCES = new int [] {
-            R.style.TextAppearanceNormal,
-            R.style.TextAppearanceMedium,
-            R.style.TextAppearanceLarge,
-            R.style.TextAppearanceSuper
-        };
-
-        public static int getTexAppearanceResource(int id) {
-            /**
-             * HACKME: Fix bug of store the resource id in shared preference.
-             * The id may larger than the length of resources, in this case,
-             * return the {@link ResourceParser#BG_DEFAULT_FONT_SIZE}
-             */
-            if (id >= TEXTAPPEARANCE_RESOURCES.length) {
-                return BG_DEFAULT_FONT_SIZE;
-            }
-            return TEXTAPPEARANCE_RESOURCES[id];
-        }
-
-        public static int getResourcesSize() {
-            return TEXTAPPEARANCE_RESOURCES.length;
-        }
-    }
-}

src/Notes1/app/src/main/java/net/micode/notes/ui/DrawActivity.java

@@ -1,281 +0,0 @@
-package net.micode.notes.ui;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Matrix;
-import android.graphics.Paint;
-
-import android.os.Bundle;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewTreeObserver;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.ImageButton;
-import android.widget.ImageView;
-
-import net.micode.notes.R;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-public class DrawActivity extends Activity {
-    private ImageView img;
-    private Bitmap mBitmap;
-    private Canvas canvas;
-    private Paint paint;
-    // 重置按钮
-    private ImageButton reset_btn;
-    private ImageButton save_paint;
-    private ImageButton change_thickness;
-    private ImageButton change_color;
-    private boolean if_draw = false;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_second);
-        img = (ImageView) findViewById(R.id.draw);
-        reset_btn = (ImageButton) findViewById(R.id.reset);
-        reset_btn.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                img.setImageBitmap(null);
-                showImage();
-            }
-        });
-        save_paint = (ImageButton)findViewById(R.id.save);
-        save_paint.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                if (if_draw) {
-                    String path = saveBitmap();
-                    getIntent().putExtra("path", path);
-                    setResult(1, getIntent());
-                    Log.i(null, path);
-                }
-                finish();
-            }
-        });
-        change_thickness = findViewById(R.id.change_thickness);
-        change_thickness.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                changeThickness();
-            }
-        });
-        change_color = findViewById(R.id.change_pen_color);
-        change_color.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                changeColor();
-            }
-        });
-        // 绘图
-        showImage();
-    }
-
-    private void showImage() {
-        ImageView paintMap = (ImageView) findViewById(R.id.draw);
-        ViewTreeObserver vto = paintMap.getViewTreeObserver();
-        vto.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
-            @Override
-            public void onGlobalLayout() {
-                paintMap.getViewTreeObserver();
-                // 获取线性布局控件的高
-                int height = paintMap.getHeight();
-                // 获取线性布局控件的宽
-                int width = paintMap.getWidth();
-                //按照画布控件大小创建画布
-                mBitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
-                // 创建一张画布
-                canvas = new Canvas(mBitmap);
-                // 画布背景为白色
-                canvas.drawColor(Color.WHITE);
-                // 创建画笔
-                paint = new Paint();
-                // 画笔颜色为蓝色
-                paint.setColor(Color.BLUE);
-                // 宽度5个像素
-                paint.setStrokeWidth(10);
-                //接缝处圆滑
-                paint.setStrokeCap(Paint.Cap.ROUND);
-                paint.setStrokeJoin(Paint.Join.ROUND);
-                // 先将白色背景画上
-                canvas.drawBitmap(mBitmap, new Matrix(), paint);
-                img.setImageBitmap(mBitmap);
-
-                img.setOnTouchListener(new View.OnTouchListener() {
-                    int startX;
-                    int startY;
-                    @Override
-                    public boolean onTouch(View v, MotionEvent event) {
-                        if_draw = true;
-                        switch (event.getAction()) {
-                            case MotionEvent.ACTION_DOWN:
-                                // 获取手按下时的坐标
-                                startX = (int) event.getX();
-                                startY = (int) event.getY();
-                                break;
-                            case MotionEvent.ACTION_MOVE:
-                                // 获取手移动后的坐标
-                                int endX = (int) event.getX();
-                                int endY = (int) event.getY();
-                                // 在开始和结束坐标间画一条线
-                                canvas.drawLine(startX, startY, endX, endY, paint);
-                                // 刷新开始坐标
-                                startX = (int) event.getX();
-                                startY = (int) event.getY();
-                                img.setImageBitmap(mBitmap);
-                                break;
-                            default:
-                                break;
-                        }
-                        return true;
-                    }
-                });
-            }
-        });
-    }
-
-    private void showSoftInput() {
-        InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-        if (inputMethodManager != null) {
-            inputMethodManager.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0);
-        }
-    }
-
-    private void hideSoftInput(View view) {
-        InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-        inputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), 0);
-    }
-
-    public void changeThickness(){
-        final AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        //输入框控件实例化
-        View view = LayoutInflater.from(this).inflate(R.layout.change_thickness, null);
-        final EditText et_change_color = (EditText) view.findViewById(R.id.et_change_thickness);
-        //显示软件盘
-        showSoftInput();
-        builder.setTitle("Please enter the brush thickness (1-30)");
-        builder.setPositiveButton(android.R.string.ok, null);
-        //设置取消按钮监听
-        builder.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
-            public void onClick(DialogInterface dialog, int which) {
-                hideSoftInput(et_change_color);
-            }
-        });
-        //显示输入框控件
-        final Dialog enter_password_dialog = builder.setView(view).show();
-        final Button positive = (Button)enter_password_dialog.findViewById(android.R.id.button1);
-        positive.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View v) {
-                hideSoftInput(et_change_color);
-                String entered_Thickness = et_change_color.getText().toString();
-                float Thickness = Integer.valueOf(entered_Thickness).floatValue();
-                Log.i(null, String.valueOf(Thickness));
-                paint.setStrokeWidth((Thickness-1) * 10 + 5);
-                enter_password_dialog.dismiss();
-            }
-        });
-    }
-
-    private AlertDialog alertDialog2;
-
-    public void changeColor() {
-        final String[] items = {"Red", "Yellow", "Green", "Blue", "Black", "Pink", "Orange", "Turquoise","Gray"};
-        AlertDialog.Builder alertBuilder = new AlertDialog.Builder(this);
-        alertBuilder.setTitle("Please select the color");
-        alertBuilder.setSingleChoiceItems(items, 0, new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialogInterface, int i) {
-                switch (i) {
-                    case 0:
-                        paint.setColor(Color.RED);
-                        break;
-                    case 1:
-                        paint.setColor(getResources().getColor(R.color.gold));
-                        break;
-                    case 2:
-                        paint.setColor(getResources().getColor(R.color.green));
-                        break;
-                    case 3:
-                        paint.setColor(Color.BLUE);
-                        break;
-                    case 4:
-                        paint.setColor(Color.BLACK);
-                        break;
-                    case 5:
-                        paint.setColor(getResources().getColor(R.color.pink));
-                        break;
-                    case 6:
-                        paint.setColor(getResources().getColor(R.color.orange));
-                        break;
-                    case 7:
-                        paint.setColor(getResources().getColor(R.color.turquoise));
-                        break;
-                    case 8:
-                        paint.setColor(getResources().getColor(R.color.darkgray));
-                        break;
-                    default:
-                        break;
-                }
-                alertDialog2.dismiss();
-            }
-        });
-        alertDialog2 = alertBuilder.create();
-        alertDialog2.show();
-    }
-    
-    public String saveBitmap(){
-        //获得系统当前时间，并以该时间作为文件名
-        SimpleDateFormat formatter   =   new SimpleDateFormat("yyyyMMddHHmmss");
-        Date curDate   =   new Date(System.currentTimeMillis());//获取当前时间
-        String   str   =   formatter.format(curDate);
-        String paintPath = "";
-        str = str + "paint.jpg";
-        File dir = new File("/sdcard/DCIM/Camera");
-        File file = new File("/sdcard/DCIM/Camera",str);
-        if (!dir.exists()) {
-            dir.mkdir();
-        }
-        else{
-            if(file.exists()){
-                file.delete();
-            }
-        }
-
-        try {
-            FileOutputStream out = new FileOutputStream(file);
-            mBitmap.compress(Bitmap.CompressFormat.PNG, 100, out);
-            out.flush();
-            out.close();
-            //保存绘图文件路径
-            paintPath = "/storage/sdcard/DCIM/Camera/" + str;
-
-
-        } catch (FileNotFoundException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        } catch (IOException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
-        return paintPath;
-    }
-
-
-}

src/Notes1/app/src/main/java/net/micode/notes/ui/JsonParser.java

@@ -1,84 +0,0 @@
-package net.micode.notes.ui;
-
-import org.json.JSONArray;
-import org.json.JSONObject;
-import org.json.JSONTokener;
-
-public class JsonParser {
-    public static String parseIatResult(String json) {
-        StringBuffer ret = new StringBuffer() ;
-        try {
-            JSONTokener tokener = new JSONTokener(json) ;
-            JSONObject joResult = new JSONObject(tokener) ;
-
-            JSONArray words = joResult.getJSONArray("ws" );
-            for (int i = 0; i < words.length(); i++) {
-                JSONArray items = words.getJSONObject(i).getJSONArray("cw" );
-                JSONObject obj = items.getJSONObject(0 );
-                ret.append(obj.getString("w" ));
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return ret.toString();
-    }
-
-    public static String parseGrammarResult(String json) {
-        StringBuffer ret = new StringBuffer() ;
-        try {
-            JSONTokener tokener = new JSONTokener(json) ;
-            JSONObject joResult = new JSONObject(tokener) ;
-
-            JSONArray words = joResult.getJSONArray("ws" );
-            for (int i = 0; i < words.length(); i++) {
-                JSONArray items = words.getJSONObject(i).getJSONArray("cw" );
-                for (int j = 0; j < items.length() ; j++)
-                {
-                    JSONObject obj = items.getJSONObject(j);
-                    if (obj.getString("w").contains( "nomatch"))
-                    {
-                        ret.append( "没有匹配结果.") ;
-                        return ret.toString();
-                    }
-                    ret.append( "【结果】" + obj.getString("w" ));
-                    ret.append("【置信度】 " + obj.getInt("sc" ));
-                    ret.append("\n ");
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            ret.append(" 没有匹配结果 .");
-        }
-        return ret.toString();
-    }
-
-    public static String parseLocalGrammarResult(String json) {
-        StringBuffer ret = new StringBuffer() ;
-        try {
-            JSONTokener tokener = new JSONTokener(json) ;
-            JSONObject joResult = new JSONObject(tokener) ;
-
-            JSONArray words = joResult.getJSONArray("ws" );
-            for (int i = 0; i < words.length(); i++) {
-                JSONArray items = words.getJSONObject(i).getJSONArray("cw" );
-                for (int j = 0; j < items.length() ; j++)
-                {
-                    JSONObject obj = items.getJSONObject(j);
-                    if (obj.getString("w").contains( "nomatch"))
-                    {
-                        ret.append( "没有匹配结果.") ;
-                        return ret.toString();
-                    }
-                    ret.append( "【结果】" + obj.getString("w" ));
-                    ret.append("\n ");
-                }
-            }
-            ret.append("【置信度】 " + joResult.optInt("sc" ));
-
-        } catch (Exception e) {
-            e.printStackTrace();
-            ret.append(" 没有匹配结果 .");
-        }
-        return ret.toString();
-    }
-}

src/Notes1/app/src/main/res/layout/activity_second.xml

@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/img"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <ImageView
-        android:id="@+id/draw"
-        android:layout_width="500dp"
-        android:layout_height="660dp"
-        android:layout_weight="1"
-        android:contentDescription="@string/painting"
-
-        android:visibility="visible"
-        tools:src="@drawable/white"
-        tools:visibility="visible" />
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="80dp"
-        android:layout_alignBottom="@+id/draw"
-        android:layout_marginBottom="-5dp">
-
-        <ImageButton
-            android:id="@+id/save"
-            android:layout_width="67dp"
-            android:layout_height="70dp"
-            android:layout_gravity="center"
-            android:layout_marginLeft="37dp"
-            android:layout_marginTop="1dp"
-            android:layout_weight="0"
-            android:background="@drawable/baocun"
-            android:contentDescription="@string/return_note"
-            android:scaleType="centerInside"
-            android:visibility="visible"
-            tools:visibility="visible" />
-
-        <ImageButton
-            android:id="@+id/reset"
-            android:layout_width="87dp"
-            android:layout_height="match_parent"
-            android:layout_marginLeft="15dp"
-            android:layout_weight="0"
-            android:background="@drawable/qingkong"
-            android:scaleType="centerCrop"
-            android:visibility="visible"
-            tools:visibility="visible" />
-
-        <ImageButton
-            android:id="@+id/change_pen_color"
-            android:layout_width="63dp"
-            android:layout_height="63dp"
-            android:layout_gravity="center"
-            android:layout_marginLeft="15dp"
-            android:layout_weight="0"
-
-            android:background="@drawable/huihua"
-            android:scaleType="centerCrop" />
-
-        <ImageButton
-            android:id="@+id/change_thickness"
-            android:layout_width="80dp"
-            android:layout_height="match_parent"
-            android:layout_gravity="center"
-            android:layout_marginLeft="15dp"
-            android:layout_weight="0"
-            android:background="@drawable/xiantiaocuxi" />
-
-
-    </LinearLayout>
-
-</RelativeLayout>

src/Notes1/app/src/main/res/layout/change_color.xml

@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<RadioGroup
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/et_change_color"
-    android:layout_width="fill_parent"
-    android:hint="请选择颜色"
-    android:layout_height="fill_parent" >
-
-    <RadioButton
-        android:id="@+id/radioButton"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="48dp"
-        android:text="Red" />
-
-    <RadioButton
-        android:id="@+id/radioButton2"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="48dp"
-        android:text="Yellow" />
-
-    <RadioButton
-        android:id="@+id/radioButton3"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="48dp"
-        android:text="Blue" />
-
-    <RadioButton
-        android:id="@+id/radioButton4"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="48dp"
-        android:text="Green" />
-
-    <RadioButton
-        android:id="@+id/radioButton5"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="48dp"
-        android:text="Purple" />
-
-    <RadioButton
-        android:id="@+id/radioButton6"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="48dp"
-        android:text="Pink" />
-
-    <RadioButton
-        android:id="@+id/radioButton7"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="48dp"
-        android:text="Black" />
-</RadioGroup>

src/Notes1/app/src/main/res/layout/change_thickness.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<EditText
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/et_change_thickness"
-    android:layout_width="fill_parent"
-    android:hint="请输入画笔粗细"
-    android:layout_height="fill_parent" />

src/Notes1/app/src/main/res/layout/trash_folder_list.xml

@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical">
-    <!--android:background="@drawable/list_background"-->
-
-
-
-        <TextView
-            android:id="@+id/tv_title_bar"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:background="@drawable/title_bar_bg"
-            android:visibility="gone"
-            android:gravity="center_vertical"
-            android:singleLine="true"
-            android:textColor="#FFEAD1AE"
-            android:textSize="@dimen/text_font_size_medium" />
-
-        <ListView
-            android:id="@+id/notes_list"
-            android:layout_width="fill_parent"
-            android:layout_height="0dip"
-            android:layout_weight="1"
-            android:cacheColorHint="@null"
-            android:listSelector="@android:color/transparent"
-            android:divider="@null"
-            android:fadingEdge="@null" />
-
-
-</LinearLayout>

src/Notes1/app/src/main/res/values/colors.xml

@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-        <color name="user_query_highlight">#335b5b5b</color>
-
-        <color name="white">#ffffff</color> <!-- 白色 -->
-        <color name="ivory">#fffff0</color> <!-- 象牙色 -->
-        <color name="lightyellow">#ffffe0</color> <!-- 亮黄色 -->
-        <color name="yellow">#ffff00</color> <!-- 黄色 -->
-        <color name="snow">#fffafa</color> <!-- 雪白色 -->
-        <color name="floralwhite">#fffaf0</color> <!-- 花白色 -->
-        <color name="lemonchiffon">#fffacd</color> <!-- 柠檬绸色 -->
-        <color name="cornsilk">#fff8dc</color> <!-- 米绸色 -->
-        <color name="seaShell">#fff5ee</color> <!-- 海贝色 -->
-        <color name="lavenderblush">#fff0f5</color> <!-- 淡紫红 -->
-        <color name="papayawhip">#ffefd5</color> <!-- 番木色 -->
-        <color name="blanchedalmond">#ffebcd</color> <!-- 白杏色 -->
-        <color name="mistyrose">#ffe4e1</color> <!-- 浅玫瑰色 -->
-        <color name="bisque">#ffe4c4</color> <!-- 桔黄色 -->
-        <color name="moccasin">#ffe4b5</color> <!-- 鹿皮色 -->
-        <color name="navajowhite">#ffdead</color> <!-- 纳瓦白 -->
-        <color name="peachpuff">#ffdab9</color> <!-- 桃色 -->
-        <color name="gold">#ffd700</color> <!-- 金色 -->
-        <color name="pink">#ffc0cb</color> <!-- 粉红色 -->
-        <color name="lightpink">#ffb6c1</color> <!-- 亮粉红色 -->
-        <color name="orange">#ffa500</color> <!-- 橙色 -->
-        <color name="lightsalmon">#ffa07a</color> <!-- 亮肉色 -->
-        <color name="darkorange">#ff8c00</color> <!-- 暗桔黄色 -->
-        <color name="coral">#ff7f50</color> <!-- 珊瑚色 -->
-        <color name="hotpink">#ff69b4</color> <!-- 热粉红色 -->
-        <color name="tomato">#ff6347</color> <!-- 西红柿色 -->
-        <color name="orangered">#ff4500</color> <!-- 红橙色 -->
-        <color name="deeppink">#ff1493</color> <!-- 深粉红色 -->
-        <color name="fuchsia">#ff00ff</color> <!-- 紫红色 -->
-        <color name="magenta">#ff00ff</color> <!-- 红紫色 -->
-        <color name="red">#ff0000</color> <!-- 红色 -->
-        <color name="oldlace">#fdf5e6</color> <!-- 老花色 -->
-        <color name="lightgoldenrodyellow">#fafad2</color> <!-- 亮金黄色 -->
-        <color name="linen">#faf0e6</color> <!-- 亚麻色 -->
-        <color name="antiquewhite">#faebd7</color> <!-- 古董白 -->
-        <color name="salmon">#fa8072</color> <!-- 鲜肉色 -->
-        <color name="ghostwhite">#f8f8ff</color> <!-- 幽灵白 -->
-        <color name="mintcream">#f5fffa</color> <!-- 薄荷色 -->
-        <color name="whitesmoke">#f5f5f5</color> <!-- 烟白色 -->
-        <color name="beige">#f5f5dc</color> <!-- 米色 -->
-        <color name="wheat">#f5deb3</color> <!-- 浅黄色 -->
-        <color name="sandybrown">#f4a460</color> <!-- 沙褐色 -->
-        <color name="azure">#f0ffff</color> <!-- 天蓝色 -->
-        <color name="honeydew">#f0fff0</color> <!-- 蜜色 -->
-        <color name="aliceblue">#f0f8ff</color> <!-- 艾利斯兰 -->
-        <color name="khaki">#f0e68c</color> <!-- 黄褐色 -->
-        <color name="lightcoral">#f08080</color> <!-- 亮珊瑚色 -->
-        <color name="palegoldenrod">#eee8aa</color> <!-- 苍麒麟色 -->
-        <color name="violet">#ee82ee</color> <!-- 紫罗兰色 -->
-        <color name="darksalmon">#e9967a</color> <!-- 暗肉色 -->
-        <color name="lavender">#e6e6fa</color> <!-- 淡紫色 -->
-        <color name="lightcyan">#e0ffff</color> <!-- 亮青色 -->
-        <color name="burlywood">#deb887</color> <!-- 实木色 -->
-        <color name="plum">#dda0dd</color> <!-- 洋李色 -->
-        <color name="gainsboro">#dcdcdc</color> <!-- 淡灰色 -->
-        <color name="crimson">#dc143c</color> <!-- 暗深红色 -->
-        <color name="palevioletred">#db7093</color> <!-- 苍紫罗兰色 -->
-        <color name="goldenrod">#daa520</color> <!-- 金麒麟色 -->
-        <color name="orchid">#da70d6</color> <!-- 淡紫色 -->
-        <color name="thistle">#d8bfd8</color> <!-- 蓟色 -->
-        <color name="lightgray">#d3d3d3</color> <!-- 亮灰色 -->
-        <color name="tan">#d2b48c</color> <!-- 茶色 -->
-        <color name="chocolate">#d2691e</color> <!-- 巧可力色 -->
-        <color name="peru">#cd853f</color> <!-- 秘鲁色 -->
-        <color name="indianred">#cd5c5c</color> <!-- 印第安红 -->
-        <color name="mediumvioletred">#c71585</color> <!-- 中紫罗兰色 -->
-        <color name="silver">#c0c0c0</color> <!-- 银色 -->
-        <color name="darkkhaki">#bdb76b</color> <!-- 暗黄褐色 -->
-        <color name="rosybrown">#bc8f8f</color> <!-- 褐玫瑰红 -->
-        <color name="mediumorchid">#ba55d3</color> <!-- 中粉紫色 -->
-        <color name="darkgoldenrod">#b8860b</color> <!-- 暗金黄色 -->
-        <color name="firebrick">#b22222</color> <!-- 火砖色 -->
-        <color name="powderblue">#b0e0e6</color> <!-- 粉蓝色 -->
-        <color name="lightsteelblue">#b0c4de</color> <!-- 亮钢兰色 -->
-        <color name="paleturquoise">#afeeee</color> <!-- 苍宝石绿 -->
-        <color name="greenyellow">#adff2f</color> <!-- 黄绿色 -->
-        <color name="lightblue">#add8e6</color> <!-- 亮蓝色 -->
-        <color name="darkgray">#a9a9a9</color> <!-- 暗灰色 -->
-        <color name="brown">#a52a2a</color> <!-- 褐色 -->
-        <color name="sienna">#a0522d</color> <!-- 赭色 -->
-        <color name="darkorchid">#9932cc</color> <!-- 暗紫色 -->
-        <color name="palegreen">#98fb98</color> <!-- 苍绿色 -->
-        <color name="darkviolet">#9400d3</color> <!-- 暗紫罗兰色 -->
-        <color name="mediumpurple">#9370db</color> <!-- 中紫色 -->
-        <color name="lightgreen">#90ee90</color> <!-- 亮绿色 -->
-        <color name="darkseagreen">#8fbc8f</color> <!-- 暗海兰色 -->
-        <color name="saddlebrown">#8b4513</color> <!-- 重褐色 -->
-        <color name="darkmagenta">#8b008b</color> <!-- 暗洋红 -->
-        <color name="darkred">#8b0000</color> <!-- 暗红色 -->
-        <color name="blueviolet">#8a2be2</color> <!-- 紫罗兰蓝色 -->
-        <color name="lightskyblue">#87cefa</color> <!-- 亮天蓝色 -->
-        <color name="skyblue">#87ceeb</color> <!-- 天蓝色 -->
-        <color name="gray">#808080</color> <!-- 灰色 -->
-        <color name="grey">#808080</color> <!-- 灰色 -->
-        <color name="olive">#808000</color> <!-- 橄榄色 -->
-        <color name="purple">#800080</color> <!-- 紫色 -->
-        <color name="maroon">#800000</color> <!-- 粟色 -->
-        <color name="aquamarine">#7fffd4</color> <!-- 碧绿色 -->
-        <color name="chartreuse">#7fff00</color> <!-- 黄绿色 -->
-        <color name="lawngreen">#7cfc00</color> <!-- 草绿色 -->
-        <color name="mediumslateblue">#7b68ee</color> <!-- 中暗蓝色 -->
-        <color name="lightslategray">#778899</color> <!-- 亮蓝灰 -->
-        <color name="lightslategrey">#778899</color> <!-- 亮蓝灰 -->
-        <color name="slategray">#708090</color> <!-- 灰石色 -->
-        <color name="slategrey">#708090</color> <!-- 灰石色 -->
-        <color name="olivedrab">#6b8e23</color> <!-- 深绿褐色 -->
-        <color name="slateblue">#6a5acd</color> <!-- 石蓝色 -->
-        <color name="dimgray">#696969</color> <!-- 暗灰色 -->
-        <color name="dimgrey">#696969</color> <!-- 暗灰色 -->
-        <color name="mediumaquamarine">#66cdaa</color> <!-- 中绿色 -->
-        <color name="cornflowerblue">#6495ed</color> <!-- 菊兰色 -->
-        <color name="cadetblue">#5f9ea0</color> <!-- 军兰色 -->
-        <color name="darkolivegreen">#556b2f</color> <!-- 暗橄榄绿 -->
-        <color name="indigo">#4b0082</color> <!-- 靛青色 -->
-        <color name="mediumturquoise">#48d1cc</color> <!-- 中绿宝石 -->
-        <color name="darkslateblue">#483d8b</color> <!-- 暗灰蓝色 -->
-        <color name="steelblue">#4682b4</color> <!-- 钢兰色 -->
-        <color name="royalblue">#4169e1</color> <!-- 皇家蓝 -->
-        <color name="turquoise">#40e0d0</color> <!-- 青绿色 -->
-        <color name="mediumseagreen">#3cb371</color> <!-- 中海蓝 -->
-        <color name="limegreen">#32cd32</color> <!-- 橙绿色 -->
-        <color name="darkslategray">#2f4f4f</color> <!-- 暗瓦灰色 -->
-        <color name="darkslategrey">#2f4f4f</color> <!-- 暗瓦灰色 -->
-        <color name="seagreen">#2e8b57</color> <!-- 海绿色 -->
-        <color name="forestgreen">#228b22</color> <!-- 森林绿 -->
-        <color name="lightseagreen">#20b2aa</color> <!-- 亮海蓝色 -->
-        <color name="dodgerblue">#1e90ff</color> <!-- 闪兰色 -->
-        <color name="midnightblue">#191970</color> <!-- 中灰兰色 -->
-        <color name="aqua">#00ffff</color> <!-- 浅绿色 -->
-        <color name="cyan">#00ffff</color> <!-- 青色 -->
-        <color name="springgreen">#00ff7f</color> <!-- 春绿色 -->
-        <color name="lime">#00ff00</color> <!-- 酸橙色 -->
-        <color name="mediumspringgreen">#00fa9a</color> <!-- 中春绿色 -->
-        <color name="darkturquoise">#00ced1</color> <!-- 暗宝石绿 -->
-        <color name="deepskyblue">#00bfff</color> <!-- 深天蓝色 -->
-        <color name="darkcyan">#008b8b</color> <!-- 暗青色 -->
-        <color name="teal">#008080</color> <!-- 水鸭色 -->
-        <color name="green">#008000</color> <!-- 绿色 -->
-        <color name="darkgreen">#006400</color> <!-- 暗绿色 -->
-        <color name="blue">#0000ff</color> <!-- 蓝色 -->
-        <color name="mediumblue">#0000cd</color> <!-- 中兰色 -->
-        <color name="darkblue">#00008b</color> <!-- 暗蓝色 -->
-        <color name="navy">#000080</color> <!-- 海军色 -->
-        <color name="black">#000000</color> <!-- 黑色 -->
-
-</resources>

src/Notes1/app/src/main/res/xml/file_paths.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<paths xmlns:android="http://schemas.android.com/apk/res/android">
-    <external-path
-        name="img"
-        path=""
-        >
-    </external-path>
-</paths>

src/app/src/main/AndroidManifest.xml

@@ -21,7 +21,7 @@
     android:versionCode="1"
     android:versionName="0.1" >
 
-    <uses-sdk android:minSdkVersion="19" />
+    <uses-sdk android:minSdkVersion="14" />
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
@@ -34,17 +34,7 @@
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.INTERNET" />
+
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.WRITE_SETTINGS"
-        tools:ignore="ProtectedPermissions" />
     <application
         android:icon="@drawable/icon_app"
         android:label="@string/app_name" >
@@ -94,21 +84,6 @@
                 android:resource="@xml/searchable" />
         </activity>
 
-        <activity
-            android:name=".ui.DrawActivity"
-            android:theme ="@android:style/Theme.NoTitleBar.Fullscreen"
-            />
-
-        <provider
-            android:authorities="com.example.cameraalbumtest.fileprovider"
-            android:name="androidx.core.content.FileProvider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_paths"
-                />
-        </provider>
         <provider
             android:name="net.micode.notes.data.NotesProvider"
             android:authorities="micode_notes"

src/app/src/main/java/net/micode/notes/data/Notes.java

@@ -165,7 +165,6 @@ public class Notes {
          * <P> Type : INTEGER (long) </P>
          */
         public static final String VERSION = "version";
-        public static final String GROUP = "group_num";
     }
 
     public interface DataColumns {

src/app/src/main/java/net/micode/notes/gtask/data/TaskList.java

@@ -201,13 +201,7 @@ public class TaskList extends Node {
                     Log.e(TAG, "gtask id doesn't match");
                     return SYNC_ACTION_ERROR;
                 }
-                if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) {
+                return SYNC_ACTION_UPDATE_REMOTE;
-                    // local modification only
-                    return SYNC_ACTION_UPDATE_REMOTE;
-                } else {
-                    // for folder conflicts, just apply local modification
-                    return SYNC_ACTION_UPDATE_REMOTE;
-                }
             }
         } catch (Exception e) {
             Log.e(TAG, e.toString());

src/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java

@@ -306,8 +306,7 @@ public class GTaskClient {
             input = new InflaterInputStream(entity.getContent(), inflater);
         }
 
-        try {
+        try(InputStreamReader isr = new InputStreamReader(input)) {
-            InputStreamReader isr = new InputStreamReader(input);
             BufferedReader br = new BufferedReader(isr);
             StringBuilder sb = new StringBuilder();
 

src/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java

@@ -333,12 +333,7 @@ public class GTaskManager {
         }
 
         // go through remaining items
-        Iterator<Map.Entry<String, Node>> iter = mGTaskHashMap.entrySet().iterator();
+
-        while (iter.hasNext()) {
-            Map.Entry<String, Node> entry = iter.next();
-            node = entry.getValue();
-            doContentSync(Node.SYNC_ACTION_ADD_LOCAL, node, null);
-        }
 
         // mCancelled can be set by another thread, so we neet to check one by
         // one

src/app/src/main/java/net/micode/notes/tool/BackupUtils.java

@@ -295,8 +295,7 @@ public class BackupUtils {
             mFileName = file.getName();
             mFileDirectory = mContext.getString(R.string.file_path);
             PrintStream ps = null;
-            try {
+            try (FileOutputStream fos = new FileOutputStream(file)){
-                FileOutputStream fos = new FileOutputStream(file);
                 ps = new PrintStream(fos);
             } catch (FileNotFoundException e) {
                 e.printStackTrace();
@@ -304,10 +303,10 @@ public class BackupUtils {
             } catch (NullPointerException e) {
                 e.printStackTrace();
                 return null;
-            } /*catch (IOException f) {
+            } catch (IOException e) {
-                f.printStackTrace();
+                e.printStackTrace();
                 return null;
-            }*/
+            }
             return ps;
         }
     }

src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java

@@ -16,6 +16,7 @@
 
 package net.micode.notes.ui;
 
+import android.Manifest;
 import android.app.Activity;
 import android.app.AlarmManager;
 import android.app.AlertDialog;
@@ -29,14 +30,19 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Paint;
-import android.graphics.Typeface;
+import android.location.Address;
+import android.location.Geocoder;
+import android.location.Location;
+import android.location.LocationListener;
 import android.location.LocationManager;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.Environment;
 import android.preference.PreferenceManager;
 import android.provider.MediaStore;
 import android.text.Editable;
@@ -44,7 +50,6 @@ import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.Spanned;
 import android.text.TextUtils;
-import android.text.TextWatcher;
 import android.text.format.DateUtils;
 import android.text.style.BackgroundColorSpan;
 import android.text.style.ImageSpan;
@@ -62,15 +67,11 @@ import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.EditText;
-import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import android.speech.tts.TextToSpeech;
-import android.speech.tts.TextToSpeech.OnInitListener;
-
 import net.micode.notes.R;
 import net.micode.notes.data.Notes;
 import net.micode.notes.data.Notes.TextNote;
@@ -87,21 +88,29 @@ import net.micode.notes.widget.NoteWidgetProvider_2x;
 import net.micode.notes.widget.NoteWidgetProvider_4x;
 
 import java.io.BufferedReader;
+import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.security.Timestamp;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Vector;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
+import android.support.v13.app.ActivityCompat;
 
 public class NoteEditActivity extends Activity implements OnClickListener,
         NoteSettingChangedListener, OnTextViewChangeListener {
-    private static class HeadViewHolder {
+    public static final int LOCATION_CODE = 301;
+    private LocationManager locationManager;
+    private String locationProvider = null;
+    private class HeadViewHolder {
         public TextView tvModified;
 
         public ImageView ivAlertIcon;
@@ -109,12 +118,6 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         public TextView tvAlertDate;
 
         public ImageView ibSetBgColor;
-
-        public ImageView startDraw;
-
-        public ImageButton note_Read;
-
-        private static ImageButton note_revoke;
     }
 
     private static final Map<Integer, Integer> sBgSelectorBtnsMap = new HashMap<Integer, Integer>();
@@ -165,14 +168,10 @@ public class NoteEditActivity extends Activity implements OnClickListener,
 
     private EditText mNoteEditor;
 
-    private Vector<SpannableString> mHistory = new Vector<SpannableString>(10);
-
     private View mNoteEditorPanel;
 
     private WorkingNote mWorkingNote;
 
-    private boolean mIsRevort;
-
     private SharedPreferences mSharedPrefs;
     private int mFontSizeId;
 
@@ -186,13 +185,8 @@ public class NoteEditActivity extends Activity implements OnClickListener,
     private LinearLayout mEditTextList;
 
     private String mUserQuery;
-
     private Pattern mPattern;
 
-    private String DrawPath;
-
-    private TextToSpeech mTTS;
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -223,37 +217,6 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         }
     }
 
-//新activity回传数据
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        if (requestCode == 0 && resultCode == 1) {
-            //对数据进行处理
-            DrawPath = data.getStringExtra("path");
-            insertImg(DrawPath);
-        }
-        if (requestCode == 1) {//callGallery()方法是以请求码为1来开启活动的，此处为响应活动结束
-            try {
-                // 获得图片的资源标识符
-                Uri originalUri = data.getData();
-                String[] proj = {MediaStore.Images.Media.DATA};
-                //从数据库中查询
-                Cursor cursor = getContentResolver().query(originalUri, proj, null, null, null);
-                //获得用户选择的图片的索引值
-                int column_index = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
-                // 将光标移至开头 ，这个很重要，不小心很容易引起越界
-                cursor.moveToFirst();
-                // 最后根据索引值获取图片路径
-                String path = cursor.getString(column_index);
-                //插入图片
-                insertImg(path);
-            } catch (Exception e) {
-                e.printStackTrace();
-                Toast.makeText(NoteEditActivity.this, "图片插入失败", Toast.LENGTH_SHORT).show();
-            }
-        }
-    }
-
     private boolean initActivityState(Intent intent) {
         /**
          * If the user specified the {@link Intent#ACTION_VIEW} but not provided with id,
@@ -447,67 +410,8 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         mNoteHeaderHolder.ivAlertIcon = (ImageView) findViewById(R.id.iv_alert_icon);
         mNoteHeaderHolder.tvAlertDate = (TextView) findViewById(R.id.tv_alert_date);
         mNoteHeaderHolder.ibSetBgColor = (ImageView) findViewById(R.id.btn_set_bg_color);
-        mNoteHeaderHolder.startDraw = (ImageButton) findViewById(R.id.imageButton2);
-        mNoteHeaderHolder.note_Read = (ImageButton) findViewById(R.id.menu_note_read);
-        mNoteHeaderHolder.note_revoke = (ImageButton) findViewById(R.id.action_undo);
-        mNoteHeaderHolder.note_revoke.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                backTrack();
-            }
-        });
-        mNoteHeaderHolder.note_Read.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                mTTS = new TextToSpeech(NoteEditActivity.this, new OnInitListener() {
-                    @Override
-                    public void onInit(int i) {
-                        if (i == TextToSpeech.SUCCESS){
-                            int result = mTTS.setLanguage(Locale.US);
-                            if (result != TextToSpeech.LANG_COUNTRY_AVAILABLE
-                                    && result != TextToSpeech.LANG_AVAILABLE){
-                                return;
-                            }
-                        }
-                    }
-                });
-                readText();
-            }
-        });
         mNoteHeaderHolder.ibSetBgColor.setOnClickListener(this);
-        mNoteHeaderHolder.startDraw.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                {
-                    saveNote();
-                    Intent intent = new Intent();
-                    intent.setClass(NoteEditActivity.this, DrawActivity.class);
-                    startActivityForResult(intent, 0);
-                }
-            }
-        });
-
         mNoteEditor = (EditText) findViewById(R.id.note_edit_view);
-        mNoteEditor.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
-
-            }
-
-            @Override
-            public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
-
-            }
-
-            @Override
-            public void afterTextChanged(Editable editable) {
-                if (!mIsRevort){
-                    saveHistory();
-                }else{
-                    mIsRevort = false;
-                }
-            }
-        });
         mNoteEditorPanel = findViewById(R.id.sv_note_edit);
         mNoteBgColorSelector = findViewById(R.id.note_bg_color_selector);
         for (int id : sBgSelectorBtnsMap.keySet()) {
@@ -542,33 +446,6 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         clearSettingState();
     }
 
-    private void saveHistory(){
-        SpannableString input_text = new SpannableString(mNoteEditor.getText());
-        if (mHistory.size() >= 10){
-            mHistory.removeElementAt(0);
-            mHistory.add(input_text);
-        }else{
-            mHistory.add(input_text);
-        }
-        mNoteHeaderHolder.note_revoke.setEnabled(true);
-    }
-
-    private void backTrack(){
-        int stack_size = mHistory.size();
-        mIsRevort = true;
-        if (stack_size <= 1){
-            mNoteHeaderHolder.note_revoke.setEnabled(false);
-            return;
-        }else{
-            mNoteEditor.setText(mHistory.elementAt(stack_size - 2));
-            mHistory.removeElementAt(stack_size - 1);
-            if (stack_size == 2){
-                mNoteHeaderHolder.note_revoke.setEnabled(false);
-            }
-        }
-
-    }
-
     private void updateWidget() {
         Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
         if (mWorkingNote.getWidgetType() == Notes.TYPE_WIDGET_2X) {
@@ -744,6 +621,8 @@ public class NoteEditActivity extends Activity implements OnClickListener,
                 String saved_password=load("data.txt");
                 Log.i(TAG,saved_password);
                 if(entered_password.equals(saved_password)){
+                    //noteMoveToPF();
+                        //Log.i(TAG, "22222");
                     Toast.makeText(NoteEditActivity.this, "Note has moved to Private Folder", Toast.LENGTH_LONG).show();
                     noteMoveToPF();
                 }else{
@@ -755,11 +634,6 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         });
     }
 
-    public void readText(){
-        mTTS.speak(mNoteEditor.getText().toString(), TextToSpeech.QUEUE_FLUSH, null);
-    }
-
-
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
@@ -810,10 +684,6 @@ public class NoteEditActivity extends Activity implements OnClickListener,
             case R.id.menu_private_folder:
                 moveToPrivateFolder();
                 break;
-            case R.id.menu_font_select:
-                showSingleAlertDiglog();
-                break;
-
             default:
                 break;
         }
@@ -1138,48 +1008,142 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         Toast.makeText(this, resId, duration).show();
     }
 
-    AlertDialog alertDialog2;
+    private void getLocation(){
-
+        //1.获取位置管理器
-    public void showSingleAlertDiglog(){
+        locationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
-        final String[] items={"普通","非衬线","衬线","等宽"};
+
-        AlertDialog.Builder alertBuilder=new AlertDialog.Builder(this);
+        //2.获取位置提供器，GPS或是NetWork
-        alertBuilder.setTitle("字体选择");
+        List<String> providers = locationManager.getProviders(true);
-        alertBuilder.setSingleChoiceItems(items, 0, new DialogInterface.OnClickListener() {
+
-            @Override
+        if (providers.contains(LocationManager.GPS_PROVIDER)) {
-            public void onClick(DialogInterface dialogInterface, int i) {
+            //如果是GPS
-                    switch(i){
+            locationProvider = LocationManager.GPS_PROVIDER;
-                    case 0:
+            Log.v("TAG", "定位方式GPS");
-                        mNoteEditor.setTypeface(Typeface.DEFAULT);
+        } else if (providers.contains(LocationManager.NETWORK_PROVIDER)) {
-                        break;
+            //如果是Network
-                    case 1:
+            locationProvider = LocationManager.NETWORK_PROVIDER;
-                        mNoteEditor.setTypeface(Typeface.SANS_SERIF);
+            Log.v("TAG", "定位方式Network");
-                        break;
+        }else {
-                    case 2:
+            Toast.makeText(this, "没有可用的位置提供器", Toast.LENGTH_SHORT).show();
-                        mNoteEditor.setTypeface(Typeface.SERIF);
+            return;
-                        break;
+        }
-                    case 3:
+
-                        mNoteEditor.setTypeface(Typeface.MONOSPACE);
+        Location location = locationManager.getLastKnownLocation(locationProvider);
-                        break;
+        if (location!=null){
-                        default:
+            Toast.makeText(this, location.getLongitude() + " " +
-                            break;
+                    location.getLatitude() + "", Toast.LENGTH_SHORT).show();
-                }
+            Log.v("TAG", "获取上次的位置-经纬度："+location.getLongitude()+"   "+location.getLatitude());
+            getAddress(location);
+
+        }else{
+            //监视地理位置变化，第二个和第三个参数分别为更新的最短时间minTime和最短距离minDistace
+            locationManager.requestLocationUpdates(locationProvider, 3000, 1,locationListener);
+        }
+    }
+
+
+    public LocationListener locationListener = new LocationListener() {
+        // Provider的状态在可用、暂时不可用和无服务三个状态直接切换时触发此函数
+        @Override
+        public void onStatusChanged(String provider, int status, Bundle extras) {
+        }
+        // Provider被enable时触发此函数，比如GPS被打开
+        @Override
+        public void onProviderEnabled(String provider) {
+        }
+        // Provider被disable时触发此函数，比如GPS被关闭
+        @Override
+        public void onProviderDisabled(String provider) {
+        }
+        //当坐标改变时触发此函数，如果Provider传进相同的坐标，它就不会被触发
+        @Override
+        public void onLocationChanged(Location location) {
+            if (location != null) {
+                //如果位置发生变化，重新显示地理位置经纬度
+                Toast.makeText(NoteEditActivity.this, location.getLongitude() + " " +
+                        location.getLatitude() + "", Toast.LENGTH_SHORT).show();
+                Log.v("TAG", "监视地理位置变化-经纬度："+location.getLongitude()+"   "+location.getLatitude());
             }
-        });
+        }
-        alertBuilder.setPositiveButton("确定", new DialogInterface.OnClickListener() {
+    };
-                    @Override
+
-                    public void onClick(DialogInterface dialogInterface, int i) {
+    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
-                        alertDialog2.dismiss();
+        switch (requestCode) {
-                    }
+            case LOCATION_CODE:
+                if(grantResults.length > 0 && grantResults[0] == getPackageManager().PERMISSION_GRANTED
+                        && grantResults[1] == PackageManager.PERMISSION_GRANTED) {
+                    Toast.makeText(this, "申请权限", Toast.LENGTH_LONG).show();
+                    try {
+                        List<String> providers = locationManager.getProviders(true);
+                        if (providers.contains(LocationManager.NETWORK_PROVIDER)) {
+                            //如果是Network
+                            locationProvider = LocationManager.NETWORK_PROVIDER;
+
+                        }else if (providers.contains(LocationManager.GPS_PROVIDER)) {
+                            //如果是GPS
+                            locationProvider = LocationManager.GPS_PROVIDER;
+                        }
+                        Location location = locationManager.getLastKnownLocation(locationProvider);
+                        if (location!=null){
+                            Toast.makeText(this, location.getLongitude() + " " +
+                                    location.getLatitude() + "", Toast.LENGTH_SHORT).show();
+                            Log.v("TAG", "获取上次的位置-经纬度："+location.getLongitude()+"   "+location.getLatitude());
+                        }else{
+                            // 监视地理位置变化，第二个和第三个参数分别为更新的最短时间minTime和最短距离minDistace
+                            locationManager.requestLocationUpdates(locationProvider, 0, 0,locationListener);
+                        }
 
-        } );
+                    }catch (SecurityException e){
-        alertBuilder.setNegativeButton("取消", new DialogInterface.OnClickListener() {
+                        e.printStackTrace();
-                    @Override
-                    public void onClick(DialogInterface dialogInterface, int i) {
-                        alertDialog2.dismiss();
                     }
-        } );
+                } else {
-        alertDialog2=alertBuilder.create();
+                    Toast.makeText(this, "缺少权限", Toast.LENGTH_LONG).show();
-        alertDialog2.show();
+                    finish();
+                }
+                break;
+        }
+    }
+
+    //获取地址信息:城市、街道等信息
+    private List<Address> getAddress(Location location) {
+        List<Address> result = null;
+        try {
+            if (location != null) {
+                Geocoder gc = new Geocoder(this, Locale.getDefault());
+                result = gc.getFromLocation(location.getLatitude(), location.getLongitude(), 1);
+                Toast.makeText(this, "获取地址信息："+result.toString(), Toast.LENGTH_LONG).show();
+                Log.v("TAG", "获取地址信息："+result.toString());
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return result;
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {//处理从图库中返回的图片。
+
+        if (requestCode == 1) {//callGallery()方法是以请求码为1来开启活动的，此处为响应活动结束
+            try {
+                // 获得图片的资源标识符
+                Uri originalUri = data.getData();
+                String[] proj = {MediaStore.Images.Media.DATA};
+                //从数据库中查询
+                Cursor cursor = getContentResolver().query(originalUri, proj, null, null, null);
+                //获得用户选择的图片的索引值
+                int column_index = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
+                // 将光标移至开头 ，这个很重要，不小心很容易引起越界
+                cursor.moveToFirst();
+                // 最后根据索引值获取图片路径
+                String path = cursor.getString(column_index);
+                //插入图片
+                insertImg(path);
+            } catch (Exception e) {
+                e.printStackTrace();
+                Toast.makeText(NoteEditActivity.this, "图片插入失败", Toast.LENGTH_SHORT).show();
+            }
+        }
+
     }
 
     private void initImage() {
@@ -1195,6 +1159,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
                 String path = s.replaceAll("\\<img src=\"|\"\\/>", "").trim();//得到路径
 
                 int width = ScreenUtils.getScreenWidth(NoteEditActivity.this);//屏幕的宽度
+                //int height = ScreenUtils.getScreenHeight(NoteEditActivity.this);
                 try {
                     BitmapFactory.Options options = new BitmapFactory.Options();
                     Bitmap bitmap = BitmapFactory.decodeFile(path, options);
@@ -1218,6 +1183,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
     private SpannableString getBitmapMime(String path, String tagPath)  {
         SpannableString ss = new SpannableString(tagPath);//这里使用加了<img>标签的图片路径
         int width = ScreenUtils.getScreenWidth(NoteEditActivity.this);
+        //int height = ScreenUtils.getScreenHeight(NoteEditActivity.this);
         BitmapFactory.Options options = new BitmapFactory.Options();
         //路径对应的图片
         Bitmap bitmap = BitmapFactory.decodeFile(path, options);

src/app/src/main/java/net/micode/notes/ui/NoteEditText.java

@@ -116,8 +116,6 @@ public class NoteEditText extends EditText {
                 int off = layout.getOffsetForHorizontal(line, x);
                 Selection.setSelection(getText(), off);
                 break;
-            default:
-                break;
         }
 
         return super.onTouchEvent(event);

src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java

@@ -16,32 +16,21 @@
 
 package net.micode.notes.ui;
 
-import android.Manifest;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.appwidget.AppWidgetManager;
 import android.content.AsyncQueryHandler;
 import android.content.ContentResolver;
-import android.content.ContentUris;
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.content.pm.PackageManager;
 import android.database.Cursor;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
 import android.os.AsyncTask;
-import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.provider.DocumentsContract;
-import android.provider.MediaStore;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
@@ -71,10 +60,6 @@ import android.widget.PopupMenu;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-import androidx.core.content.FileProvider;
-
 import net.micode.notes.R;
 import net.micode.notes.data.Notes;
 import net.micode.notes.data.Notes.NoteColumns;
@@ -89,7 +74,6 @@ import net.micode.notes.widget.NoteWidgetProvider_4x;
 
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -98,9 +82,8 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 
 public class NotesListActivity extends Activity implements OnClickListener, OnItemLongClickListener {
-    private int time_node;
     private static final int FOLDER_NOTE_LIST_QUERY_TOKEN = 0;
-    private Uri uri;
+
     private static final int FOLDER_LIST_QUERY_TOKEN      = 1;
 
     private static final int MENU_FOLDER_DELETE = 0;
@@ -114,8 +97,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
     private static final String PREFERENCE_ADD_INTRODUCTION = "net.micode.notes.introduction";
 
     private enum ListEditState {
-        NOTE_LIST, SUB_FOLDER, CALL_RECORD_FOLDER, PRIVATE_FOLDER, TRASH_FOLDER
+        NOTE_LIST, SUB_FOLDER, CALL_RECORD_FOLDER, PRIVATE_FOLDER
-    }
+    };
 
     private ListEditState mState;
 
@@ -146,7 +129,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
     private static final String TAG = "NotesListActivity";
 
     public static final int NOTES_LISTVIEW_SCROLL_RATE = 30;
-    private Context context = NotesListActivity.this;
+
     private NoteItemData mFocusNoteDataItem;
 
     private static final String NORMAL_SELECTION = NoteColumns.PARENT_ID + "=?";
@@ -173,37 +156,11 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        context = NotesListActivity.this;
+        if (resultCode == RESULT_OK
-        switch (requestCode) {
+                && (requestCode == REQUEST_CODE_OPEN_NODE || requestCode == REQUEST_CODE_NEW_NODE)) {
-            case 1:
+            mNotesListAdapter.changeCursor(null);
-                if (resultCode == RESULT_OK) {
+        } else {
-                    try {
+            super.onActivityResult(requestCode, resultCode, data);
-                        Bitmap bitmap = BitmapFactory.decodeStream(getContentResolver().openInputStream(uri));
-                        Drawable drawable = new BitmapDrawable(bitmap);
-                        //Toast.makeText(context, " to get image chuxian", Toast.LENGTH_SHORT).show();
-                        getWindow().setBackgroundDrawable(drawable);
-                    } catch (FileNotFoundException e) {
-                        e.printStackTrace();
-                    }
-                }
-                break;
-            case 3:
-                if (resultCode == RESULT_OK) {
-                    if (Build.VERSION.SDK_INT >= 19) {
-                        handelImage(data);
-                    } else {
-                        handleImageBefor(data);
-                    }
-                }
-                break;
-            default:
-                if (resultCode == RESULT_OK
-                        && (requestCode == REQUEST_CODE_OPEN_NODE || requestCode == REQUEST_CODE_NEW_NODE)) {
-                    mNotesListAdapter.changeCursor(null);
-                } else {
-                    super.onActivityResult(requestCode, resultCode, data);
-                }
-                break;
         }
     }
 
@@ -526,21 +483,12 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
             protected HashSet<AppWidgetAttribute> doInBackground(Void... unused) {
                 HashSet<AppWidgetAttribute> widgets = mNotesListAdapter.getSelectedWidget();
                 if (!isSyncMode()) {
-                    if (mCurrentFolderId == Notes.ID_TRASH_FOLER){
+                    // if not synced, delete notes directly
-                        // if in trash, delete notes directly
+                    if (DataUtils.batchDeleteNotes(mContentResolver, mNotesListAdapter
-                        if (DataUtils.batchDeleteNotes(mContentResolver, mNotesListAdapter.getSelectedItemIds())) {
+                            .getSelectedItemIds())) {
-                        } else {
+                    } else {
-                            Log.e(TAG, "Delete notes error, should not happens");
+                        Log.e(TAG, "Delete notes error, should not happens");
-                        }
-                    }
-                    else{
-                        //move to trash
-                        if (!DataUtils.batchMoveToFolder(mContentResolver, mNotesListAdapter
-                                .getSelectedItemIds(), Notes.ID_TRASH_FOLER)) {
-                            Log.e(TAG, "Move notes to trash folder error, should not happens");
-                        }
                     }
-
                 } else {
                     // in sync mode, we'll move the deleted note into the trash
                     // folder
@@ -579,10 +527,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
                 folderId);
         if (!isSyncMode()) {
             // if not synced, delete folder directly
-            DataUtils.batchMoveToFolder(mContentResolver, ids, Notes.ID_TRASH_FOLER);
+            DataUtils.batchDeleteNotes(mContentResolver, ids);
-            if (mState == ListEditState.TRASH_FOLDER){
-                DataUtils.batchDeleteNotes(mContentResolver, ids);
-            }
         } else {
             // in sync mode, we'll move the deleted folder into the trash folder
             DataUtils.batchMoveToFolder(mContentResolver, ids, Notes.ID_TRASH_FOLER);
@@ -607,7 +552,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
     private void openFolder(NoteItemData data) {
         mCurrentFolderId = data.getId();
         String iddd = Long.toString(mCurrentFolderId);
-        //Log.i(TAG, iddd);
+        Log.i(TAG, iddd);
         startAsyncNotesListQuery();
         if (data.getId() == Notes.ID_CALL_RECORD_FOLDER) {
             mState = ListEditState.CALL_RECORD_FOLDER;
@@ -752,17 +697,10 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
                 super.onBackPressed();
                 break;
             case PRIVATE_FOLDER:
-                mState = ListEditState.NOTE_LIST;
-                mCurrentFolderId = Notes.ID_ROOT_FOLDER;
-                startAsyncNotesListQuery();
-                mTitleBar.setVisibility(View.GONE);
-                break;
-            case TRASH_FOLDER:
                 mCurrentFolderId = Notes.ID_ROOT_FOLDER;
                 mState = ListEditState.NOTE_LIST;
                 startAsyncNotesListQuery();
                 mTitleBar.setVisibility(View.GONE);
-                mAddNewNote.setVisibility(View.VISIBLE);
                 break;
             default:
                 break;
@@ -859,8 +797,6 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
             getMenuInflater().inflate(R.menu.call_record_folder, menu);
         }else if (mState == ListEditState.PRIVATE_FOLDER){
             getMenuInflater().inflate(R.menu.private_folder, menu);
-        }else if (mState == ListEditState.TRASH_FOLDER){
-            getMenuInflater().inflate(R.menu.trash_folder, menu);
         } else {
             Log.e(TAG, "Wrong state:" + mState);
         }
@@ -870,12 +806,9 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
     public void ResetPassword(){
         String if_now_create = "true";
         enterPrivateFolder(if_now_create);
+        Log.i(TAG, "ResetPassword: 11111111111111111111111111111");
     }
 
-    /*public void clean_All(){
-
-    }*/
-
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
@@ -911,7 +844,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
                 onSearchRequested();
                 break;
             }
-            case R.id.menu_private_folders:{
+            case R.id.menu_private_folder:{
                 if_first_create = "true";
 
                 if (load("if_create.txt")!= null){
@@ -926,18 +859,6 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
                 ResetPassword();
                 break;
             }
-            case R.id.menu_bg_change:{
-                replaceBackGround();
-                break;
-            }
-            case R.id.menu_trash_folder:{
-                restoreDeletedNodes();
-                break;
-            }
-            case R.id.menu_clean_all:{
-                //clean_All();
-                break;
-            }
             default:
                 break;
         }
@@ -950,15 +871,6 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         return true;
     }
 
-    private void restoreDeletedNodes(){
-        mState = ListEditState.TRASH_FOLDER;
-        mCurrentFolderId = Notes.ID_TRASH_FOLER;
-        startAsyncNotesListQuery();
-        mTitleBar.setText("回收站");
-        mTitleBar.setVisibility(View.VISIBLE);
-        mAddNewNote.setVisibility(View.GONE);
-    }
-
     private void exportNoteToText() {
         final BackupUtils backup = BackupUtils.getInstance(NotesListActivity.this);
         new AsyncTask<Void, Void, Integer>() {
@@ -997,6 +909,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
                     builder.show();
                 }
             }
+
         }.execute();
     }
 
@@ -1012,9 +925,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
 
     public void saveContentToLocal(String filename, String content) throws Exception{
         FileOutputStream output =this.openFileOutput(filename, Context.MODE_PRIVATE);
-        try {
+        output.write(content.getBytes());
-            output.write(content.getBytes());
+        if (output != null){
-        }finally {
             output.close();
         }
     }
@@ -1065,6 +977,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         showSoftInput();
         if (create.equals("false")){
             builder.setTitle("enter the password");
+            //Log.i(TAG, "enterPrivateFolder: 111");
         }
         else{
             builder.setTitle("set the password for the Private Folder");
@@ -1109,6 +1022,32 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
                 enter_password_dialog.dismiss();
             }
         });
+
+        //如果文本内是空的，禁止按下positive键
+        /*if (TextUtils.isEmpty(etpassword.getText())) {
+            positive.setEnabled(false);
+        }*/
+
+        /*etpassword.addTextChangedListener(new TextWatcher() {
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+                // TODO Auto-generated method stub
+
+            }
+
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                if (TextUtils.isEmpty(etName.getText())) {
+                    positive.setEnabled(false);
+                } else {
+                    positive.setEnabled(true);
+                }
+            }
+
+            public void afterTextChanged(Editable s) {
+                // TODO Auto-generated method stub
+
+            }
+        });*/
+
     }
 
     private class OnListItemClickListener implements OnItemClickListener {
@@ -1130,6 +1069,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
                         if (item.getType() == Notes.TYPE_FOLDER
                                 || item.getType() == Notes.TYPE_SYSTEM) {
                             openFolder(item);
+                            Log.i(TAG, "onItemClick: 1");
                         } else if (item.getType() == Notes.TYPE_NOTE) {
                             openNode(item);
                         } else {
@@ -1143,16 +1083,6 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
                             Log.e(TAG, "Wrong note type in SUB_FOLDER");
                         }
                         break;
-                    case TRASH_FOLDER:
-                        if (item.getType() == Notes.TYPE_NOTE) {
-                            openNode(item);
-                        } else if (item.getType() == Notes.TYPE_FOLDER
-                                || item.getType() == Notes.TYPE_SYSTEM) {
-                            openFolder(item);
-                        } else {
-                            Log.e(TAG, "Wrong note type in PRIVATE_FOLDER");
-                        }
-                        break;
                     case PRIVATE_FOLDER:
                         if (item.getType() == Notes.TYPE_NOTE) {
                             openNode(item);
@@ -1212,115 +1142,4 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         }
         return false;
     }
-    public void bg_from_camera() {
-        context = NotesListActivity.this;
-        File file = new File(getExternalCacheDir(), "test.jpg");
-        try {
-            if (file.exists()) {
-                file.delete();
-            }
-            file.createNewFile();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        if (Build.VERSION.SDK_INT >= 24) {
-            uri = FileProvider.getUriForFile(context, "com.example.cameraalbumtest.fileprovider", file);
-        } else {
-            uri = Uri.fromFile(file);
-        }
-        Intent intent = new Intent("android.media.action.IMAGE_CAPTURE");
-        intent.putExtra(MediaStore.EXTRA_OUTPUT, uri);
-        startActivityForResult(intent, 1);
-    }
-
-    public void bg_from_photo() {
-        context = NotesListActivity.this;
-        if (ContextCompat.checkSelfPermission(context,
-                Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
-            ActivityCompat.requestPermissions(NotesListActivity.this, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, 2);
-        } else {
-            openAlbum();
-        }
-    }
-
-    private void openAlbum() {
-        Intent intent = new Intent("android.intent.action.GET_CONTENT");
-        intent.setType("image/*");
-        startActivityForResult(intent, 3);
-    }
-
-
-    private void handelImage(Intent data) {
-        String imagePath = null;
-        Uri uri2 = data.getData();
-        if (DocumentsContract.isDocumentUri(this, uri2)) {
-            String docid = DocumentsContract.getDocumentId(uri2);
-            if ("com.android.providers.media.documents".equals(uri2.getAuthority())) {
-                String id = docid.split(":")[1];
-                String selection = MediaStore.Images.Media._ID + "=" + id;
-                imagePath = getImagePath(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, selection);
-            } else if ("com.android.providers.downloads.documents".equals(uri2.getAuthority())) {
-                Uri contenUri = ContentUris.withAppendedId(Uri.parse("content://downloads/public_downloads"), Long.valueOf(docid));
-                imagePath = getImagePath(contenUri, null);
-            }
-        } else if ("content".equalsIgnoreCase(uri2.getScheme())) {
-            imagePath = getImagePath(uri2, null);
-        } else if ("file".equalsIgnoreCase(uri2.getScheme())) {
-            imagePath = uri2.getPath();
-        }
-        displayImage(imagePath);
-    }
-
-    private void handleImageBefor(Intent data) {
-        Uri uri = data.getData();
-        String imagePath = getImagePath(uri, null);
-        displayImage(imagePath);
-    }
-
-    private String getImagePath(Uri uri, String selection) {
-        String path = null;
-        Cursor cursor = getContentResolver().query(uri, null, selection, null, null);
-        if (cursor != null) {
-            if (cursor.moveToFirst()) {
-                path = cursor.getString(cursor.getColumnIndex(MediaStore.Images.Media.DATA));
-            }
-            cursor.close();
-        }
-        return path;
-    }
-
-    private void displayImage(String path) {
-        if (path != null) {
-            Bitmap bitmap = BitmapFactory.decodeFile(path);
-            Drawable drawable = new BitmapDrawable(bitmap);
-            Toast.makeText(context, " 获取图片", Toast.LENGTH_SHORT).show();
-            getWindow().setBackgroundDrawable(drawable);
-        } else {
-            Toast.makeText(context, "failed to get image", Toast.LENGTH_SHORT).show();
-        }
-
-    }
-    public void replaceBackGround() {
-        final String[] items = {"从相册选取", "拍摄照片"};
-        AlertDialog.Builder listDialog = new AlertDialog.Builder(NotesListActivity.this);
-        listDialog.setTitle("背景");
-        listDialog.setItems(items, new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialogInterface, int i) {
-                switch(i){
-                    case 0:
-                        time_node = 3;
-                        bg_from_photo();
-                        break;
-                    case 1:
-                        time_node = 2;
-                        bg_from_camera();
-                        break;
-                    default:
-                        break;
-                }
-            }
-        });
-        listDialog.show();
-    }
 }