ディレクトリ名を自動で書き換えるよう修正

diff --git a/default.properties b/default.properties
index 4513a1e..d5eca74 100644 (file)
--- a/default.properties
+++ b/default.properties
@@ -9,3 +9,5 @@
 
 # Project target.
 target=android-3
+# Indicates whether an apk should be generated for each density.
+split.density=false

diff --git a/res/values-ja/string.xml b/res/values-ja/string.xml
index 4a1ea05..b60e447 100644 (file)
--- a/res/values-ja/string.xml
+++ b/res/values-ja/string.xml
@@ -110,6 +110,7 @@
     <string name="dialog_export_dic_message">ユーザー辞書をSDカードへ出力します。\n保存先は\n\"/sdcard/nicoWnn\"\nになります</string>
     <string name="dialog_export_dic_message_done">SDカードへ出力しました。</string>
     <string name="dialog_export_dic_message_failed">SDカードへの出力に失敗しました。</string>
+    <string name="dialog_importexport_rendir_failed">ディレクトリ名の変更に失敗しました。</string>
 
     <!-- user dictionary -->
     <string name="user_dictionary_list_words">単語一覧</string>

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0d09cfa..1187031 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -94,6 +94,7 @@
   <string name="dialog_export_dic_message">Export SDCard</string>
   <string name="dialog_export_dic_message_done">success Export.</string>
   <string name="dialog_export_dic_message_failed">failed Export.</string>
+  <string name="dialog_importexport_rendir_failed">failed rename directory.</string>
 
   <!-- user dictionary -->
   <string name="user_dictionary_list_words">Registered words</string>

diff --git a/src/com/hiroshica/android/input/nicownn2/UserDicImportExport.java b/src/com/hiroshica/android/input/nicownn2/UserDicImportExport.java
index a9b3364..282c6bf 100644 (file)
--- a/src/com/hiroshica/android/input/nicownn2/UserDicImportExport.java
+++ b/src/com/hiroshica/android/input/nicownn2/UserDicImportExport.java
@@ -17,6 +17,8 @@ import org.xmlpull.v1.XmlPullParserFactory;
 
 public class UserDicImportExport extends AsyncTask<String, String, String[]>{
        private UserDictionaryToolsList mActivity;
+       private String[]  mResultString;
+
        
        public UserDicImportExport(UserDictionaryToolsList activity) {
                mActivity  = activity;
@@ -30,32 +32,22 @@ public class UserDicImportExport extends AsyncTask<String, String, String[]>{
        @Override
        protected String[] doInBackground(String... params)  {
                boolean result = false;
-               String[]  resultString = new String[2];
+               mResultString = new String[2];
                if (params[0].equals("import")) {
                        result = importUserDic(params[1], params[2], params[3]);
                        if (true == result) {
-                               resultString[0] = "true";
-                               resultString[1] = mActivity.getString(R.string.dialog_import_dic_message_done);
+                               mResultString[0] = "true";
+                               mResultString[1] = mActivity.getString(R.string.dialog_import_dic_message_done);
                        }
                        else{
-                               resultString[0] = "false";
-                               resultString[1] = mActivity.getString(R.string.dialog_import_dic_message_failed);
+                               mResultString[0] = "false";
+                               mResultString[1] = mActivity.getString(R.string.dialog_import_dic_message_failed);
                        }
                }
                else{
-                       resultString = exportUserDic(params[1], params[2], params[3]);
-                       /*
-                       if (true == result) {
-                               resultString[0] = "true";
-                               resultString[1] = mActivity.getString(R.string.dialog_export_dic_message_done);
-                       }
-                       else{
-                               resultString[0] = "false";
-                               resultString[1] = mActivity.getString(R.string.dialog_export_dic_message_failed);
-                       }
-                       */
+                       exportUserDic(params[1], params[2], params[3]);
                }
-               return resultString;
+               return mResultString;
        }
        @Override
        protected void onPostExecute(String[] result) {
@@ -71,13 +63,12 @@ public class UserDicImportExport extends AsyncTask<String, String, String[]>{
         */
        private boolean importUserDic(String file, String sd, String flash) {
                File fileSdCard = getExternalStorageDirectory();
-               File fileBase = null;
-               if (fileSdCard != null) {
-                       //fileBase = new File(fileSdCard, mActivity.getPackageName());
-                       fileBase = new File(fileSdCard, "nicoWnn");
-                       if (!fileBase.exists()) {
-                               return false;
-                       }
+               if (null == fileSdCard) {
+                       return false;
+               }
+               File fileBase = createNicoWnnDirectory(fileSdCard);
+               if (null == fileBase) {
+                       return false;
                }
                // import learn dic
                File sFile = new File(fileBase, sd);
@@ -143,28 +134,19 @@ public class UserDicImportExport extends AsyncTask<String, String, String[]>{
        /*
         *
         */
-       private String[] exportUserDic(String file, String flash, String sd) {
-               String[] resultString = new String[2];
-               resultString[0] = "true";
-               resultString[1] = mActivity.getString(R.string.dialog_export_dic_message_done);
+       private boolean exportUserDic(String file, String flash, String sd) {
+               mResultString[0] = "true";
+               mResultString[1] = mActivity.getString(R.string.dialog_export_dic_message_done);
 
                File fileSdCard = getExternalStorageDirectory();
-               File fileBase = null;
-               if (fileSdCard != null) {
-                       //fileBase = new File(fileSdCard, mActivity.getPackageName());
-                       fileBase = new File(fileSdCard, "nicoWnn");
-                       if (!fileBase.exists()) {
-                               if (!fileBase.mkdir()) {
-                                       resultString[0] = "false";
-                                       resultString[1] = mActivity.getString(R.string.dialog_export_dic_message_failed);
-                                       return resultString;
-                               } // mkdir
-                       } // exists
-               } // sd card
-               else{
-                       resultString[0] = "false";
-                       resultString[1] = mActivity.getString(R.string.dialog_export_dic_message_failed);
-                       return resultString;
+               if (null == fileSdCard) {
+                       mResultString[0] = "false";
+                       mResultString[1] = mActivity.getString(R.string.dialog_export_dic_message_failed);
+                       return false;
+               }
+               File fileBase = createNicoWnnDirectory(fileSdCard);
+               if (null == fileBase) {
+                       return false;
                }
                try {
                        File fileSave = new File(fileBase, file);
@@ -186,9 +168,9 @@ public class UserDicImportExport extends AsyncTask<String, String, String[]>{
                        }
                        fout.write(end.getBytes());
                } catch (Exception e) {
-                       resultString[0] = "false";
-                       resultString[1] = mActivity.getString(R.string.dialog_export_dic_message_failed);
-                       return resultString;
+                       mResultString[0] = "false";
+                       mResultString[1] = mActivity.getString(R.string.dialog_export_dic_message_failed);
+                       return false;
                } finally {
                        //
                }
@@ -196,7 +178,7 @@ public class UserDicImportExport extends AsyncTask<String, String, String[]>{
                File sFile = new File(flash);
                File dFile = new File(fileBase, sd);
                copyFile(dFile, sFile);
-               return resultString;
+               return true;
        }
        /*************************************************************************************/
     /* file load/save                                                                    */
@@ -213,6 +195,36 @@ public class UserDicImportExport extends AsyncTask<String, String, String[]>{
                Log.d("sdcard", "mount sdcard!!\n");
                return Environment.getExternalStorageDirectory();
        }
+       /*
+        * 
+        */
+       private File createNicoWnnDirectory(File fileSdCard) {
+               boolean result;
+               File fileOld  = null;
+               File fileNico = null;
+               fileOld  = new File(fileSdCard, "OpenWnn");
+               fileNico = new File(fileSdCard, "nicoWnn");
+               if (fileOld.exists()) {
+                       result = fileOld.renameTo(fileNico);
+                       if (false == result) {
+                               mResultString[0] = "false";
+                               mResultString[1] = mActivity.getString(R.string.dialog_importexport_rendir_failed);
+                               return null;
+                       }
+                       return fileNico;
+               }
+               if (!fileNico.exists()) {
+                       if (!fileNico.mkdir()) {
+                               mResultString[0] = "false";
+                               mResultString[1] = mActivity.getString(R.string.dialog_export_dic_message_failed);
+                               return null;
+                       } // mkdir
+               } // exists
+               return fileNico;
+       }
+       /*
+        * 
+        */
        private boolean copyFile(File dFile, File sFile) {
                if (!sFile.exists()) {
                        return false;