addNT2

diff --git a/workspace/JuggleMaster/bin/JuggleMaster.apk b/workspace/JuggleMaster/bin/JuggleMaster.apk
index b094712..d459935 100644 (file)
Binary files a/workspace/JuggleMaster/bin/JuggleMaster.apk and b/workspace/JuggleMaster/bin/JuggleMaster.apk differ

diff --git a/workspace/JuggleMaster/bin/classes.dex b/workspace/JuggleMaster/bin/classes.dex
index b6c2a52..711c775 100644 (file)
Binary files a/workspace/JuggleMaster/bin/classes.dex and b/workspace/JuggleMaster/bin/classes.dex differ

diff --git a/workspace/JuggleMaster/bin/resources.ap_ b/workspace/JuggleMaster/bin/resources.ap_
index 32138d6..df5bfdf 100644 (file)
Binary files a/workspace/JuggleMaster/bin/resources.ap_ and b/workspace/JuggleMaster/bin/resources.ap_ differ

diff --git a/workspace/JuggleMaster/src/com/jm/db/DatabaseHelper.java b/workspace/JuggleMaster/src/com/jm/db/DatabaseHelper.java
index 137aa6e..ee089b5 100644 (file)
--- a/workspace/JuggleMaster/src/com/jm/db/DatabaseHelper.java
+++ b/workspace/JuggleMaster/src/com/jm/db/DatabaseHelper.java
@@ -31,8 +31,10 @@ public class DatabaseHelper extends SQLiteOpenHelper {
                }\r
                \r
                DatabaseHelper helper = new DatabaseHelper(context);\r
-               SQLiteDatabase db = helper.getWritableDatabase();\r
-               Dao.getInstance().start(db);\r
+               if (!helper.getConvFlag()){\r
+                       SQLiteDatabase db = helper.getWritableDatabase();\r
+                       Dao.getInstance().start(db);\r
+               }\r
                // TODO\r
                // SQLiteDatabase db = helper.getWritableDatabase();\r
                // int count;\r

diff --git a/workspace/JuggleMaster/src/com/jm/db/InitDB.java b/workspace/JuggleMaster/src/com/jm/db/InitDB.java
index f5b4f1f..cce42bb 100644 (file)
--- a/workspace/JuggleMaster/src/com/jm/db/InitDB.java
+++ b/workspace/JuggleMaster/src/com/jm/db/InitDB.java
@@ -36,6 +36,8 @@ public class InitDB implements AsyncTaskIF {
                        if (helper.getConvFlag()){
                                helper.convert(db, langId);
                                p.update();
+                               
+                               Dao.getInstance().start(db);
                        }
                        else {
                                helper.setLangId(DatabaseHelper.JAPANEASE_ID);