From cf060527327ec7bc08ada27cfaf3577ded430805 Mon Sep 17 00:00:00 2001
From: Yuji Konishi <yuji.k64613@gmail.com>
Date: Sat, 14 Apr 2012 17:26:02 +0900
Subject: [PATCH] A28079

---
 workspace/EverClip/AndroidManifest.xml             |   1 +
 workspace/EverClip/gen/com/yuji/ec/R.java          |  72 +++---
 workspace/EverClip/res/layout/note_updator.xml     |  26 +++
 workspace/EverClip/res/layout/setting.xml          |  12 +-
 .../src/com/yuji/ec/NoteUpdatorActivity.java       | 168 ++++++++++++++
 .../EverClip/src/com/yuji/ec/SettingActivity.java  | 251 +++++++++++----------
 .../EverClip/src/com/yuji/ec/common/Constant.java  |   3 +
 .../src/com/yuji/ec/task/NoteTypeListTask.java     |   8 +-
 .../src/com/yuji/ec/task/NoteUpdateTask.java       |   9 +-
 .../EverClip/src/com/yuji/ec/utility/DateUtil.java |  58 +++++
 .../src/com/yuji/ec/utility/EditPrefUtil.java      |  13 +-
 .../src/com/yuji/ec/utility/EvernoteUtil.java      |  42 +++-
 .../src/com/yuji/ec/utility/NoteUpdator.java       |  40 +++-
 .../EverClip/src/com/yuji/ec/utility/PrefUtil.java |   3 +
 .../src/com/yuji/ec/utility/PrefUtilImpl.java      |  17 ++
 15 files changed, 540 insertions(+), 183 deletions(-)
 create mode 100644 workspace/EverClip/res/layout/note_updator.xml
 create mode 100644 workspace/EverClip/src/com/yuji/ec/NoteUpdatorActivity.java
 create mode 100644 workspace/EverClip/src/com/yuji/ec/utility/DateUtil.java

diff --git a/workspace/EverClip/AndroidManifest.xml b/workspace/EverClip/AndroidManifest.xml
index 6dd9fad..3d06004 100644
--- a/workspace/EverClip/AndroidManifest.xml
+++ b/workspace/EverClip/AndroidManifest.xml
@@ -27,6 +27,7 @@
     	<activity android:name=".SettingActivity"></activity>
     	<activity android:name=".UserPasswordActivity"></activity>
     	<activity android:name=".NoteTypeListActivity"></activity>
+    	<activity android:name=".NoteUpdatorActivity"></activity>
     </application>
     <uses-permission android:name="android.permission.INTERNET" />
 </manifest>
\ No newline at end of file
diff --git a/workspace/EverClip/gen/com/yuji/ec/R.java b/workspace/EverClip/gen/com/yuji/ec/R.java
index 1b6a9e8..e053db5 100644
--- a/workspace/EverClip/gen/com/yuji/ec/R.java
+++ b/workspace/EverClip/gen/com/yuji/ec/R.java
@@ -33,39 +33,44 @@ public final class R {
         public static final int noteTypeLayout=0x7f070005;
         public static final int noteTypeTitle=0x7f070004;
         public static final int noteTypeView=0x7f070007;
-        public static final int settingCloseButton=0x7f070019;
-        public static final int settingLayout=0x7f070009;
-        public static final int settingMessage=0x7f07000a;
-        public static final int settingNoteButton=0x7f07000f;
-        public static final int settingNoteLayout=0x7f07000d;
-        public static final int settingNoteSpinner=0x7f07000c;
-        public static final int settingNoteText=0x7f07000e;
-        public static final int settingSortRadio1=0x7f070012;
-        public static final int settingSortRadio2=0x7f070013;
-        public static final int settingSortRadioGroup=0x7f070011;
-        public static final int settingSortSpinner=0x7f070010;
-        public static final int settingTimeButton=0x7f070018;
-        public static final int settingTimeCheckBox=0x7f070015;
-        public static final int settingTimePicker=0x7f070016;
-        public static final int settingTimeText=0x7f070017;
-        public static final int settingUpdateButton=0x7f070014;
-        public static final int settingUserButton=0x7f07000b;
-        public static final int text1=0x7f07001a;
-        public static final int text2=0x7f07001b;
-        public static final int userCancelButton=0x7f070021;
-        public static final int userOkButton=0x7f070020;
-        public static final int userPasswordEditText=0x7f07001f;
-        public static final int userPasswordTextView=0x7f07001e;
-        public static final int userUserEditText=0x7f07001d;
-        public static final int userUserTextView=0x7f07001c;
+        public static final int settingCloseButton=0x7f07001d;
+        public static final int settingLayout=0x7f070011;
+        public static final int settingMessage=0x7f070012;
+        public static final int settingNoteButton=0x7f070014;
+        public static final int settingSortRadio1=0x7f070017;
+        public static final int settingSortRadio2=0x7f070018;
+        public static final int settingSortRadioGroup=0x7f070016;
+        public static final int settingSortSpinner=0x7f070015;
+        public static final int settingTimeButton=0x7f07001c;
+        public static final int settingTimeCheckBox=0x7f070019;
+        public static final int settingTimeLayout=0x7f07001a;
+        public static final int settingTimeText=0x7f07001b;
+        public static final int settingUserButton=0x7f070013;
+        public static final int text1=0x7f07001e;
+        public static final int text2=0x7f07001f;
+        public static final int updatorCloseButton=0x7f070010;
+        public static final int updatorLayout=0x7f070009;
+        public static final int updatorMessage=0x7f07000a;
+        public static final int updatorNoteButton=0x7f07000e;
+        public static final int updatorNoteLayout=0x7f07000c;
+        public static final int updatorNoteSpinner=0x7f07000b;
+        public static final int updatorNoteText=0x7f07000d;
+        public static final int updatorUpdateButton=0x7f07000f;
+        public static final int userCancelButton=0x7f070025;
+        public static final int userOkButton=0x7f070024;
+        public static final int userPasswordEditText=0x7f070023;
+        public static final int userPasswordTextView=0x7f070022;
+        public static final int userUserEditText=0x7f070021;
+        public static final int userUserTextView=0x7f070020;
     }
     public static final class layout {
         public static final int main=0x7f030000;
         public static final int note_type_list=0x7f030001;
-        public static final int setting=0x7f030002;
-        public static final int simple_list_item_1=0x7f030003;
-        public static final int small_list_item_1=0x7f030004;
-        public static final int user_password=0x7f030005;
+        public static final int note_updator=0x7f030002;
+        public static final int setting=0x7f030003;
+        public static final int simple_list_item_1=0x7f030004;
+        public static final int small_list_item_1=0x7f030005;
+        public static final int user_password=0x7f030006;
     }
     public static final class string {
         public static final int app_name=0x7f050000;
@@ -80,13 +85,12 @@ public final class R {
         public static final int noteTypeTitle=0x7f05001e;
         public static final int selectTitle=0x7f05001d;
         public static final int sendButton=0x7f050001;
-        public static final int settingConfirmTitle=0x7f050020;
+        public static final int settingConfirmTitle=0x7f050024;
         public static final int settingNoteButton=0x7f05000c;
-        public static final int settingNoteText=0x7f050021;
         public static final int settingNoteTitle=0x7f05000b;
         public static final int settingSortTitle=0x7f05000d;
         public static final int settingTimeButton=0x7f050011;
-        public static final int settingTimeText=0x7f050022;
+        public static final int settingTimeText=0x7f050025;
         public static final int settingTimeTitle=0x7f050010;
         public static final int settingUpdateButton=0x7f05000f;
         public static final int settingUpdateTitle=0x7f05000e;
@@ -100,6 +104,10 @@ public final class R {
         public static final int toastNoteDoesNotExist=0x7f050016;
         public static final int toastSystem=0x7f05001a;
         public static final int updateButton=0x7f050004;
+        public static final int updatorConfirmTitle=0x7f050020;
+        public static final int updatorNoteButton=0x7f050023;
+        public static final int updatorNoteText=0x7f050022;
+        public static final int updatorNoteTitle=0x7f050021;
         public static final int userPasswordTitle=0x7f050013;
         public static final int userUserTitle=0x7f050012;
         public static final int yesButton=0x7f050002;
diff --git a/workspace/EverClip/res/layout/note_updator.xml b/workspace/EverClip/res/layout/note_updator.xml
new file mode 100644
index 0000000..22d3fdd
--- /dev/null
+++ b/workspace/EverClip/res/layout/note_updator.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    >
+    <ScrollView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1">
+		<LinearLayout android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical" android:padding="0px">
+			<LinearLayout android:id="@+id/updatorLayout" android:padding="6px" android:layout_margin="3px" android:background="#666666" android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="vertical">
+				<TextView android:text="@+string/updatorConfirmTitle" android:textStyle="bold" android:background="#ccffff" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>
+				<TextView android:id="@+id/updatorMessage" android:padding="10px" android:text="@+string/selectTitle" android:background="#ffff66" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>
+			</LinearLayout>
+			
+			<TextView android:text="@+string/updatorNoteTitle" android:textStyle="bold" android:background="#99cccc" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="0px"></TextView>
+    		<Spinner android:id="@+id/updatorNoteSpinner" android:layout_height="wrap_content" android:layout_width="fill_parent"></Spinner>
+			<LinearLayout android:id="@+id/updatorNoteLayout" android:layout_width="fill_parent" android:layout_height="wrap_content">
+				<TextView android:id="@+id/updatorNoteText" android:text="@+string/updatorNoteText" android:textAppearance="?android:attr/textAppearanceLarge" android:background="#cccccc" android:layout_width="fill_parent" android:layout_weight="1" android:layout_height="fill_parent"></TextView>
+				<Button android:id="@+id/updatorNoteButton" android:text="@+string/updatorNoteButton" android:layout_width="wrap_content" android:layout_height="wrap_content" /> 
+			</LinearLayout>	
+		</LinearLayout>
+	</ScrollView>
+	<LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
+		<Button android:text="@+string/updateButton" android:layout_weight="1" android:id="@+id/updatorUpdateButton" android:layout_width="fill_parent" android:layout_height="wrap_content" /> 
+		<Button android:text="@+string/closeButton" android:layout_weight="1" android:id="@+id/updatorCloseButton" android:layout_width="fill_parent" android:layout_height="wrap_content" /> 
+	</LinearLayout>    
+</LinearLayout>
diff --git a/workspace/EverClip/res/layout/setting.xml b/workspace/EverClip/res/layout/setting.xml
index 016e6ea..88f32b5 100644
--- a/workspace/EverClip/res/layout/setting.xml
+++ b/workspace/EverClip/res/layout/setting.xml
@@ -15,12 +15,18 @@
 			<Button android:text="@+string/settingUserButton" android:id="@+id/settingUserButton" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="5px" /> 
 			
 			<TextView android:text="@+string/settingNoteTitle" android:textStyle="bold" android:background="#99cccc" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="0px"></TextView>
+			<Button android:text="@+string/settingNoteButton" android:id="@+id/settingNoteButton" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="5px" /> 
+<!--  			
+			<TextView android:text="@+string/settingNoteTitle" android:textStyle="bold" android:background="#99cccc" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="0px"></TextView>
     		<Spinner android:id="@+id/settingNoteSpinner" android:layout_height="wrap_content" android:layout_width="fill_parent"></Spinner>
 			<LinearLayout android:id="@+id/settingNoteLayout" android:layout_width="fill_parent" android:layout_height="wrap_content">
 				<TextView android:id="@+id/settingNoteText" android:text="@+string/settingNoteText" android:textAppearance="?android:attr/textAppearanceLarge" android:background="#cccccc" android:layout_width="fill_parent" android:layout_weight="1" android:layout_height="fill_parent"></TextView>
 				<Button android:id="@+id/settingNoteButton" android:text="@+string/settingNoteButton" android:layout_width="wrap_content" android:layout_height="wrap_content" /> 
 			</LinearLayout>	
     			
+			<TextView android:text="@+string/settingUpdateTitle" android:textStyle="bold" android:background="#99cccc" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="0px"></TextView>
+			<Button android:text="@+string/settingUpdateButton" android:id="@+id/settingUpdateButton" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="5px" />
+-->			
 			<TextView android:text="@+string/settingSortTitle" android:textStyle="bold" android:background="#99cccc" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="0px"></TextView>
     		<Spinner android:id="@+id/settingSortSpinner" android:layout_height="wrap_content" android:layout_width="fill_parent"></Spinner>
 			<RadioGroup android:id="@+id/settingSortRadioGroup" android:orientation="horizontal" android:layout_width="wrap_content" android:layout_height="wrap_content">
@@ -28,13 +34,9 @@
 				<RadioButton android:id="@+id/settingSortRadio2" android:text="降順" android:layout_width="wrap_content" android:layout_height="wrap_content"></RadioButton>
 			</RadioGroup>
 			
-			<TextView android:text="@+string/settingUpdateTitle" android:textStyle="bold" android:background="#99cccc" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="0px"></TextView>
-			<Button android:text="@+string/settingUpdateButton" android:id="@+id/settingUpdateButton" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="5px" />
-			
 			<TextView android:text="@+string/settingTimeTitle" android:textStyle="bold" android:background="#99cccc" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="0px"></TextView>
 			<CheckBox android:text="自動更新を有効にする" android:id="@+id/settingTimeCheckBox" android:layout_width="wrap_content" android:layout_height="wrap_content"></CheckBox> 
-			<TimePicker android:id="@+id/settingTimePicker" android:layout_width="wrap_content" android:layout_height="wrap_content"></TimePicker>
-			<LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
+			<LinearLayout android:id="@+id/settingTimeLayout" android:layout_width="fill_parent" android:layout_height="wrap_content">
 				<TextView android:id="@+id/settingTimeText" android:text="@+string/settingTimeText" android:textAppearance="?android:attr/textAppearanceLarge" android:background="#cccccc" android:layout_width="fill_parent" android:layout_weight="1" android:layout_height="fill_parent"></TextView>
 				<Button android:id="@+id/settingTimeButton" android:text="@+string/settingTimeButton" android:layout_width="wrap_content" android:layout_height="wrap_content" /> 
 			</LinearLayout>	
diff --git a/workspace/EverClip/src/com/yuji/ec/NoteUpdatorActivity.java b/workspace/EverClip/src/com/yuji/ec/NoteUpdatorActivity.java
new file mode 100644
index 0000000..be7371b
--- /dev/null
+++ b/workspace/EverClip/src/com/yuji/ec/NoteUpdatorActivity.java
@@ -0,0 +1,168 @@
+package com.yuji.ec;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemSelectedListener;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.Spinner;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.yuji.ec.common.Constant;
+import com.yuji.ec.task.NoteUpdateTask;
+import com.yuji.ec.utility.AsyncTaskCommand;
+import com.yuji.ec.utility.BaseActivity;
+import com.yuji.ec.utility.EditPrefUtil;
+import com.yuji.ec.utility.EvernoteUtil;
+
+public class NoteUpdatorActivity extends BaseActivity {
+	private EditPrefUtil pref = new EditPrefUtil(this);
+
+	private Spinner noteTypeSpinner = null;
+	private LinearLayout noteTypeLayout = null;
+	private TextView noteTypeView = null;
+	private Button noteTypeButton = null;
+	private Button updateButton = null;
+	private Button closeButton = null;
+
+	private String guid;
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.note_updator);
+
+		noteTypeSpinner = (Spinner) this.findViewById(R.id.updatorNoteSpinner);
+		noteTypeLayout = (LinearLayout) this
+				.findViewById(R.id.updatorNoteLayout);
+		noteTypeView = (TextView) this.findViewById(R.id.updatorNoteText);
+		noteTypeButton = (Button) this.findViewById(R.id.updatorNoteButton);
+
+		updateButton = (Button) this.findViewById(R.id.updatorUpdateButton);
+		closeButton = (Button) this.findViewById(R.id.updatorCloseButton);
+
+		noteTypeSpinner.setOnItemSelectedListener(new OnItemSelectedListener() {
+			public void onItemSelected(AdapterView<?> parent, View view,
+					int position, long id) {
+				noteTypeSpinnerItemSelected(parent, view, position, id);
+			}
+
+			public void onNothingSelected(AdapterView<?> view) {
+				;
+			}
+		});
+		noteTypeButton.setOnClickListener(new OnClickListener() {
+			public void onClick(View view) {
+				noteTypeButtonOnClick();
+			}
+		});
+		updateButton.setOnClickListener(new OnClickListener() {
+			public void onClick(View view) {
+				updateButtonOnClick();
+			}
+		});
+		closeButton.setOnClickListener(new OnClickListener() {
+			public void onClick(View view) {
+				closeButtonOnClick();
+			}
+		});
+
+		ArrayAdapter<CharSequence> noteTypeAdapter = ArrayAdapter
+				.createFromResource(this, R.array.note_item_array,
+						android.R.layout.simple_spinner_item);
+		noteTypeAdapter
+				.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+		noteTypeSpinner.setAdapter(noteTypeAdapter);
+	}
+
+	@Override
+	public void onStart() {
+		super.onStart();
+
+		int noteItemType = pref.getInt(Constant.PREF_NOTE_ITEM_TYPE_TMP,
+				Constant.NOTE_ITEM_TYPE_ALL);
+		noteTypeSpinner.setSelection(noteItemType);
+
+		guid = pref.get(Constant.PREF_NOTE_ITEM_GUID_TMP);
+
+		String title = pref.get(Constant.PREF_NOTE_ITEM_TEXT);
+		noteTypeView.setText(title);
+	}
+
+	@Override
+	public void onPause() {
+		int noteItemType = noteTypeSpinner.getSelectedItemPosition();
+		pref.put(Constant.PREF_NOTE_ITEM_TYPE_TMP, noteItemType);
+
+		pref.update();
+
+		super.onPause();
+	}
+
+	@Override
+	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+		if (resultCode == RESULT_OK) {
+			Bundle ex = data.getExtras();
+			String guid = ex.getString(Constant.EXTRA_GUID);
+			String title = ex.getString(Constant.EXTRA_TITLE);
+
+			pref.put(Constant.PREF_NOTE_ITEM_GUID_TMP, guid);
+			pref.put(Constant.PREF_NOTE_ITEM_TEXT, title);
+			pref.update();
+
+			noteTypeView.setText(title);
+		}
+
+		setStatus();
+	}
+
+	private void noteTypeSpinnerItemSelected(AdapterView<?> parent, View view,
+			int position, long id) {
+		setStatus();
+	}
+
+	private void noteTypeButtonOnClick() {
+		Intent intent = new Intent(this, (Class<?>) NoteTypeListActivity.class);
+		startActivityForResult(intent, 0); // TODO
+	}
+
+	private void updateButtonOnClick() {
+		NoteUpdateTask task = new NoteUpdateTask(this);
+		AsyncTaskCommand command = new AsyncTaskCommand(this, task);
+		// command.setTitle(getString(R.string.noteListGetting)); // TODO
+		command.setTitle("Title"); // TODO
+		command.setButtonTitle(getString(R.string.cancelButton));
+		command.execute("");
+	}
+
+	private void closeButtonOnClick() {
+		finish();
+	}
+
+	public void done(EvernoteUtil.Error errorCode) {
+		if (errorCode != null && !errorCode.equals(EvernoteUtil.Error.NONE)) {
+			EvernoteUtil util = EvernoteUtil.getInstance();
+			Toast.makeText(this, util.getErrorMessage(this, errorCode),
+					Toast.LENGTH_LONG).show();
+		}
+
+		pref.copy(Constant.PREF_NOTE_ITEM_TYPE,
+				Constant.PREF_NOTE_ITEM_TYPE_TMP);
+		pref.copy(Constant.PREF_NOTE_ITEM_GUID,
+				Constant.PREF_NOTE_ITEM_GUID_TMP);
+		closeButtonOnClick();
+	}
+
+	private void setStatus() {
+		int noteType = noteTypeSpinner.getSelectedItemPosition();
+		noteTypeLayout
+				.setVisibility((noteType == Constant.NOTE_ITEM_TYPE_ALL) ? View.GONE
+						: View.VISIBLE);
+	}
+
+}
diff --git a/workspace/EverClip/src/com/yuji/ec/SettingActivity.java b/workspace/EverClip/src/com/yuji/ec/SettingActivity.java
index ca1e9c5..167f65d 100644
--- a/workspace/EverClip/src/com/yuji/ec/SettingActivity.java
+++ b/workspace/EverClip/src/com/yuji/ec/SettingActivity.java
@@ -21,14 +21,11 @@ import android.widget.RadioGroup;
 import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.TimePicker;
-import android.widget.Toast;
 
 import com.yuji.ec.common.Constant;
-import com.yuji.ec.task.NoteUpdateTask;
-import com.yuji.ec.utility.AsyncTaskCommand;
 import com.yuji.ec.utility.BaseActivity;
+import com.yuji.ec.utility.DateUtil;
 import com.yuji.ec.utility.EditPrefUtil;
-import com.yuji.ec.utility.EvernoteUtil;
 
 public class SettingActivity extends BaseActivity {
 	private EditPrefUtil pref = new EditPrefUtil(this);
@@ -36,23 +33,26 @@ public class SettingActivity extends BaseActivity {
 	private LinearLayout messageLayout = null;
 	private TextView messageView = null;
 	private Button userButton = null;
-	private LinearLayout noteTypeLayout = null;
-	private Spinner noteTypeSpinner = null;
-	private TextView noteTypeView = null;
-	private Button noteTypeButton = null;
+//	private LinearLayout noteTypeLayout = null;
+//	private Spinner noteTypeSpinner = null;
+//	private TextView noteTypeView = null;
+//	private Button noteTypeButton = null;
+//	private Button updateButton = null;
+	private Button noteButton = null;
 	private Spinner sortSpinner = null;
 	private RadioGroup sortRadioGroup = null;
 	private RadioButton sortRadio1 = null;
 	private RadioButton sortRadio2 = null;
-	private Button updateButton = null;
 	private CheckBox timeCheckBox = null;
+	private LinearLayout timeLayout = null;
 	private TextView timeView = null;
 	private Button timeButton = null;
-	private TimePicker timePicker = null;
 	private Button closeButton = null;
 
 	private String guid;
 
+	private long updateTime;
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
@@ -61,21 +61,22 @@ public class SettingActivity extends BaseActivity {
 		messageLayout = (LinearLayout) this.findViewById(R.id.settingLayout);
 		messageView = (TextView) this.findViewById(R.id.settingMessage);
 		userButton = (Button) this.findViewById(R.id.settingUserButton);
-		noteTypeSpinner = (Spinner) this.findViewById(R.id.settingNoteSpinner);
-		noteTypeLayout = (LinearLayout) this
-				.findViewById(R.id.settingNoteLayout);
-		noteTypeView = (TextView) this.findViewById(R.id.settingNoteText);
-		noteTypeButton = (Button) this.findViewById(R.id.settingNoteButton);
+//		noteTypeSpinner = (Spinner) this.findViewById(R.id.settingNoteSpinner);
+//		noteTypeLayout = (LinearLayout) this
+//				.findViewById(R.id.settingNoteLayout);
+//		noteTypeView = (TextView) this.findViewById(R.id.settingNoteText);
+//		noteTypeButton = (Button) this.findViewById(R.id.settingNoteButton);
+//		updateButton = (Button) this.findViewById(R.id.settingUpdateButton);
+		noteButton = (Button) this.findViewById(R.id.settingNoteButton);
 		sortSpinner = (Spinner) this.findViewById(R.id.settingSortSpinner);
 		sortRadioGroup = (RadioGroup) this
 				.findViewById(R.id.settingSortRadioGroup);
 		sortRadio1 = (RadioButton) this.findViewById(R.id.settingSortRadio1);
 		sortRadio2 = (RadioButton) this.findViewById(R.id.settingSortRadio2);
-		updateButton = (Button) this.findViewById(R.id.settingUpdateButton);
 		timeCheckBox = (CheckBox) this.findViewById(R.id.settingTimeCheckBox);
+		timeLayout = (LinearLayout) this.findViewById(R.id.settingTimeLayout);
 		timeView = (TextView) this.findViewById(R.id.settingTimeText);
 		timeButton = (Button) this.findViewById(R.id.settingTimeButton);
-		timePicker = (TimePicker) this.findViewById(R.id.settingTimePicker);
 
 		closeButton = (Button) this.findViewById(R.id.settingCloseButton);
 
@@ -84,21 +85,33 @@ public class SettingActivity extends BaseActivity {
 				userButtonOnClick();
 			}
 		});
-		noteTypeSpinner.setOnItemSelectedListener(new OnItemSelectedListener() {
-			public void onItemSelected(AdapterView<?> parent, View view,
-					int position, long id) {
-				noteTypeSpinnerItemSelected(parent, view, position, id);
-			}
+//		noteTypeSpinner.setOnItemSelectedListener(new OnItemSelectedListener() {
+//			public void onItemSelected(AdapterView<?> parent, View view,
+//					int position, long id) {
+//				noteTypeSpinnerItemSelected(parent, view, position, id);
+//			}
+//
+//			public void onNothingSelected(AdapterView<?> view) {
+//				;
+//			}
+//		});
+//		noteTypeButton.setOnClickListener(new OnClickListener() {
+//			public void onClick(View view) {
+//				noteTypeButtonOnClick();
+//			}
+//		});
+//		updateButton.setOnClickListener(new OnClickListener() {
+//			public void onClick(View view) {
+//				updateButtonOnClick();
+//			}
+//		});
+
+		noteButton.setOnClickListener(new OnClickListener() {
+		public void onClick(View view) {
+			noteButtonOnClick();
+		}
+	});
 
-			public void onNothingSelected(AdapterView<?> view) {
-				;
-			}
-		});
-		noteTypeButton.setOnClickListener(new OnClickListener() {
-			public void onClick(View view) {
-				noteTypeButtonOnClick();
-			}
-		});
 		sortSpinner.setOnItemSelectedListener(new OnItemSelectedListener() {
 			public void onItemSelected(AdapterView<?> parent, View view,
 					int position, long id) {
@@ -121,22 +134,12 @@ public class SettingActivity extends BaseActivity {
 				sortCheckedChanged(buttonView, isChecked, 2);
 			}
 		});
-		updateButton.setOnClickListener(new OnClickListener() {
-			public void onClick(View view) {
-				updateButtonOnClick();
-			}
-		});
 		timeCheckBox.setOnCheckedChangeListener(new OnCheckedChangeListener() {
 			public void onCheckedChanged(CompoundButton buttonView,
 					boolean isChecked) {
 				timeCheckBoxOnClick(buttonView, isChecked);
 			}
 		});
-		timePicker.setOnClickListener(new OnClickListener() {
-			public void onClick(View view) {
-				timePickerOnClick();
-			}
-		});
 		timeButton.setOnClickListener(new OnClickListener() {
 			public void onClick(View view) {
 				timeButtonOnClick();
@@ -148,12 +151,12 @@ public class SettingActivity extends BaseActivity {
 			}
 		});
 
-		ArrayAdapter<CharSequence> noteTypeAdapter = ArrayAdapter
-				.createFromResource(this, R.array.note_item_array,
-						android.R.layout.simple_spinner_item);
-		noteTypeAdapter
-				.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-		noteTypeSpinner.setAdapter(noteTypeAdapter);
+//		ArrayAdapter<CharSequence> noteTypeAdapter = ArrayAdapter
+//				.createFromResource(this, R.array.note_item_array,
+//						android.R.layout.simple_spinner_item);
+//		noteTypeAdapter
+//				.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+//		noteTypeSpinner.setAdapter(noteTypeAdapter);
 
 		ArrayAdapter<CharSequence> noteOrderAdapter = ArrayAdapter
 				.createFromResource(this, R.array.note_order_array,
@@ -169,13 +172,13 @@ public class SettingActivity extends BaseActivity {
 	public void onStart() {
 		super.onStart();
 
-		int noteItemType = pref.getInt(Constant.PREF_NOTE_ITEM_TYPE,
-				Constant.NOTE_ITEM_TYPE_ALL);
-		noteTypeSpinner.setSelection(noteItemType);
-
-		guid = pref.get(Constant.PREF_NOTE_ITEM_GUID);
-		String title = pref.get(Constant.PREF_NOTE_ITEM_TEXT);
-		noteTypeView.setText(title);
+//		int noteItemType = pref.getInt(Constant.PREF_NOTE_ITEM_TYPE,
+//				Constant.NOTE_ITEM_TYPE_ALL);
+//		noteTypeSpinner.setSelection(noteItemType);
+//
+//		guid = pref.get(Constant.PREF_NOTE_ITEM_GUID);
+//		String title = pref.get(Constant.PREF_NOTE_ITEM_TEXT);
+//		noteTypeView.setText(title);
 
 		int noteOrder = pref.getInt(Constant.PREF_NOTE_ORDER,
 				Constant.NOTE_ORDER_CREATE);
@@ -194,12 +197,16 @@ public class SettingActivity extends BaseActivity {
 
 		int autoUpdate = pref.getInt(Constant.PREF_AUTO_UPDATE, Constant.OFF);
 		timeCheckBox.setChecked(autoUpdate == Constant.ON);
-	}
+
+		updateTime = pref.getLong(Constant.PREF_UPDATE_TIME, DateUtil.getTime(0, 0, 0));
+		String str = DateUtil.toDateString(SettingActivity.this, updateTime);
+		timeView.setText(str);
+}
 
 	@Override
 	public void onPause() {
-		int noteItemType = noteTypeSpinner.getSelectedItemPosition();
-		pref.put(Constant.PREF_NOTE_ITEM_TYPE, noteItemType);
+//		int noteItemType = noteTypeSpinner.getSelectedItemPosition();
+//		pref.put(Constant.PREF_NOTE_ITEM_TYPE, noteItemType);
 
 		int noteOrder = sortSpinner.getSelectedItemPosition();
 		pref.put(Constant.PREF_NOTE_ORDER, noteOrder);
@@ -216,6 +223,8 @@ public class SettingActivity extends BaseActivity {
 		int autoUpdate = timeCheckBox.isChecked() ? Constant.ON : Constant.OFF;
 		pref.put(Constant.PREF_AUTO_UPDATE, autoUpdate);
 
+		pref.put(Constant.PREF_UPDATE_TIME, updateTime);
+		
 		pref.update();
 
 		super.onPause();
@@ -233,17 +242,17 @@ public class SettingActivity extends BaseActivity {
 
 	@Override
 	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-		if (resultCode == RESULT_OK) {
-			Bundle ex = data.getExtras();
-			String guid = ex.getString(Constant.EXTRA_GUID);
-			String title = ex.getString(Constant.EXTRA_TITLE);
-
-			pref.put(Constant.PREF_NOTE_ITEM_GUID, guid);
-			pref.put(Constant.PREF_NOTE_ITEM_TEXT, title);
-			pref.update();
-
-			noteTypeView.setText(title);
-		}
+//		if (resultCode == RESULT_OK) {
+//			Bundle ex = data.getExtras();
+//			String guid = ex.getString(Constant.EXTRA_GUID);
+//			String title = ex.getString(Constant.EXTRA_TITLE);
+//
+//			pref.put(Constant.PREF_NOTE_ITEM_GUID, guid);
+//			pref.put(Constant.PREF_NOTE_ITEM_TEXT, title);
+//			pref.update();
+//
+//			noteTypeView.setText(title);
+//		}
 
 		setStatus();
 	}
@@ -253,16 +262,33 @@ public class SettingActivity extends BaseActivity {
 		startActivityForResult(intent, 0);
 	}
 
-	private void noteTypeSpinnerItemSelected(AdapterView<?> parent, View view,
-			int position, long id) {
-		setStatus();
-	}
-
-	private void noteTypeButtonOnClick() {
-		Intent intent = new Intent(this, (Class<?>) NoteTypeListActivity.class);
-		startActivityForResult(intent, 1); // TODO
+//	private void noteTypeSpinnerItemSelected(AdapterView<?> parent, View view,
+//			int position, long id) {
+//		setStatus();
+//	}
+//
+//	private void noteTypeButtonOnClick() {
+//		Intent intent = new Intent(this, (Class<?>) NoteTypeListActivity.class);
+//		startActivityForResult(intent, 1); // TODO
+//	}
+//
+//	private void updateButtonOnClick() {
+//		NoteUpdateTask task = new NoteUpdateTask(this);
+//		AsyncTaskCommand command = new AsyncTaskCommand(this, task);
+//		// command.setTitle(getString(R.string.noteListGetting)); // TODO
+//		command.setTitle("Title");
+//		command.setButtonTitle(getString(R.string.cancelButton));
+//		command.execute("");
+//	}
+
+	private void noteButtonOnClick(){
+		pref.copy(Constant.PREF_NOTE_ITEM_TYPE, Constant.PREF_NOTE_ITEM_TYPE_TMP);
+		pref.copy(Constant.PREF_NOTE_ITEM_GUID, Constant.PREF_NOTE_ITEM_GUID_TMP);
+		
+		Intent intent = new Intent(this, (Class<?>) NoteUpdatorActivity.class);
+		startActivityForResult(intent, 1); // TODO		
 	}
-
+	
 	private void sortSpinnerItemSelected(AdapterView<?> parent, View view,
 			int position, long id) {
 
@@ -273,15 +299,6 @@ public class SettingActivity extends BaseActivity {
 
 	}
 
-	private void updateButtonOnClick() {
-		NoteUpdateTask task = new NoteUpdateTask(this);
-		AsyncTaskCommand command = new AsyncTaskCommand(this, task);
-		// command.setTitle(getString(R.string.noteListGetting)); // TODO
-		command.setTitle("Title");
-		command.setButtonTitle(getString(R.string.cancelButton));
-		command.execute("");
-	}
-
 	// private void noteButtonOnClick() {
 	// NoteListActivity.init();
 	// SelectNoteListActivity.init(this);
@@ -296,31 +313,27 @@ public class SettingActivity extends BaseActivity {
 	// startActivityForResult(intent, 0);
 	// }
 
-	public void done(EvernoteUtil.Error errorCode) {
-		// if (errorCode != null && !errorCode.equals(Error.NONE)) {
-		// EvernoteUtil util = EvernoteUtil.getInstance();
-		// Toast.makeText(this, util.getErrorMessage(this, errorCode),
-		// Toast.LENGTH_LONG).show();
-		// }
-		//
-		// if (nList == null) {
-		// // ƒLƒƒƒ“ƒZƒ‹ƒ{ƒ^ƒ“‰Ÿ‰ºŽž
-		// closeButtonOnClick();
-		// return;
-		// }
-		//
-		// List<NoteListItem> list = getNoteList(nList);
-		// if (list == null) {
-		// closeButtonOnClick();
-		// return;
-		// }
-		// setNoteList(list);
-		// noteList = list;
-	}
-
-	private void timePickerOnClick() {
-
-	}
+//	public void done(EvernoteUtil.Error errorCode) {
+//		// if (errorCode != null && !errorCode.equals(Error.NONE)) {
+//		// EvernoteUtil util = EvernoteUtil.getInstance();
+//		// Toast.makeText(this, util.getErrorMessage(this, errorCode),
+//		// Toast.LENGTH_LONG).show();
+//		// }
+//		//
+//		// if (nList == null) {
+//		// // ƒLƒƒƒ“ƒZƒ‹ƒ{ƒ^ƒ“‰Ÿ‰ºŽž
+//		// closeButtonOnClick();
+//		// return;
+//		// }
+//		//
+//		// List<NoteListItem> list = getNoteList(nList);
+//		// if (list == null) {
+//		// closeButtonOnClick();
+//		// return;
+//		// }
+//		// setNoteList(list);
+//		// noteList = list;
+//	}
 
 	protected void timeCheckBoxOnClick(CompoundButton buttonView,
 			boolean isChecked) {
@@ -335,7 +348,13 @@ public class SettingActivity extends BaseActivity {
         TimePickerDialog timePickerDialog = new TimePickerDialog(this,
             new TimePickerDialog.OnTimeSetListener() {
 				public void onTimeSet(TimePicker view, int hourOfDay, int minute) {
+					int second = 0;
+					
+					long t = DateUtil.getTime(hourOfDay, minute, second);
+					String str = DateUtil.toDateString(SettingActivity.this, t);
 					
+					updateTime = t;
+					timeView.setText(str);
 				}
             }, hour, minute, true);
         timePickerDialog.show();
@@ -351,7 +370,7 @@ public class SettingActivity extends BaseActivity {
 	}
 
 	private void setStatus() {
-		timePicker.setVisibility(timeCheckBox.isChecked() ? View.VISIBLE
+		timeLayout.setVisibility(timeCheckBox.isChecked() ? View.VISIBLE
 				: View.GONE);
 
 		// TODO
@@ -373,10 +392,10 @@ public class SettingActivity extends BaseActivity {
 		// return;
 		// }
 
-		int noteType = noteTypeSpinner.getSelectedItemPosition();
-		noteTypeLayout
-				.setVisibility((noteType == Constant.NOTE_ITEM_TYPE_ALL) ? View.GONE
-						: View.VISIBLE);
+//		int noteType = noteTypeSpinner.getSelectedItemPosition();
+//		noteTypeLayout
+//				.setVisibility((noteType == Constant.NOTE_ITEM_TYPE_ALL) ? View.GONE
+//						: View.VISIBLE);
 
 		messageLayout.setVisibility(View.GONE);
 		// noteButton.setEnabled(true);
diff --git a/workspace/EverClip/src/com/yuji/ec/common/Constant.java b/workspace/EverClip/src/com/yuji/ec/common/Constant.java
index 8e59d80..691478e 100644
--- a/workspace/EverClip/src/com/yuji/ec/common/Constant.java
+++ b/workspace/EverClip/src/com/yuji/ec/common/Constant.java
@@ -6,10 +6,13 @@ public class Constant {
 	public static final String PREF_PASSWORD = "PASSWORD";
 	public static final String PREF_NOTE_ITEM_TYPE = "NOTE_ITEM_TYPE";
 	public static final String PREF_NOTE_ITEM_GUID = "NOTE_ITEM_GUID";
+	public static final String PREF_NOTE_ITEM_TYPE_TMP = "NOTE_ITEM_TYPE_TMP";
+	public static final String PREF_NOTE_ITEM_GUID_TMP = "NOTE_ITEM_GUID_TMP";
 	public static final String PREF_NOTE_ITEM_TEXT = "NOTE_ITEM_TEXT";
 	public static final String PREF_NOTE_ORDER = "NOTE_ORDER";
 	public static final String PREF_NOTE_ORDER_BY = "NOTE_ORDER_BY";
 	public static final String PREF_AUTO_UPDATE = "AUTO_UPDATE";
+	public static final String PREF_UPDATE_TIME = "UPDATE_TIME";
 	
 	public static final String EXTRA_GUID = "GUID";
 	public static final String EXTRA_TITLE = "TITLE";
diff --git a/workspace/EverClip/src/com/yuji/ec/task/NoteTypeListTask.java b/workspace/EverClip/src/com/yuji/ec/task/NoteTypeListTask.java
index 43ce324..8a3986c 100644
--- a/workspace/EverClip/src/com/yuji/ec/task/NoteTypeListTask.java
+++ b/workspace/EverClip/src/com/yuji/ec/task/NoteTypeListTask.java
@@ -15,7 +15,7 @@ import com.yuji.ec.utility.NoteUpdator;
 
 public class NoteTypeListTask implements AsyncTaskIF {
 	private EvernoteUtil util = EvernoteUtil.getInstance();
-	private NoteList noteList;
+	//private NoteList noteList;
 	private WeakReference<NoteTypeListActivity> activityRef;
 	private EvernoteUtil.Error errorCode = null;
 
@@ -65,9 +65,9 @@ public class NoteTypeListTask implements AsyncTaskIF {
 		return 0;
 	}
 
-	public NoteList getNoteList() {
-		return noteList;
-	}
+//	public NoteList getNoteList() {
+//		return noteList;
+//	}
 
 	public EvernoteUtil.Error getErrorCode() {
 		return errorCode;
diff --git a/workspace/EverClip/src/com/yuji/ec/task/NoteUpdateTask.java b/workspace/EverClip/src/com/yuji/ec/task/NoteUpdateTask.java
index 56390fa..5ecb881 100644
--- a/workspace/EverClip/src/com/yuji/ec/task/NoteUpdateTask.java
+++ b/workspace/EverClip/src/com/yuji/ec/task/NoteUpdateTask.java
@@ -3,6 +3,7 @@ package com.yuji.ec.task;
 import java.lang.ref.WeakReference;
 
 import com.evernote.edam.notestore.NoteList;
+import com.yuji.ec.NoteUpdatorActivity;
 import com.yuji.ec.SettingActivity;
 import com.yuji.ec.utility.AsyncTaskIF;
 import com.yuji.ec.utility.EvernoteUtil;
@@ -11,11 +12,11 @@ import com.yuji.ec.utility.NoteUpdator;
 public class NoteUpdateTask implements AsyncTaskIF {
 	private EvernoteUtil util = EvernoteUtil.getInstance();
 	private NoteList noteList;
-	private WeakReference<SettingActivity> activityRef;
+	private WeakReference<NoteUpdatorActivity> activityRef;
 	private EvernoteUtil.Error errorCode = null;
 
-	public NoteUpdateTask(SettingActivity activity) {
-		activityRef = new WeakReference<SettingActivity>(activity);
+	public NoteUpdateTask(NoteUpdatorActivity activity) {
+		activityRef = new WeakReference<NoteUpdatorActivity>(activity);
 	}
 
 	public void doExecute() {
@@ -34,7 +35,7 @@ public class NoteUpdateTask implements AsyncTaskIF {
 	}
 
 	public void done(boolean isCancel) {
-		SettingActivity activity = activityRef.get();
+		NoteUpdatorActivity activity = activityRef.get();
 		if (activity != null) {
 			activity.done(errorCode);
 			activityRef = null;
diff --git a/workspace/EverClip/src/com/yuji/ec/utility/DateUtil.java b/workspace/EverClip/src/com/yuji/ec/utility/DateUtil.java
new file mode 100644
index 0000000..57945c1
--- /dev/null
+++ b/workspace/EverClip/src/com/yuji/ec/utility/DateUtil.java
@@ -0,0 +1,58 @@
+package com.yuji.ec.utility;
+
+import java.util.Calendar;
+
+import android.content.Context;
+import android.text.format.DateUtils;
+
+public class DateUtil {
+	public static long next(){
+        Calendar cal = Calendar.getInstance();
+        int h = cal.get(Calendar.HOUR_OF_DAY);
+        int m = cal.get(Calendar.MINUTE);
+        int s = cal.get(Calendar.SECOND);
+        
+		m = (m / 10) * 10;
+        s = 0;
+        
+        cal.set(Calendar.MINUTE, m);
+        cal.set(Calendar.SECOND, s);
+        cal.add(Calendar.MINUTE, 10);
+		
+        return cal.getTimeInMillis();
+	}
+
+	public static long next(int h, int m, int s, int ds){
+        Calendar cal = Calendar.getInstance();
+
+        cal.add(Calendar.SECOND, -ds);
+        
+        int nh = cal.get(Calendar.HOUR_OF_DAY);
+        int nm = cal.get(Calendar.MINUTE);
+        int ns = cal.get(Calendar.SECOND);
+		
+        cal.set(Calendar.HOUR_OF_DAY, h);
+        cal.set(Calendar.MINUTE, m);
+        cal.set(Calendar.SECOND, s);
+        if (h < nh || m < nm || s < ns){
+            cal.add(Calendar.DATE, 1);        	
+        }
+		
+        return cal.getTimeInMillis();
+	}
+	
+	public static long getTime(int h, int m, int s){
+        Calendar cal = Calendar.getInstance();
+        cal.set(Calendar.HOUR_OF_DAY, h);
+        cal.set(Calendar.MINUTE, m);
+        cal.set(Calendar.SECOND, s);
+		
+        return cal.getTimeInMillis();
+	}
+	
+	public static String toDateString(Context context, long t){
+		String str = DateUtils.formatDateTime(context, t,
+				DateUtils.FORMAT_SHOW_TIME);
+		return str;
+	}
+}
diff --git a/workspace/EverClip/src/com/yuji/ec/utility/EditPrefUtil.java b/workspace/EverClip/src/com/yuji/ec/utility/EditPrefUtil.java
index 187d2e0..7c2d885 100644
--- a/workspace/EverClip/src/com/yuji/ec/utility/EditPrefUtil.java
+++ b/workspace/EverClip/src/com/yuji/ec/utility/EditPrefUtil.java
@@ -25,6 +25,10 @@ public class EditPrefUtil implements PrefUtil {
 		hash.put(key, String.valueOf(value));
 	}
 
+	public void put(String key, long value) {
+		hash.put(key, String.valueOf(value));
+	}
+
 	public String get(String key) {
 		String value = hash.get(key);
 		if (value != null){
@@ -52,6 +56,9 @@ public class EditPrefUtil implements PrefUtil {
 		return Integer.valueOf(get(key, String.valueOf(initValue)));
 	}
 	
+	public long getLong(String key, long initValue) {
+		return Long.valueOf(get(key, String.valueOf(initValue)));
+	}
 	public void update(){
 		Set<Entry<String, String>> set = hash.entrySet();
 		for (Iterator<Entry<String, String>> it = set.iterator(); it.hasNext(); ){
@@ -63,6 +70,11 @@ public class EditPrefUtil implements PrefUtil {
 		hash.clear();
 	}
 
+	public void copy(String srcKey, String dstKey){
+		String value = get(srcKey);
+		put(dstKey, value);
+	}
+	
 	public void remove(String key) {
 		hash.put(key, null);
 	}
@@ -95,5 +107,4 @@ public class EditPrefUtil implements PrefUtil {
 			put(prefKey, prefValue);
 		}
 	}
-
 }
diff --git a/workspace/EverClip/src/com/yuji/ec/utility/EvernoteUtil.java b/workspace/EverClip/src/com/yuji/ec/utility/EvernoteUtil.java
index 9231cc2..76c3351 100644
--- a/workspace/EverClip/src/com/yuji/ec/utility/EvernoteUtil.java
+++ b/workspace/EverClip/src/com/yuji/ec/utility/EvernoteUtil.java
@@ -99,13 +99,36 @@ public class EvernoteUtil {
 		return note;
 	}
 
-	public NoteList getNoteList() {
-		errorCode = Error.OTHER;
-
+	private NoteFilter getDefaultFilter(){
 		// ŒŸõðŒ‚Æ‚µ‚āAŒŸõŒê‚È‚µAXV“ú‡ƒ\[ƒg‚ðŽw’è
 		NoteFilter filter = new NoteFilter();
 		filter.setOrder(NoteSortOrder.UPDATED.getValue());
-		filter.setAscending(false);
+		filter.setAscending(false);		
+
+		return filter;
+	}
+	
+	public NoteList getNoteList() {
+		NoteFilter filter = getDefaultFilter();
+		return getNoteList(filter);
+	}
+
+	public NoteList getNoteListByNotebook(String notebookGuid) {
+		NoteFilter filter = getDefaultFilter();
+		filter.setNotebookGuid(notebookGuid);
+		return getNoteList(filter);
+	}
+	
+	public NoteList getNoteListByTag(String tagGuid) {
+		NoteFilter filter = getDefaultFilter();
+		List<String> tagGuids = new ArrayList<String>();
+		tagGuids.add(tagGuid);
+		filter.setTagGuids(tagGuids);
+		return getNoteList(filter);
+	}
+	
+	public NoteList getNoteList(NoteFilter filter) {
+		errorCode = Error.OTHER;
 
 		NoteList noteList = null;
 		try {
@@ -331,13 +354,14 @@ public class EvernoteUtil {
 		return note;
 	}
 
-	public List<com.yuji.ec.db.Note> getNoteContentList() {
+	//public List<com.yuji.ec.db.Note> getNoteContentList() {
+	public List<com.yuji.ec.db.Note> getNoteContentList(NoteList noteList) {
 		errorCode = Error.OTHER;
 
-		NoteList noteList = getNoteList();
-		if (noteList == null) {
-			return null;
-		}
+//		NoteList noteList = getNoteList();
+//		if (noteList == null) {
+//			return null;
+//		}
 
 		List<com.yuji.ec.db.Note> list = new ArrayList<com.yuji.ec.db.Note>();
 		HtmlParser parser = new HtmlParser();
diff --git a/workspace/EverClip/src/com/yuji/ec/utility/NoteUpdator.java b/workspace/EverClip/src/com/yuji/ec/utility/NoteUpdator.java
index bd5f946..b50b12d 100644
--- a/workspace/EverClip/src/com/yuji/ec/utility/NoteUpdator.java
+++ b/workspace/EverClip/src/com/yuji/ec/utility/NoteUpdator.java
@@ -5,48 +5,64 @@ import java.util.List;
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
 
+import com.evernote.edam.notestore.NoteList;
 import com.yuji.ec.common.CommonUtil;
+import com.yuji.ec.common.Constant;
 import com.yuji.ec.db.DatabaseHelper;
 import com.yuji.ec.db.Note;
 import com.yuji.ec.db.NoteDao;
 
 public class NoteUpdator {
-	public void update(Context context){
+	private int itemType = Constant.NOTE_ITEM_TYPE_ALL;
+	private String guid = null;
+
+	public void update(Context context) {
 		try {
 			EvernoteUtil util = EvernoteUtil.getInstance();
 			String username = PasswordUtil.getUsername(context);
 			String password = PasswordUtil.getPassword(context);
 			if (!CommonUtil.isNull(username) && !CommonUtil.isNull(password)) {
 				util.setConfig(username, password);
-			}
-			else {
+			} else {
 				return;
 			}
-			
-			List<Note> list = util.getNoteContentList();
-			if (list == null){
+
+			NoteList noteList;
+			switch (itemType) {
+			case Constant.NOTE_ITEM_TYPE_NOTE_BOOK:
+				noteList = util.getNoteListByNotebook(guid);
+				break;
+			case Constant.NOTE_ITEM_TYPE_TAG:
+				noteList = util.getNoteListByTag(guid);
+				break;
+			default:
+				noteList = util.getNoteList();
+				break;
+			}
+
+			List<Note> list = util.getNoteContentList(noteList);
+			if (list == null) {
 				// TODO
 				return;
 			}
-			
+
 			DatabaseHelper helper = DatabaseHelper.getInstance();
 			SQLiteDatabase db = helper.getWritableDatabase();
-			NoteDao dao = (NoteDao)NoteDao.getInstance();
+			NoteDao dao = (NoteDao) NoteDao.getInstance();
 
 			db.beginTransaction();
 			try {
 				dao.deleteNT();
-				for (Note note : list){
+				for (Note note : list) {
 					dao.addNT(note);
 				}
 				db.setTransactionSuccessful();
 			} finally {
 				db.endTransaction();
 			}
-		}
-		catch (Exception e){
+		} catch (Exception e) {
 			// TODO
 			e.printStackTrace();
-		}		
+		}
 	}
 }
diff --git a/workspace/EverClip/src/com/yuji/ec/utility/PrefUtil.java b/workspace/EverClip/src/com/yuji/ec/utility/PrefUtil.java
index c8d5d1c..69325c4 100644
--- a/workspace/EverClip/src/com/yuji/ec/utility/PrefUtil.java
+++ b/workspace/EverClip/src/com/yuji/ec/utility/PrefUtil.java
@@ -3,9 +3,12 @@ package com.yuji.ec.utility;
 public interface PrefUtil {
 	void put(String key, String value);
 	void put(String key, int value);
+	void put(String key, long value);
 	String get(String key);
 	int getInt(String key);
 	String get(String key, String initValue);
 	int getInt(String key, int initValue);
+	long getLong(String key, long initValue);
+	void copy(String srcKey, String dstKey);
 	void remove(String key);
 }
diff --git a/workspace/EverClip/src/com/yuji/ec/utility/PrefUtilImpl.java b/workspace/EverClip/src/com/yuji/ec/utility/PrefUtilImpl.java
index 91b06cf..d55bc40 100644
--- a/workspace/EverClip/src/com/yuji/ec/utility/PrefUtilImpl.java
+++ b/workspace/EverClip/src/com/yuji/ec/utility/PrefUtilImpl.java
@@ -37,6 +37,10 @@ public class PrefUtilImpl implements PrefUtil {
 		put(key, String.valueOf(value));
 	}
 
+	public void put(String key, long value) {
+		put(key, String.valueOf(value));
+	}
+
 	public String get(String key) {
 		String val;
 		
@@ -61,6 +65,10 @@ public class PrefUtilImpl implements PrefUtil {
 		return Integer.parseInt(get(key));
 	}
 
+	public long getLong(String key) {
+		return Long.parseLong(get(key));
+	}
+
 	public String get(String key, String initValue) {
 		String value = get(key);
 		if (value != null) {
@@ -74,6 +82,15 @@ public class PrefUtilImpl implements PrefUtil {
 		return Integer.valueOf(get(key, String.valueOf(initValue)));
 	}
 
+	public long getLong(String key, long initValue) {
+		return Long.valueOf(get(key, String.valueOf(initValue)));
+	}
+	
+	public void copy(String srcKey, String dstKey){
+		String value = get(srcKey);
+		put(dstKey, value);
+	}
+	
 	public void remove(String key) {
 		put(key, null);
 	}
-- 
2.11.0