public static final int noButton=0x7f050002;
public static final int settingConfirmMsg=0x7f05000e;
public static final int settingConfirmTitle=0x7f05000d;
- public static final int settingLoginButton=0x7f050012;
+ public static final int settingDoUpdateMsg=0x7f050011;
+ public static final int settingLoginButton=0x7f050013;
public static final int settingLoginMsg=0x7f050010;
- public static final int settingLoginTitle=0x7f050011;
- public static final int settingUpdateButton=0x7f050014;
+ public static final int settingLoginTitle=0x7f050012;
+ public static final int settingUpdateButton=0x7f050015;
public static final int settingUpdateMsg=0x7f05000f;
- public static final int settingUpdateTimeTitle=0x7f050015;
- public static final int settingUpdateTitle=0x7f050013;
+ public static final int settingUpdateTimeTitle=0x7f050016;
+ public static final int settingUpdateTitle=0x7f050014;
public static final int yesButton=0x7f050001;
}
}
<Button
android:id="@+id/leftButton"
android:layout_width="fill_parent"
- android:layout_height="32dip"
+ android:layout_height="48dip"
android:layout_weight="1"
android:background="@drawable/button"
android:text="@+string/mainLeftButton" />
<Button
android:id="@+id/rightButton"
android:layout_width="fill_parent"
- android:layout_height="32dip"
+ android:layout_height="48dip"
android:layout_weight="1"
android:background="@drawable/button"
android:text="@+string/mainRightButton" />
<string name="settingConfirmMsg">・・・</string>
<string name="settingUpdateMsg">データ更新中</string>
<string name="settingLoginMsg">ログインをして下さい</string>
+ <string name="settingDoUpdateMsg">データを更新して下さい</string>
<string name="settingLoginTitle">ログイン</string>
<string name="settingLoginButton">ログインする</string>
<string name="settingUpdateTitle">更新</string>
bmp = bitmapFactory.get(node.getIconId());
bmpWidth = bmp.getWidth();
- float fSize = 32 * (2 / 3.0f);
+ float fSize = 48 * (1 / 2.0f);
leftButton.setTextSize(fSize);
rightButton.setTextSize(fSize);
} catch (Exception e) {
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
// updateList();
// setStatus();
+ NodeDao dao = (NodeDao) NodeCacheDao.getInstance();
+ if (dao.isEmpty()) {
+ finish();
+ }
isInit = true;
}
protected void onResume() {
super.onResume();
+ NodeDao dao = (NodeDao) NodeCacheDao.getInstance();
+ if (dao.isEmpty()) {
+ if (isInit) {
+ Intent intent = new Intent(this,
+ (Class<?>) SettingActivity.class);
+ startActivityForResult(intent, 0);
+
+ isInit = false;
+ } else {
+ finish();
+ isInit = true;
+ }
+ }
+
LockDao lockDao = (LockDao) LockDao.getInstance();
lock = lockDao.lock(this, Constant.LOCK_UPDATE_NOTE);
* Sends the user to the image gallery to choose an image to share.
*/
public void startAuth(View view) {
+// if (session.isLoggedIn()) {
+// session.logOut();
+// } else {
+// session.authenticate(this);
+// }
if (session.isLoggedIn()) {
session.logOut();
- } else {
- session.authenticate(this);
}
+ session.authenticate(this);
+
updateUi();
}
import com.yuji.ef.common.Constant;
import com.yuji.ef.dao.LockDao;
+import com.yuji.ef.dao.NodeCacheDao;
+import com.yuji.ef.dao.NodeDao;
import com.yuji.ef.pref.EditPrefUtil;
import com.yuji.ef.service.NoteUpdatorService;
import com.yuji.ef.task.NoteUpdateTask;
return;
}
+
+ NodeDao dao = (NodeDao) NodeCacheDao.getInstance();
+ if (dao.isEmpty()) {
+ msgLayout.setVisibility(View.VISIBLE);
+ confirmMsg.setText(getString(R.string.settingDoUpdateMsg));
+
+ loginButton.setEnabled(true);
+ updateButton.setEnabled(true);
+ updateSpinner.setEnabled(false);
+
+ return;
+ }
loginButton.setEnabled(true);
updateButton.setEnabled(true);
*/
@Override
public void start(SQLiteDatabase db) {
- FolderUtil util = FolderUtil.getInstance();
- util.init(db);
+// FolderUtil util = FolderUtil.getInstance();
+// util.init(db);
}
/* (non-Javadoc)
*/
@Override
public boolean isEmpty() {
- List<Node> list = search();
- return list == null || list.size() <= 0;
+// List<Node> list = search();
+// return list == null || list.size() <= 0;
+ return this.searchRoot() == null;
}
/* (non-Javadoc)
Node oldNote = nodeDao.searchByGuid(db, guid);
if (oldNote == null) {
// 新規ノート
- DirNode parent = (DirNode)nodeDao.searchByGuid(db, nbGuid);
+ DirNode parent = (DirNode) nodeDao.searchByGuid(db, nbGuid);
if (parent == null) {
// TODO
}
fileNode.setGuid(guid);
long id = addFileNodeNT(parent, fileNode);
-// fileNode.setId(id);
-// nodeDao.addNT(fileNode);
+ // fileNode.setId(id);
+ // nodeDao.addNT(fileNode);
} else {
- DirNode oldParent = (DirNode)nodeDao.searchById(db,
+ DirNode oldParent = (DirNode) nodeDao.searchById(db,
oldNote.getParent());
if (oldParent == null) {
// TODO
String pGuid = oldParent.getGuid();
if (!CommonUtil.isNull(pGuid) && !pGuid.equals(nbGuid)) {
// 親が異なる
- DirNode parent = (DirNode)nodeDao.searchByGuid(db, nbGuid);
+ DirNode parent = (DirNode) nodeDao.searchByGuid(db,
+ nbGuid);
if (parent == null) {
// TODO
}
long id;
- id = nodeDao.removeChildrenIdNT(oldParent, oldNote.getId());
- if (id < 0){
+ id = nodeDao.removeChildrenIdNT(oldParent,
+ oldNote.getId());
+ if (id < 0) {
// TODO
}
id = nodeDao.addChildrenIdNT(parent, oldNote.getId());
- if (id < 0){
+ if (id < 0) {
// TODO
}
nodeDao.updateParentNT(oldNote, parent.getId());
}
}
- public void update(){
+ public void update() {
DatabaseHelper helper = DatabaseHelper.getInstance();
SQLiteDatabase db = helper.getWritableDatabase();
db.beginTransaction();
try {
+ if (nodeDao.isEmpty()) {
+ Node top = new RootNode("/", null);
+ top.setStatus(Node.Status.OPEN);
+ long id = nodeDao.addNT(top);
+ top.setId(id);
+ }
+
updateNotebook(db);
updateNote(db);
db.setTransactionSuccessful();
} finally {
db.endTransaction();
- }
+ }
}
-
+
public long addFileNode(Node parent, Node node) {
DatabaseHelper helper = DatabaseHelper.getInstance();
SQLiteDatabase db = helper.getWritableDatabase();