From: Yuji Konishi Date: Tue, 17 Apr 2012 06:20:31 +0000 (+0900) Subject: T28109 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b54fe4a9e4201057793d019ea68725fba5acc9d9;p=everclip%2Fsource.git T28109 T28100 --- diff --git a/workspace/EverClip/gen/com/yuji/ec/R.java b/workspace/EverClip/gen/com/yuji/ec/R.java index 6706923..dc0c367 100644 --- a/workspace/EverClip/gen/com/yuji/ec/R.java +++ b/workspace/EverClip/gen/com/yuji/ec/R.java @@ -78,14 +78,16 @@ 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 dialogErrorTitle=0x7f050027; + public static final int dialogSystemError=0x7f050028; public static final int mainConfirmTitle=0x7f05000a; public static final int mainMenuSetting=0x7f050008; public static final int mainTitle=0x7f050009; public static final int noButton=0x7f050003; - public static final int noteTypeConfirmTitle=0x7f050028; + public static final int noteTypeConfirmTitle=0x7f05002a; public static final int noteTypeDialogTitle=0x7f05001d; public static final int noteTypeTitle=0x7f05001c; - public static final int selectTitle=0x7f050027; + public static final int selectTitle=0x7f050029; public static final int sendButton=0x7f050001; public static final int settingConfirmNoteMsg=0x7f05000d; public static final int settingConfirmTitle=0x7f05000b; @@ -94,7 +96,7 @@ public final class R { public static final int settingNoteTitle=0x7f050010; public static final int settingSortTitle=0x7f050012; public static final int settingTimeButton=0x7f050016; - public static final int settingTimeText=0x7f05002a; + public static final int settingTimeText=0x7f05002c; public static final int settingTimeTitle=0x7f050015; public static final int settingUpdateButton=0x7f050014; public static final int settingUpdateTitle=0x7f050013; @@ -112,7 +114,7 @@ public final class R { public static final int updatorMessage=0x7f050018; public static final int updatorNoteButton=0x7f05001a; public static final int updatorNoteDialogTitle=0x7f05001b; - public static final int updatorNoteText=0x7f050029; + public static final int updatorNoteText=0x7f05002b; public static final int updatorNoteTitle=0x7f050019; public static final int userPasswordTitle=0x7f05001f; public static final int userUserTitle=0x7f05001e; diff --git a/workspace/EverClip/res/values/strings.xml b/workspace/EverClip/res/values/strings.xml index 3aff375..32fa92f 100644 --- a/workspace/EverClip/res/values/strings.xml +++ b/workspace/EverClip/res/values/strings.xml @@ -48,6 +48,9 @@ Evernoteとの連係に失敗しました システムエラーが発生しました + エラー + システムエラーが発生しました + 全てのノート ノートブック diff --git a/workspace/EverClip/src/com/yuji/ec/EverClipActivity.java b/workspace/EverClip/src/com/yuji/ec/EverClipActivity.java index 143c044..a079030 100644 --- a/workspace/EverClip/src/com/yuji/ec/EverClipActivity.java +++ b/workspace/EverClip/src/com/yuji/ec/EverClipActivity.java @@ -159,9 +159,6 @@ public class EverClipActivity extends BaseActivity { } updateList(str); } else { - // TODO@—lŽqŒ©‚é - //layoutView.setVisibility(View.GONE); - //updateList(null); Intent intent = new Intent(this, (Class) SettingActivity.class); startActivityForResult(intent, 0); } @@ -169,7 +166,11 @@ public class EverClipActivity extends BaseActivity { private void updateList(String str) { List list = getNoteList(str); - + if (list == null){ + terminate(null); + return; + } + NoteListViewArrayAdapter adapter = new NoteListViewArrayAdapter(this, R.layout.simple_list_item_1, list); listView.setAdapter(adapter); @@ -182,6 +183,9 @@ public class EverClipActivity extends BaseActivity { NoteDao dao = (NoteDao) NoteDao.getInstance(); List list = dao.search(); + if (list == null){ + return null; + } isEmpty = (list.size() <= 0)? true : false; sortList(list); diff --git a/workspace/EverClip/src/com/yuji/ec/Initialize.java b/workspace/EverClip/src/com/yuji/ec/Initialize.java index 341dfab..258c1b3 100644 --- a/workspace/EverClip/src/com/yuji/ec/Initialize.java +++ b/workspace/EverClip/src/com/yuji/ec/Initialize.java @@ -18,29 +18,11 @@ public class Initialize { return; } - // TODO Simeji‚̏ꍇ‚́AÝ’肵‚È‚¢ -// 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); -// } - - try { - DatabaseHelper.init(context); - } catch (ECException e) { - // TODO - e.printStackTrace(); - } + DatabaseHelper.init(context); isInit = false; } - // TODO -// public static void setInitialize() { -// isInit = true; -// } - public static void initialize(Context context, String name) { if (!isInit2) { return; @@ -49,7 +31,6 @@ public class Initialize { return; } - // TODO Simeji‚̏ꍇ‚́AÝ’肵‚È‚¢ EvernoteUtil util = EvernoteUtil.getInstance(); String username = PasswordUtil.getUsername(context); String password = PasswordUtil.getPassword(context); diff --git a/workspace/EverClip/src/com/yuji/ec/NoteTypeListActivity.java b/workspace/EverClip/src/com/yuji/ec/NoteTypeListActivity.java index c4ca64d..6c10640 100644 --- a/workspace/EverClip/src/com/yuji/ec/NoteTypeListActivity.java +++ b/workspace/EverClip/src/com/yuji/ec/NoteTypeListActivity.java @@ -78,46 +78,6 @@ public class NoteTypeListActivity extends BaseActivity { finish(); } - // private void updateList() { - // List list = getNoteList(); - // if (list == null) { - // return; - // } - // - // NoteListViewArrayAdapter adapter = new NoteListViewArrayAdapter(this, - // R.layout.simple_list_item_1, list); - // listView.setAdapter(adapter); - // - // } - // - // private List getNoteList() { - // int noteItemType = pref.getInt(Constant.PREF_NOTE_ITEM_TYPE, - // Constant.NOTE_ITEM_TYPE_ALL); - // - // List list = null; - // EvernoteUtil util = EvernoteUtil.getInstance(); - // switch (noteItemType) { - // case Constant.NOTE_ITEM_TYPE_NOTE_BOOK: - // List noteList = util.getNoteBookList(); - // list = util.toNoteItemFromNoteBook(noteList); - // break; - // case Constant.NOTE_ITEM_TYPE_TAG: - // List tagList = util.getTagList(); - // list = util.toNoteItemFromTag(tagList); - // break; - // default: - // return null; - // } - // - // List itemList = new ArrayList(); - // for (INoteItem iItem : list) { - // NoteListItem item = new NoteListItem(iItem.getText(), iItem); - // itemList.add(item); - // } - // - // return itemList; - // } - // public void done(Error errorCode, List nList) { if (errorCode != null && !errorCode.equals(Error.NONE)) { EvernoteUtil util = EvernoteUtil.getInstance(); @@ -126,9 +86,6 @@ public class NoteTypeListActivity extends BaseActivity { } if (nList == null) { - // ƒLƒƒƒ“ƒZƒ‹ƒ{ƒ^ƒ“‰Ÿ‰ºŽž - // TODO - // closeButtonOnClick(); return; } diff --git a/workspace/EverClip/src/com/yuji/ec/NoteUpdatorActivity.java b/workspace/EverClip/src/com/yuji/ec/NoteUpdatorActivity.java index 6eacb2e..40dcf6d 100644 --- a/workspace/EverClip/src/com/yuji/ec/NoteUpdatorActivity.java +++ b/workspace/EverClip/src/com/yuji/ec/NoteUpdatorActivity.java @@ -239,7 +239,6 @@ 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); // TODO pref.copy(Constant.PREF_NOTE_ITEM_TYPE, Constant.PREF_NOTE_ITEM_GUID_TYPE_TMP); diff --git a/workspace/EverClip/src/com/yuji/ec/SettingActivity.java b/workspace/EverClip/src/com/yuji/ec/SettingActivity.java index a510ba1..5acb552 100644 --- a/workspace/EverClip/src/com/yuji/ec/SettingActivity.java +++ b/workspace/EverClip/src/com/yuji/ec/SettingActivity.java @@ -345,26 +345,6 @@ 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 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() { NoteUpdatorActivity.init(this); Intent intent = new Intent(this, (Class) NoteUpdatorActivity.class); diff --git a/workspace/EverClip/src/com/yuji/ec/db/DatabaseHelper.java b/workspace/EverClip/src/com/yuji/ec/db/DatabaseHelper.java index 06e27b5..21813ac 100644 --- a/workspace/EverClip/src/com/yuji/ec/db/DatabaseHelper.java +++ b/workspace/EverClip/src/com/yuji/ec/db/DatabaseHelper.java @@ -18,7 +18,7 @@ public class DatabaseHelper extends SQLiteOpenHelper { return instance; } - public static void init(Context context) throws ECException { + public static void init(Context context) { if (instance != null) { return; } @@ -28,13 +28,8 @@ public class DatabaseHelper extends SQLiteOpenHelper { DatabaseHelper helper = new DatabaseHelper(context); SQLiteDatabase db = helper.getWritableDatabase(); - try { - for (IDao dao : daoList) { - dao.init(db); - } - } catch (Exception e) { - // TODO - Debug.d(context, null, e); + for (IDao dao : daoList) { + dao.init(db); } } diff --git a/workspace/EverClip/src/com/yuji/ec/db/NoteDao.java b/workspace/EverClip/src/com/yuji/ec/db/NoteDao.java index a433d52..a6c84e1 100644 --- a/workspace/EverClip/src/com/yuji/ec/db/NoteDao.java +++ b/workspace/EverClip/src/com/yuji/ec/db/NoteDao.java @@ -52,18 +52,7 @@ public class NoteDao implements IDao { } public void start(SQLiteDatabase db) { -// Note note; -// -// note = new Note("id0", "ƒTƒ“ƒvƒ‹A", 0, 0); -// add(db, note); -// note = new Note("id1", "ƒTƒ“ƒvƒ‹B", 0, 0); -// add(db, note); -// note = new Note("id2", "ƒTƒ“ƒvƒ‹C", 0, 0); -// add(db, note); -// note = new Note("id3", "abcdefg", 0, 0); -// add(db, note); -// note = new Note("id4", "aXYZ‚ ‚¢‚¤‚¦‚¨", 0, 0); -// add(db, note); + } public List search(){ @@ -72,11 +61,12 @@ public class NoteDao implements IDao { private List search(String selection, String[] selectionArgs, String orderBy){ List list = new ArrayList(); + Cursor cursor = null; try { DatabaseHelper helper = DatabaseHelper.getInstance(); SQLiteDatabase db = helper.getReadableDatabase(); - Cursor cursor = db.query( + cursor = db.query( "NOTE", new String[] { android.provider.BaseColumns._ID, "GUID", "TEXT", "CREATED", "UPDATED"}, @@ -93,23 +83,25 @@ public class NoteDao implements IDao { list.add(note); cursor.moveToNext(); } - cursor.close(); } catch (SQLException e){ - // TODO Debug.d(this, null, e); + list = null; } catch (Exception e){ - // TODO Debug.d(this, null, e); + list = null; } finally { - // TODO + if (cursor != null){ + cursor.close(); + cursor = null; + } } return list; } public boolean isEmpty(){ List list = search(); - return list.size() <= 0; + return list == null || list.size() <= 0; } public void add(Note note) { @@ -122,12 +114,6 @@ public class NoteDao implements IDao { long id = -1; db.beginTransaction(); try { -// int i = 1; -// SQLiteStatement stmt = insertStmt; -// stmt.bindString(i++, note.getGuid()); -// stmt.bindString(i++, note.getText()); -// stmt.bindLong(i++, note.getDate()); -// id = stmt.executeInsert(); id = addNT(note); db.setTransactionSuccessful(); } finally { diff --git a/workspace/EverClip/src/com/yuji/ec/service/NoteUpdatorService.java b/workspace/EverClip/src/com/yuji/ec/service/NoteUpdatorService.java index 2a72b01..bc1ab13 100644 --- a/workspace/EverClip/src/com/yuji/ec/service/NoteUpdatorService.java +++ b/workspace/EverClip/src/com/yuji/ec/service/NoteUpdatorService.java @@ -2,11 +2,6 @@ package com.yuji.ec.service; import java.util.Calendar; -import com.yuji.ec.common.Constant; -import com.yuji.ec.utility.DateUtil; -import com.yuji.ec.utility.EditPrefUtil; -import com.yuji.ec.utility.NoteUpdator; - import android.app.AlarmManager; import android.app.PendingIntent; import android.app.Service; @@ -16,6 +11,12 @@ import android.os.Binder; import android.os.IBinder; import android.widget.Toast; +import com.yuji.ec.common.Constant; +import com.yuji.ec.utility.DateUtil; +import com.yuji.ec.utility.Debug; +import com.yuji.ec.utility.EditPrefUtil; +import com.yuji.ec.utility.NoteUpdator; + public class NoteUpdatorService extends Service { public class KitchenTimerBinder extends Binder { public NoteUpdatorService getService() { @@ -40,22 +41,24 @@ public class NoteUpdatorService extends Service { private Runnable task = new Runnable() { public void run() { - if (action.equals(ACTION_START)) { - // ‰Šú‹N“® - } else { - // ƒ^ƒCƒ}[‹N“® - synchronized (binder) { - try { - execute(); - } catch (Exception e) { - // TODO + try { + if (action.equals(ACTION_START)) { + // ‰Šú‹N“® + } else { + // ƒ^ƒCƒ}[‹N“® + synchronized (binder) { + try { + execute(); + } catch (Exception e) { + Debug.d(this, null, e); + } } } - } - - setNextTime(); - NoteUpdatorService.this.stopSelf(); + setNextTime(); + } finally { + NoteUpdatorService.this.stopSelf(); + } } private void execute() { @@ -63,7 +66,7 @@ public class NoteUpdatorService extends Service { Constant.NOTE_ITEM_TYPE_ALL); String guid = pref.get(Constant.PREF_NOTE_ITEM_GUID); - NoteUpdator updator = new NoteUpdator(); + NoteUpdator updator = NoteUpdator.getInstance(); updator.update(NoteUpdatorService.this, noteItemType, guid); } diff --git a/workspace/EverClip/src/com/yuji/ec/task/NoteUpdateTask.java b/workspace/EverClip/src/com/yuji/ec/task/NoteUpdateTask.java index 949d5a2..83826f0 100644 --- a/workspace/EverClip/src/com/yuji/ec/task/NoteUpdateTask.java +++ b/workspace/EverClip/src/com/yuji/ec/task/NoteUpdateTask.java @@ -26,7 +26,7 @@ public class NoteUpdateTask implements AsyncTaskIF { public void doExecute() { synchronized (util) { try { - NoteUpdator updator = new NoteUpdator(); + NoteUpdator updator = NoteUpdator.getInstance(); updator.update(activityRef.get(), noteItemType, guid); } finally { errorCode = util.getErrorCode(); diff --git a/workspace/EverClip/src/com/yuji/ec/utility/BaseActivity.java b/workspace/EverClip/src/com/yuji/ec/utility/BaseActivity.java index c914677..bcc2d33 100644 --- a/workspace/EverClip/src/com/yuji/ec/utility/BaseActivity.java +++ b/workspace/EverClip/src/com/yuji/ec/utility/BaseActivity.java @@ -9,8 +9,10 @@ import android.os.Bundle; import android.view.KeyEvent; import android.view.Window; import android.view.WindowManager; +import android.widget.Toast; import com.yuji.ec.Initialize; +import com.yuji.ec.R; public class BaseActivity extends Activity { @Override @@ -18,10 +20,15 @@ public class BaseActivity extends Activity { super.onCreate(savedInstanceState); Debug.d(this, Debug.ON_CREATE); - String name = this.getLocalClassName(); - Context context = getApplicationContext(); - Initialize.initialize(context); - Initialize.initialize(context, name); + try { + String name = this.getLocalClassName(); + Context context = getApplicationContext(); + Initialize.initialize(context); + Initialize.initialize(context, name); + } + catch (Exception e){ + terminate(e); + } } @Override @@ -124,20 +131,18 @@ public class BaseActivity extends Activity { if (t != null) { Debug.d(target, null, t); } - // TODO -// showDialog(getString(R.string.dialogErrorTitle), -// getString(R.string.dialogSystemError)); + showDialog(getString(R.string.dialogErrorTitle), + getString(R.string.dialogSystemError)); } public void terminate(Throwable t) { if (t != null) { Debug.d(this, null, t); - // TODO -// Toast.makeText( -// this, -// getString(R.string.toastSystem) + ":" -// + t.getLocalizedMessage(), Toast.LENGTH_LONG); + Toast.makeText( + this, + getString(R.string.toastSystem) + ":" + + t.getLocalizedMessage(), Toast.LENGTH_LONG); } moveTaskToBack(true); } diff --git a/workspace/EverClip/src/com/yuji/ec/utility/EvernoteUtil.java b/workspace/EverClip/src/com/yuji/ec/utility/EvernoteUtil.java index fd5a59a..6d26357 100644 --- a/workspace/EverClip/src/com/yuji/ec/utility/EvernoteUtil.java +++ b/workspace/EverClip/src/com/yuji/ec/utility/EvernoteUtil.java @@ -15,6 +15,7 @@ import com.evernote.edam.error.EDAMErrorCode; import com.evernote.edam.error.EDAMNotFoundException; import com.evernote.edam.error.EDAMSystemException; import com.evernote.edam.error.EDAMUserException; +import com.evernote.edam.notestore.NoteCollectionCounts; import com.evernote.edam.notestore.NoteFilter; import com.evernote.edam.notestore.NoteList; import com.evernote.edam.notestore.NoteStore; @@ -136,7 +137,9 @@ public class EvernoteUtil { if (token == null) { return null; } - noteList = noteStore.findNotes(token, filter, 0, 100); // TODO 100 + // TODO #28107 + noteList = noteStore.findNotes(token, filter, 0, 1000); + errorCode = Error.NONE; } catch (EDAMUserException e) { Debug.d(this, null, e); @@ -354,15 +357,9 @@ public class EvernoteUtil { return note; } - //public List getNoteContentList() { public List getNoteContentList(NoteList noteList) { errorCode = Error.OTHER; -// NoteList noteList = getNoteList(); -// if (noteList == null) { -// return null; -// } - List list = new ArrayList(); HtmlParser parser = new HtmlParser(); @@ -372,14 +369,16 @@ public class EvernoteUtil { String guid = n.getGuid(); Note nc = getNote(guid); String content = nc.getContent(); - parser.parse(content); + if (parser.parse(content)){ + return null; + } String text = parser.getText(); com.yuji.ec.db.Note note = toNote(nc, text); list.add(note); } errorCode = Error.NONE; } catch (EDAMNotFoundException e) { - // TODO + errorCode = Error.NOT_FOUND; return null; } return list; diff --git a/workspace/EverClip/src/com/yuji/ec/utility/HtmlParser.java b/workspace/EverClip/src/com/yuji/ec/utility/HtmlParser.java index 5125602..8739f87 100644 --- a/workspace/EverClip/src/com/yuji/ec/utility/HtmlParser.java +++ b/workspace/EverClip/src/com/yuji/ec/utility/HtmlParser.java @@ -20,12 +20,12 @@ public class HtmlParser implements ContentHandler { private final static String NL = System.getProperty("line.separator"); private StringBuffer sb = null; - public void parse(String str){ + public boolean parse(String str){ // String str = "" // +"" // +"

2012”N4ŒŽ5“ú 13:08

‚ ‚©‚³‚½‚È‚½‚È



‚ ‚½

2012”N4ŒŽ5“ú 16:17

ƒeƒXƒg

2012”N4ŒŽ5“ú 20:24

‚ ‚©‚³‚½‚È
‚Í‚È‚Ü‚â‚è‚í
"; - // TODO ƒGƒ‰[‚̏ꍇ - + + boolean result = false; try { sb = new StringBuffer(); @@ -37,19 +37,18 @@ public class HtmlParser implements ContentHandler { parser.setFeature(Parser.namespacesFeature, false); parser.parse(is); + + result = true; } catch (SAXNotRecognizedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + Debug.d(this, null, e); } catch (SAXNotSupportedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + Debug.d(this, null, e); } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + Debug.d(this, null, e); } catch (SAXException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + Debug.d(this, null, e); } + return result; } public String getText(){ diff --git a/workspace/EverClip/src/com/yuji/ec/utility/NoteUpdator.java b/workspace/EverClip/src/com/yuji/ec/utility/NoteUpdator.java index e59d85f..855a3df 100644 --- a/workspace/EverClip/src/com/yuji/ec/utility/NoteUpdator.java +++ b/workspace/EverClip/src/com/yuji/ec/utility/NoteUpdator.java @@ -14,6 +14,24 @@ import com.yuji.ec.db.NoteDao; import com.yuji.ec.utility.EvernoteUtil.Error; public class NoteUpdator { + private static NoteUpdator instance = null; + private static Object obj = new Object(); + + public static NoteUpdator getInstance() { + if (instance == null) { + synchronized (obj) { + if (instance == null) { + instance = new NoteUpdator(); + } + } + } + return instance; + } + + private NoteUpdator() { + + } + public void update(Context context, int noteItemType, String guid) { try { EvernoteUtil util = EvernoteUtil.getInstance(); @@ -37,14 +55,14 @@ public class NoteUpdator { noteList = util.getNoteList(); break; } - - if (util.getErrorCode() != Error.NONE){ - return; // TODO + + if (util.getErrorCode() != Error.NONE) { + return; } List list = util.getNoteContentList(noteList); if (list == null) { - // TODO + // NOT_FOUND return; } @@ -52,19 +70,20 @@ public class NoteUpdator { SQLiteDatabase db = helper.getWritableDatabase(); NoteDao dao = (NoteDao) NoteDao.getInstance(); - db.beginTransaction(); - try { - dao.deleteNT(); - for (Note note : list) { - dao.addNT(note); + synchronized (obj) { + db.beginTransaction(); + try { + dao.deleteNT(); + for (Note note : list) { + dao.addNT(note); + } + db.setTransactionSuccessful(); + } finally { + db.endTransaction(); } - db.setTransactionSuccessful(); - } finally { - db.endTransaction(); } } catch (Exception e) { - // TODO - e.printStackTrace(); + Debug.d(this, null, e); } } }