From c65eda03d3dfde0cb9fc27c76c6ce2c6ae6e77e6 Mon Sep 17 00:00:00 2001 From: NekoInverter <7741672-NekoInverter@users.noreply.gitlab.com> Date: Sat, 5 Dec 2020 13:22:58 +0800 Subject: [PATCH] Move to gitlab --- README.md | 4 ++-- app/build.gradle | 4 ++-- .../hippo/ehviewer/client/EhTagDatabase.java | 20 +++++++++++++++---- app/src/main/res/values-zh-rCN/arrays.xml | 4 ++-- app/src/main/res/values-zh-rHK/arrays.xml | 4 ++-- app/src/main/res/values-zh-rTW/arrays.xml | 4 ++-- app/src/main/res/xml/about_settings.xml | 4 ++-- 7 files changed, 28 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 9a8e240f9..d23a32503 100644 --- a/README.md +++ b/README.md @@ -13,9 +13,9 @@ An E-Hentai Application for Android. # Download -[下载](https://github.com/NekoInverter/EhViewer/releases) +[下载](https://gitlab.com/NekoInverter/EhViewer/-/tags) -[Download](https://github.com/NekoInverter/EhViewer/releases) +[Download](https://gitlab.com/NekoInverter/EhViewer/-/tags) # Thanks diff --git a/app/build.gradle b/app/build.gradle index 11cd05d7a..481c2f578 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -78,12 +78,12 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation 'androidx.appcompat:appcompat:1.2.0' implementation 'androidx.biometric:biometric:1.0.1' - implementation "androidx.browser:browser:1.2.0" + implementation "androidx.browser:browser:1.3.0" implementation 'androidx.cardview:cardview:1.0.0' implementation "androidx.fragment:fragment:1.2.5" implementation "androidx.preference:preference:1.1.1" implementation 'com.google.android.gms:play-services-oss-licenses:17.0.0' - implementation 'com.google.android.material:material:1.3.0-alpha03' + implementation 'com.google.android.material:material:1.3.0-alpha04' implementation 'com.getkeepsafe.relinker:relinker:1.4.1' implementation 'com.getkeepsafe.taptargetview:taptargetview:1.13.0' implementation 'com.github.seven332.a7zip:extract-lite:1b21783' diff --git a/app/src/main/java/com/hippo/ehviewer/client/EhTagDatabase.java b/app/src/main/java/com/hippo/ehviewer/client/EhTagDatabase.java index 303b1e782..19ea95557 100644 --- a/app/src/main/java/com/hippo/ehviewer/client/EhTagDatabase.java +++ b/app/src/main/java/com/hippo/ehviewer/client/EhTagDatabase.java @@ -17,6 +17,7 @@ package com.hippo.ehviewer.client; import android.content.Context; +import android.util.Base64; import androidx.annotation.Nullable; import androidx.core.util.Pair; @@ -76,9 +77,20 @@ public class EhTagDatabase { public EhTagDatabase(String name, BufferedSource source) throws IOException { this.name = name; - int totalBytes = source.readInt(); + String[] tmp; + StringBuilder buffer = new StringBuilder(); + source.readInt(); + for (String i : source.readUtf8().split("\n")) { + tmp = i.split("\r", 2); + buffer.append(tmp[0]); + buffer.append("\r"); + buffer.append(new String(Base64.decode(tmp[1], Base64.DEFAULT), TextUrl.UTF_8)); + buffer.append("\n"); + } + byte[] b = buffer.toString().getBytes(TextUrl.UTF_8); + int totalBytes = b.length; tags = new byte[totalBytes]; - source.readFully(tags); + System.arraycopy(b, 0, tags, 0, totalBytes); } @Nullable @@ -415,7 +427,7 @@ public class EhTagDatabase { return searchHints; } - private boolean containsIgnoreSpace(String text, String key){ - return text.replace(" ","").contains(key.replace(" ","")); + private boolean containsIgnoreSpace(String text, String key) { + return text.replace(" ", "").contains(key.replace(" ", "")); } } diff --git a/app/src/main/res/values-zh-rCN/arrays.xml b/app/src/main/res/values-zh-rCN/arrays.xml index c49deee38..8013e63e9 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-v2/tag-translations-zh-rCN.sha1 + https://cdn.jsdelivr.net/gh/Mapaler/EhViewer@tag-translations/tag-translations/tag-translations-zh-rCN.sha1 tag-translations-zh-rCN - https://cdn.jsdelivr.net/gh/NekoInverter/tag-translations@main/tag-translations-v2/tag-translations-zh-rCN + https://cdn.jsdelivr.net/gh/Mapaler/EhViewer@tag-translations/tag-translations/tag-translations-zh-rCN diff --git a/app/src/main/res/values-zh-rHK/arrays.xml b/app/src/main/res/values-zh-rHK/arrays.xml index c49deee38..8013e63e9 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-v2/tag-translations-zh-rCN.sha1 + https://cdn.jsdelivr.net/gh/Mapaler/EhViewer@tag-translations/tag-translations/tag-translations-zh-rCN.sha1 tag-translations-zh-rCN - https://cdn.jsdelivr.net/gh/NekoInverter/tag-translations@main/tag-translations-v2/tag-translations-zh-rCN + https://cdn.jsdelivr.net/gh/Mapaler/EhViewer@tag-translations/tag-translations/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 c49deee38..8013e63e9 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-v2/tag-translations-zh-rCN.sha1 + https://cdn.jsdelivr.net/gh/Mapaler/EhViewer@tag-translations/tag-translations/tag-translations-zh-rCN.sha1 tag-translations-zh-rCN - https://cdn.jsdelivr.net/gh/NekoInverter/tag-translations@main/tag-translations-v2/tag-translations-zh-rCN + https://cdn.jsdelivr.net/gh/Mapaler/EhViewer@tag-translations/tag-translations/tag-translations-zh-rCN diff --git a/app/src/main/res/xml/about_settings.xml b/app/src/main/res/xml/about_settings.xml index 854022777..2f0e200cc 100644 --- a/app/src/main/res/xml/about_settings.xml +++ b/app/src/main/res/xml/about_settings.xml @@ -38,7 +38,7 @@ android:key="latest_release" android:title="@string/settings_about_latest_release" app:iconSpaceReserved="false" - app:url="https://github.com/NekoInverter/EhViewer/releases/latest" /> + app:url="https://gitlab.com/NekoInverter/EhViewer/-/tags" />