Bump version

HKYM39 · Nov 1, 2020 · f9925de · f9925de
1 parent 20b15b8
commit f9925de
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -27,8 +27,8 @@ android {
         applicationId "com.hippo.ehviewer"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 116
-        versionName "1.7.12"
+        versionCode 117
+        versionName "1.7.13"
         resConfigs "zh", "zh-rCN", "zh-rHK", "zh-rTW",
                 "es", "ja", "ko", "fr", "de", "th"
         testOptions.unitTests.includeAndroidResources = true

diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/VoteTagParser.java b/app/src/main/java/com/hippo/ehviewer/client/parser/VoteTagParser.java
@@ -9,7 +9,7 @@ public class VoteTagParser {
     public static VoteTagParser.Result parse(String body) throws JSONException {
         VoteTagParser.Result result = new VoteTagParser.Result();
         JSONObject jo = new JSONObject(body);
-        result.error = jo.getString("error");
+        if (jo.has("error")) result.error = jo.getString("error");
         return result;
     }
 

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
@@ -1441,10 +1441,10 @@ private void showTagDialog(final String tag) {
                     int id = menuId.get(which);
                     switch (id) {
                         case R.id.vote_up:
-                            voteTag(tag2, 1);
+                            voteTag(tag, 1);
                             break;
                         case R.id.vote_down:
-                            voteTag(tag2, -1);
+                            voteTag(tag, -1);
                             break;
                         case R.id.show_definition:
                             UrlOpener.openUrl(context, EhUrl.getTagDefinitionUrl(tag2), false);
@@ -1465,7 +1465,7 @@ private void voteTag(String tag, int vote) {
 
         EhRequest request = new EhRequest()
                 .setMethod(EhClient.METHOD_VOTE_TAG)
-                .setArgs(mGalleryDetail.apiUid, mGalleryDetail.apiKey, mGid, mToken, tag, vote)
+                .setArgs(mGalleryDetail.apiUid, mGalleryDetail.apiKey, mGalleryDetail.gid, mGalleryDetail.token, tag, vote)
                 .setCallback(new VoteTagListener(context,
                         activity.getStageId(), getTag(), mGid));
         EhApplication.getEhClient(context).execute(request);

diff --git a/app/src/main/res/values-zh-rCN/arrays.xml b/app/src/main/res/values-zh-rCN/arrays.xml
@@ -18,9 +18,9 @@
 
     <string-array name="tag_translation_metadata" tools:ignore="InconsistentArrays">
         <item>tag-translations-zh-rCN.sha1</item>
-        <item>https://cdn.jsdelivr.net/gh/NekoInverter/tag-translations@main/tag-translations/tag-translations-zh-rCN.sha1</item>
+        <item>https://cdn.jsdelivr.net/gh/NekoInverter/tag-translations@main/tag-translations-v2/tag-translations-zh-rCN.sha1</item>
         <item>tag-translations-zh-rCN</item>
-        <item>https://cdn.jsdelivr.net/gh/NekoInverter/tag-translations@main/tag-translations/tag-translations-zh-rCN</item>
+        <item>https://cdn.jsdelivr.net/gh/NekoInverter/tag-translations@main/tag-translations-v2/tag-translations-zh-rCN</item>
     </string-array>
 
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
@@ -728,7 +728,7 @@
     <string name="toplist_pastmonth">过去一个月</string>
     <string name="toplist_yesterday">昨日</string>
     <string name="toplist">排行</string>
-    <string name="tag_vote_down">坏耶</string>
-    <string name="tag_vote_up">好耶</string>
+    <string name="tag_vote_down">不，这不是</string>
+    <string name="tag_vote_up">是的，这很正确</string>
     <string name="tag_vote_successfully">投票成功</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rHK/arrays.xml b/app/src/main/res/values-zh-rHK/arrays.xml
@@ -18,9 +18,9 @@
 
     <string-array name="tag_translation_metadata" tools:ignore="InconsistentArrays">
         <item>tag-translations-zh-rCN.sha1</item>
-        <item>https://cdn.jsdelivr.net/gh/NekoInverter/tag-translations@main/tag-translations/tag-translations-zh-rCN.sha1</item>
+        <item>https://cdn.jsdelivr.net/gh/NekoInverter/tag-translations@main/tag-translations-v2/tag-translations-zh-rCN.sha1</item>
         <item>tag-translations-zh-rCN</item>
-        <item>https://cdn.jsdelivr.net/gh/NekoInverter/tag-translations@main/tag-translations/tag-translations-zh-rCN</item>
+        <item>https://cdn.jsdelivr.net/gh/NekoInverter/tag-translations@main/tag-translations-v2/tag-translations-zh-rCN</item>
     </string-array>
 
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/arrays.xml b/app/src/main/res/values-zh-rTW/arrays.xml
@@ -18,9 +18,9 @@
 
     <string-array name="tag_translation_metadata" tools:ignore="InconsistentArrays">
         <item>tag-translations-zh-rCN.sha1</item>
-        <item>https://cdn.jsdelivr.net/gh/NekoInverter/tag-translations@main/tag-translations/tag-translations-zh-rCN.sha1</item>
+        <item>https://cdn.jsdelivr.net/gh/NekoInverter/tag-translations@main/tag-translations-v2/tag-translations-zh-rCN.sha1</item>
         <item>tag-translations-zh-rCN</item>
-        <item>https://cdn.jsdelivr.net/gh/NekoInverter/tag-translations@main/tag-translations/tag-translations-zh-rCN</item>
+        <item>https://cdn.jsdelivr.net/gh/NekoInverter/tag-translations@main/tag-translations-v2/tag-translations-zh-rCN</item>
     </string-array>
 
 </resources>