T28082

diff --git a/workspace/EverClip/gen/com/yuji/ec/R.java b/workspace/EverClip/gen/com/yuji/ec/R.java
index 244e978..69089e5 100644 (file)
--- a/workspace/EverClip/gen/com/yuji/ec/R.java
+++ b/workspace/EverClip/gen/com/yuji/ec/R.java
@@ -78,13 +78,14 @@ public final class R {
         public static final int cancelButton=0x7f050006;
         public static final int closeButton=0x7f050007;
         public static final int deleteButton=0x7f050005;
-        public static final int mainConfirmTitle=0x7f050024;
+        public static final int mainConfirmTitle=0x7f050026;
         public static final int mainMenuSetting=0x7f050008;
         public static final int mainTitle=0x7f050009;
         public static final int noButton=0x7f050003;
-        public static final int noteTypeConfirmTitle=0x7f050026;
-        public static final int noteTypeTitle=0x7f05001a;
-        public static final int selectTitle=0x7f050025;
+        public static final int noteTypeConfirmTitle=0x7f050028;
+        public static final int noteTypeDialogTitle=0x7f05001c;
+        public static final int noteTypeTitle=0x7f05001b;
+        public static final int selectTitle=0x7f050027;
         public static final int sendButton=0x7f050001;
         public static final int settingConfirmNoteMsg=0x7f05000c;
         public static final int settingConfirmTitle=0x7f05000a;
@@ -93,27 +94,28 @@ public final class R {
         public static final int settingNoteTitle=0x7f05000f;
         public static final int settingSortTitle=0x7f050011;
         public static final int settingTimeButton=0x7f050015;
-        public static final int settingTimeText=0x7f050028;
+        public static final int settingTimeText=0x7f05002a;
         public static final int settingTimeTitle=0x7f050014;
         public static final int settingUpdateButton=0x7f050013;
         public static final int settingUpdateTitle=0x7f050012;
         public static final int settingUserButton=0x7f05000e;
         public static final int settingUserTitle=0x7f05000d;
-        public static final int toastConnect=0x7f05001e;
-        public static final int toastEvernoteSystem=0x7f050022;
-        public static final int toastFailedToGetList=0x7f050020;
-        public static final int toastFailedToWrite=0x7f05001d;
-        public static final int toastInvalidAuth=0x7f050021;
-        public static final int toastNoteDoesNotExist=0x7f05001f;
-        public static final int toastSystem=0x7f050023;
+        public static final int toastConnect=0x7f050020;
+        public static final int toastEvernoteSystem=0x7f050024;
+        public static final int toastFailedToGetList=0x7f050022;
+        public static final int toastFailedToWrite=0x7f05001f;
+        public static final int toastInvalidAuth=0x7f050023;
+        public static final int toastNoteDoesNotExist=0x7f050021;
+        public static final int toastSystem=0x7f050025;
         public static final int updateButton=0x7f050004;
         public static final int updatorConfirmTitle=0x7f050016;
         public static final int updatorMessage=0x7f050017;
         public static final int updatorNoteButton=0x7f050019;
-        public static final int updatorNoteText=0x7f050027;
+        public static final int updatorNoteDialogTitle=0x7f05001a;
+        public static final int updatorNoteText=0x7f050029;
         public static final int updatorNoteTitle=0x7f050018;
-        public static final int userPasswordTitle=0x7f05001c;
-        public static final int userUserTitle=0x7f05001b;
+        public static final int userPasswordTitle=0x7f05001e;
+        public static final int userUserTitle=0x7f05001d;
         public static final int yesButton=0x7f050002;
     }
 }

diff --git a/workspace/EverClip/res/values/strings.xml b/workspace/EverClip/res/values/strings.xml
index 762f647..e55ff6f 100644 (file)
--- a/workspace/EverClip/res/values/strings.xml
+++ b/workspace/EverClip/res/values/strings.xml
@@ -31,8 +31,10 @@
        <string name="updatorMessage">ノート取得先の種類(全てのノート、指定したノートブック、指定したタグ)を選択してください。ノートブック、タグを選択した場合は、「更新」ボタンを押して、ノートブック、タグを選択してください</string>
        <string name="updatorNoteTitle">ノート取得先の種類</string>
     <string name="updatorNoteButton">更新</string>
+    <string name="updatorNoteDialogTitle">更新中</string>
     
     <string name="noteTypeTitle">ノート取得先</string>
+    <string name="noteTypeDialogTitle">一覧取得中</string>
     
     <string name="userUserTitle">ユーザ</string>
     <string name="userPasswordTitle">パスワード</string>

diff --git a/workspace/EverClip/src/com/yuji/ec/NoteTypeListActivity.java b/workspace/EverClip/src/com/yuji/ec/NoteTypeListActivity.java
index c5eaceb..c4ca64d 100644 (file)
--- a/workspace/EverClip/src/com/yuji/ec/NoteTypeListActivity.java
+++ b/workspace/EverClip/src/com/yuji/ec/NoteTypeListActivity.java
@@ -53,7 +53,7 @@ public class NoteTypeListActivity extends BaseActivity {
                                Constant.NOTE_ITEM_TYPE_ALL);\r
                NoteTypeListTask task = new NoteTypeListTask(this, noteItemType);\r
                AsyncTaskCommand command = new AsyncTaskCommand(this, task);\r
-               // command.setTitle(getString(R.string.noteListGetting));\r
+               command.setTitle(getString(R.string.noteTypeDialogTitle));\r
                command.setButtonTitle(getString(R.string.cancelButton));\r
                command.execute("");\r
                \r

diff --git a/workspace/EverClip/src/com/yuji/ec/NoteUpdatorActivity.java b/workspace/EverClip/src/com/yuji/ec/NoteUpdatorActivity.java
index 3f3f3b4..296ab22 100644 (file)
--- a/workspace/EverClip/src/com/yuji/ec/NoteUpdatorActivity.java
+++ b/workspace/EverClip/src/com/yuji/ec/NoteUpdatorActivity.java
@@ -145,9 +145,9 @@ public class NoteUpdatorActivity extends BaseActivity {
 
                NoteUpdateTask task = new NoteUpdateTask(this, noteItemType, guid);
                AsyncTaskCommand command = new AsyncTaskCommand(this, task);
-               // command.setTitle(getString(R.string.noteListGetting)); // TODO
-               command.setTitle("Title"); // TODO
+               command.setTitle(getString(R.string.updatorNoteDialogTitle));
                command.setButtonTitle(getString(R.string.cancelButton));
+               command.setCancelable(false);
                command.execute("");
        }
 
@@ -165,10 +165,16 @@ public class NoteUpdatorActivity extends BaseActivity {
                        return;
                }
 
-               pref.copy(Constant.PREF_NOTE_ITEM_TYPE_TMP,
-                               Constant.PREF_NOTE_ITEM_TYPE);
+               int noteItemType = noteTypeSpinner.getSelectedItemPosition();
+               pref.put(Constant.PREF_NOTE_ITEM_TYPE, noteItemType);
                pref.copy(Constant.PREF_NOTE_ITEM_GUID_TMP,
                                Constant.PREF_NOTE_ITEM_GUID);
+               if (noteItemType == Constant.NOTE_ITEM_TYPE_ALL){
+                       pref.remove(Constant.PREF_NOTE_ITEM_GUID);
+                       pref.remove(Constant.PREF_NOTE_ITEM_TEXT);
+               }
+               pref.update();
+               
                closeButtonOnClick();
        }
 
@@ -190,16 +196,20 @@ public class NoteUpdatorActivity extends BaseActivity {
                boolean enabled = false;
                if (noteItemType == Constant.NOTE_ITEM_TYPE_ALL) {
                        enabled = true;
-               } else if (srcNoteItemType == noteItemType) {
-                       if (!CommonUtil.isNull(guid) && !guid.equals(srcGuid)) {
-                               if (guidType >= 0 && guidType == noteItemType) {
-                                       enabled = true;
-                               }
-                       }
-               } else {
-                       if (guidType >= 0 && guidType == noteItemType) {
-                               enabled = true;
-                       }
+//             } else if (srcNoteItemType == noteItemType) {
+//                     if (!CommonUtil.isNull(guid) && !guid.equals(srcGuid)) {
+//                             if (guidType >= 0 && guidType == noteItemType) {
+//                                     enabled = true;
+//                             }
+//                     }
+//             } else {
+//                     if (guidType >= 0 && guidType == noteItemType) {
+//                             enabled = true;
+//                     }
+//             }
+               }
+               else if (guidType >= 0 && guidType == noteItemType) {
+                       enabled = true;
                }
 
                updateButton.setEnabled(enabled);
@@ -223,7 +233,9 @@ public class NoteUpdatorActivity extends BaseActivity {
                                Constant.PREF_NOTE_ITEM_TYPE_TMP);
                pref.copy(Constant.PREF_NOTE_ITEM_GUID,
                                Constant.PREF_NOTE_ITEM_GUID_TMP);
-               pref.remove(Constant.PREF_NOTE_ITEM_GUID_TYPE_TMP);
+               //pref.remove(Constant.PREF_NOTE_ITEM_GUID_TYPE_TMP); // TODO
+               pref.copy(Constant.PREF_NOTE_ITEM_TYPE,
+                               Constant.PREF_NOTE_ITEM_GUID_TYPE_TMP);
 
                pref.update();
        }

diff --git a/workspace/EverClip/src/com/yuji/ec/utility/AsyncTaskCommand.java b/workspace/EverClip/src/com/yuji/ec/utility/AsyncTaskCommand.java
index 1778e74..574f101 100644 (file)
--- a/workspace/EverClip/src/com/yuji/ec/utility/AsyncTaskCommand.java
+++ b/workspace/EverClip/src/com/yuji/ec/utility/AsyncTaskCommand.java
@@ -19,6 +19,7 @@ public class AsyncTaskCommand extends AsyncTask<String, Integer, String> {
        \r
        private String title = "";\r
        private String buttonTitle = "";\r
+       private boolean cancelable = true;\r
        \r
        @SuppressWarnings({ "rawtypes", "unchecked" })\r
        public AsyncTaskCommand(Activity activity, AsyncTaskIF command) {\r
@@ -37,24 +38,26 @@ public class AsyncTaskCommand extends AsyncTask<String, Integer, String> {
                if (isDialog) {\r
                        dialog = new ProgressDialog(activity);\r
                        dialog.setIndeterminate(true);\r
-                       dialog.setCancelable(false);\r
+                       dialog.setCancelable(cancelable);\r
                        dialog.setTitle(title);\r
-                       dialog.setButton(buttonTitle, new DialogInterface.OnClickListener() {\r
-                               public void onClick(DialogInterface dialog, int which) {\r
-                                       dialog.cancel();\r
-                                       AsyncTaskCommand.this.cancel(true);\r
-                               }\r
-                       });\r
-                       dialog.setOnKeyListener(new OnKeyListener() {\r
-                               public boolean onKey(DialogInterface dialog, int keyCode,\r
-                                               KeyEvent event) {\r
-                                       switch (event.getKeyCode()) {\r
-                                       case KeyEvent.KEYCODE_SEARCH:\r
-                                               return true;\r
+                       if (cancelable){\r
+                               dialog.setButton(buttonTitle, new DialogInterface.OnClickListener() {\r
+                                       public void onClick(DialogInterface dialog, int which) {\r
+                                               dialog.cancel();\r
+                                               AsyncTaskCommand.this.cancel(true);\r
                                        }\r
-                                       return false;\r
-                               }\r
-                       });\r
+                               });\r
+                               dialog.setOnKeyListener(new OnKeyListener() {\r
+                                       public boolean onKey(DialogInterface dialog, int keyCode,\r
+                                                       KeyEvent event) {\r
+                                               switch (event.getKeyCode()) {\r
+                                               case KeyEvent.KEYCODE_SEARCH:\r
+                                                       return true;\r
+                                               }\r
+                                               return false;\r
+                                       }\r
+                               });\r
+                       }\r
                        dialog.show();\r
                }\r
                Debug.d(this, "onPreExecute end");\r
@@ -146,4 +149,8 @@ public class AsyncTaskCommand extends AsyncTask<String, Integer, String> {
        public void setButtonTitle(String buttonTitle) {\r
                this.buttonTitle = buttonTitle;\r
        }\r
+       \r
+       public void setCancelable(boolean cancelable){\r
+               this.cancelable  = cancelable;\r
+       }\r
 }\r