From f9925deb8a6bc92f250488c4004a827886050ce9 Mon Sep 17 00:00:00 2001 From: NekoInverter <42698724+NekoInverter@users.noreply.github.com> Date: Sun, 1 Nov 2020 13:13:09 +0800 Subject: [PATCH] Bump version --- app/build.gradle | 4 ++-- .../com/hippo/ehviewer/client/parser/VoteTagParser.java | 2 +- .../com/hippo/ehviewer/ui/scene/GalleryDetailScene.java | 6 +++--- app/src/main/res/values-zh-rCN/arrays.xml | 4 ++-- app/src/main/res/values-zh-rCN/strings.xml | 4 ++-- app/src/main/res/values-zh-rHK/arrays.xml | 4 ++-- app/src/main/res/values-zh-rTW/arrays.xml | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c9e310c36..feb1c74cc 100644 --- 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 index 2fc67b1e2..cb917e57d 100644 --- 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 index b4b18722f..65768ff4a 100755 --- 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 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene 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 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene 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 index 7a1e5f2f0..c49deee38 100644 --- a/app/src/main/res/values-zh-rCN/arrays.xml +++ b/app/src/main/res/values-zh-rCN/arrays.xml @@ -18,9 +18,9 @@ tag-translations-zh-rCN.sha1 - https://cdn.jsdelivr.net/gh/NekoInverter/tag-translations@main/tag-translations/tag-translations-zh-rCN.sha1 + https://cdn.jsdelivr.net/gh/NekoInverter/tag-translations@main/tag-translations-v2/tag-translations-zh-rCN.sha1 tag-translations-zh-rCN - https://cdn.jsdelivr.net/gh/NekoInverter/tag-translations@main/tag-translations/tag-translations-zh-rCN + https://cdn.jsdelivr.net/gh/NekoInverter/tag-translations@main/tag-translations-v2/tag-translations-zh-rCN diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 51e0c0aac..c363c97f3 100755 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -728,7 +728,7 @@ 过去一个月 昨日 排行 - 坏耶 - 好耶 + 不，这不是 + 是的，这很正确 投票成功 diff --git a/app/src/main/res/values-zh-rHK/arrays.xml b/app/src/main/res/values-zh-rHK/arrays.xml index 7a1e5f2f0..c49deee38 100644 --- a/app/src/main/res/values-zh-rHK/arrays.xml +++ b/app/src/main/res/values-zh-rHK/arrays.xml @@ -18,9 +18,9 @@ tag-translations-zh-rCN.sha1 - https://cdn.jsdelivr.net/gh/NekoInverter/tag-translations@main/tag-translations/tag-translations-zh-rCN.sha1 + https://cdn.jsdelivr.net/gh/NekoInverter/tag-translations@main/tag-translations-v2/tag-translations-zh-rCN.sha1 tag-translations-zh-rCN - https://cdn.jsdelivr.net/gh/NekoInverter/tag-translations@main/tag-translations/tag-translations-zh-rCN + https://cdn.jsdelivr.net/gh/NekoInverter/tag-translations@main/tag-translations-v2/tag-translations-zh-rCN diff --git a/app/src/main/res/values-zh-rTW/arrays.xml b/app/src/main/res/values-zh-rTW/arrays.xml index 7a1e5f2f0..c49deee38 100644 --- a/app/src/main/res/values-zh-rTW/arrays.xml +++ b/app/src/main/res/values-zh-rTW/arrays.xml @@ -18,9 +18,9 @@ tag-translations-zh-rCN.sha1 - https://cdn.jsdelivr.net/gh/NekoInverter/tag-translations@main/tag-translations/tag-translations-zh-rCN.sha1 + https://cdn.jsdelivr.net/gh/NekoInverter/tag-translations@main/tag-translations-v2/tag-translations-zh-rCN.sha1 tag-translations-zh-rCN - https://cdn.jsdelivr.net/gh/NekoInverter/tag-translations@main/tag-translations/tag-translations-zh-rCN + https://cdn.jsdelivr.net/gh/NekoInverter/tag-translations@main/tag-translations-v2/tag-translations-zh-rCN