Fix add built-in engines to database each time

Update Japanese translation
RikkaW · Feb 4, 2016 · 8b9eec7 · 8b9eec7
1 parent c247c5d
commit 8b9eec7
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 25 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,7 +11,7 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 23
-        versionCode 14100
+        versionCode 14200
     }
     buildTypes {
         release {
@@ -21,7 +21,7 @@ android {
     }
 
     productFlavors {
-        def String name = "1.4.1"
+        def String name = "1.4.2"
 
         COOLAPK {
             applicationId "rikka.searchbyimage"

diff --git a/app/src/main/java/rikka/searchbyimage/staticdata/CustomEngine.java b/app/src/main/java/rikka/searchbyimage/staticdata/CustomEngine.java
@@ -126,8 +126,6 @@ public static synchronized List<CustomEngine> getList(Context context) {
     private static List<CustomEngine> loadList(Context context) {
         List<CustomEngine> list = new ArrayList<>();
 
-        addBuildInEngines(context, list);
-
         DatabaseHelper dbHelper = DatabaseHelper.instance(context);
         Cursor cursor = dbHelper.getReadableDatabase()
                 .query(CustomEngineTable.TABLE_NAME, null, null, null, null, null, null);
@@ -148,6 +146,8 @@ private static List<CustomEngine> loadList(Context context) {
 
         cursor.close();
 
+        addBuildInEngines(context, list);
+
         return list;
     }
 
@@ -263,7 +263,7 @@ private static void addBuildInEngines(Context context, List<CustomEngine> list)
                 }
 
                 addEngineToDb(context, parcelable, i);
-                //addEngineToList(parcelable, list);
+                addEngineToList(parcelable.data, list);
             }
         }
     }

diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
@@ -114,28 +114,28 @@
     <string name="app_crash_no_email_client">メールアプリ見つかりません。</string>
     <string name="baidu_settings">Baidu設定</string>
 
-    <string name="edit_sites">Search engines</string>
-    <string name="edit_site">Edit data</string>
-    <string name="request_url">Request url</string>
-    <string name="engine_name">Name</string>
-    <string name="upload_form_key">Key</string>
-    <string name="upload_form_value">Value</string>
+    <string name="edit_sites">検索エンジン</string>
+    <string name="edit_site">データの編集</string>
+    <string name="request_url">リクエストURL</string>
+    <string name="engine_name">名前</string>
+    <string name="upload_form_key">キー</string>
+    <string name="upload_form_value">値</string>
     <string name="upload_form_your_image">(image)</string>
     <string name="upload_form_built_in_selector">(selector)</string>
-    <string name="upload_form_add">New form data</string>
-    <string name="built_in">Built-in</string>
-    <string name="custom">Custom</string>
-    <string name="check_your_data">Check your data</string>
-    <string name="choose_one">Please enable at least one search engine</string>
-
-    <string name="open_url">Open URL</string>
-    <string name="open_html">Open saved HTML file in WebView</string>
-    <string name="open_iqdb">Built-in viewer for iqdb.org</string>
-
-    <string name="advance">Advance</string>
-    <string name="custom_search_engine">Custom search engines</string>
-    <string name="help">Help</string>
-    <string name="delete">Delete</string>
+    <string name="upload_form_add">フォームデータを追加</string>
+    <string name="built_in">ビルトイン</string>
+    <string name="custom">カスタム</string>
+    <string name="check_your_data">データを確認してください</string>
+    <string name="choose_one">少なくとも1つの検索エンジンを有効にしてください</string>
+
+    <string name="open_url">URLを開く</string>
+    <string name="open_html">WebViewで保存されたHTMLファイルを開く</string>
+    <string name="open_iqdb">ビルトインiqdb.org用のビューア</string>
+
+    <string name="advance">詳細設定</string>
+    <string name="custom_search_engine">検索エンジンのカスタム</string>
+    <string name="help">ヘルプ</string>
+    <string name="delete">削除</string>
     <string name="open_action">Open action</string>
     <string name="post_form">Form</string>
     <string name="not_empty">Should not be empty</string>