From e79165503392ed6a7cb7a8eadc15eaae0cda9443 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Reimar=20D=C3=B6ffinger?= Date: Sun, 12 Apr 2020 01:29:56 +0200 Subject: [PATCH] Some lint fixes. --- Util | 2 +- build.gradle | 2 +- res/values-eu/strings.xml | 2 +- res/values/strings.xml | 1 - .../hughes/android/dictionary/DictionaryActivity.java | 2 +- src/com/hughes/android/dictionary/DictionaryInfo.java | 2 +- .../android/dictionary/DictionaryManagerActivity.java | 2 +- .../android/dictionary/HtmlDisplayActivity.java | 9 +++------ .../hughes/android/dictionary/engine/Dictionary.java | 3 ++- .../hughes/android/dictionary/engine/HtmlEntry.java | 11 ++++------- src/com/hughes/android/dictionary/engine/Index.java | 3 --- .../hughes/android/dictionary/engine/Language.java | 2 +- .../hughes/android/util/PersistentObjectCache.java | 2 +- 13 files changed, 17 insertions(+), 26 deletions(-) diff --git a/Util b/Util index 272a7b5..7efaa36 160000 --- a/Util +++ b/Util @@ -1 +1 @@ -Subproject commit 272a7b504cb85b8dc2bba3718725b547750434b1 +Subproject commit 7efaa369d15e363663e1c226c433569acb1050c0 diff --git a/build.gradle b/build.gradle index 7458e94..378cc82 100644 --- a/build.gradle +++ b/build.gradle @@ -76,6 +76,6 @@ android { applicationId 'de.reimardoeffinger.quickdic' targetSdkVersion 29 resConfigs "de", "es", "eu", "fr", "it", "ja", "pt", "pt-rBR", "ru", "zh-rCN" - minSdkVersion = 10 + minSdkVersion 10 } } diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml index 338b156..abda508 100644 --- a/res/values-eu/strings.xml +++ b/res/values-eu/strings.xml @@ -43,7 +43,7 @@ Bilatu testua - Hautatu hiztegia... + Hautatu hiztegia… Gehitu hitzen zerrendara: %s Bilatu: %s Akatsa hitz zerrendara gehitzean: %s diff --git a/res/values/strings.xml b/res/values/strings.xml index 20d7476..e074071 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -2,7 +2,6 @@ QuickDic - 5.1.0 About QuickDic diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java index 837097a..0228615 100644 --- a/src/com/hughes/android/dictionary/DictionaryActivity.java +++ b/src/com/hughes/android/dictionary/DictionaryActivity.java @@ -846,7 +846,7 @@ public class DictionaryActivity extends AppCompatActivity { final LinearLayout result = new LinearLayout(parent.getContext()); - for (int i = 0; dictionaryInfo.indexInfos != null && i < dictionaryInfo.indexInfos.size(); ++i) { + for (int i = 0; i < dictionaryInfo.indexInfos.size(); ++i) { final IndexInfo indexInfo = dictionaryInfo.indexInfos.get(i); final View button = IsoUtils.INSTANCE.createButton(parent.getContext(), indexInfo, application.languageButtonPixels); diff --git a/src/com/hughes/android/dictionary/DictionaryInfo.java b/src/com/hughes/android/dictionary/DictionaryInfo.java index 0df04c4..4a13520 100644 --- a/src/com/hughes/android/dictionary/DictionaryInfo.java +++ b/src/com/hughes/android/dictionary/DictionaryInfo.java @@ -63,7 +63,7 @@ public class DictionaryInfo implements Serializable { } public boolean isValid() { - return indexInfos != null && !indexInfos.isEmpty(); + return !indexInfos.isEmpty(); } public StringBuilder append(final StringBuilder result) { diff --git a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java index b046a60..f9a084f 100644 --- a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java +++ b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java @@ -303,7 +303,7 @@ public class DictionaryManagerActivity extends AppCompatActivity { } @Override - public void onRequestPermissionsResult(int requestCode, @NonNull String permissions[], @NonNull int[] grantResults) { + public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { readableCheckAndError(false); application.backgroundUpdateDictionaries(dictionaryUpdater); diff --git a/src/com/hughes/android/dictionary/HtmlDisplayActivity.java b/src/com/hughes/android/dictionary/HtmlDisplayActivity.java index 7a8a7e8..f8899b4 100644 --- a/src/com/hughes/android/dictionary/HtmlDisplayActivity.java +++ b/src/com/hughes/android/dictionary/HtmlDisplayActivity.java @@ -32,6 +32,7 @@ import com.hughes.util.StringUtil; import java.io.IOException; import java.io.InputStream; import java.io.UnsupportedEncodingException; +import java.nio.charset.StandardCharsets; public final class HtmlDisplayActivity extends AppCompatActivity { @@ -101,12 +102,8 @@ public final class HtmlDisplayActivity extends AppCompatActivity { fontSizeSp = 14; } webView.getSettings().setDefaultFontSize(fontSizeSp); - try { - // No way to get pure UTF-8 data into WebView - html = Base64.encodeToString(html.getBytes("UTF-8"), Base64.DEFAULT); - } catch (UnsupportedEncodingException e) { - throw new RuntimeException("Missing UTF-8 support?!", e); - } + // No way to get pure UTF-8 data into WebView + html = Base64.encodeToString(html.getBytes(StandardCharsets.UTF_8), Base64.DEFAULT); // Use loadURL to allow specifying a charset webView.loadUrl("data:text/html;charset=utf-8;base64," + html); webView.activity = this; diff --git a/src/com/hughes/android/dictionary/engine/Dictionary.java b/src/com/hughes/android/dictionary/engine/Dictionary.java index 82ba2cf..fef86bd 100644 --- a/src/com/hughes/android/dictionary/engine/Dictionary.java +++ b/src/com/hughes/android/dictionary/engine/Dictionary.java @@ -31,6 +31,7 @@ import java.io.PrintStream; import java.io.RandomAccessFile; import java.nio.channels.Channels; import java.nio.channels.FileChannel; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -214,7 +215,7 @@ public class Dictionary implements RAFSerializable { out.seek(dataPos); out.writeShort(h.entrySource.index()); out.writeUTF(h.title); - byte[] data = h.getHtml().getBytes("UTF-8"); + byte[] data = h.getHtml().getBytes(StandardCharsets.UTF_8); out.writeInt(data.length); ByteArrayOutputStream baos = new ByteArrayOutputStream(); GZIPOutputStream gzout = new GZIPOutputStream(baos); diff --git a/src/com/hughes/android/dictionary/engine/HtmlEntry.java b/src/com/hughes/android/dictionary/engine/HtmlEntry.java index 8dcf905..f279a3d 100644 --- a/src/com/hughes/android/dictionary/engine/HtmlEntry.java +++ b/src/com/hughes/android/dictionary/engine/HtmlEntry.java @@ -13,6 +13,7 @@ import java.io.PrintStream; import java.io.UnsupportedEncodingException; import java.lang.ref.SoftReference; import java.nio.channels.FileChannel; +import java.nio.charset.StandardCharsets; import java.util.List; import java.util.regex.Pattern; @@ -44,7 +45,7 @@ public class HtmlEntry extends AbstractEntry implements Comparable { } private void writeData(DataOutput raf) throws IOException { - final byte[] bytes = getHtml().getBytes("UTF-8"); + final byte[] bytes = getHtml().getBytes(StandardCharsets.UTF_8); StringUtil.writeVarInt(raf, bytes.length); raf.write(bytes); } @@ -264,11 +265,7 @@ public class HtmlEntry extends AbstractEntry implements Comparable { return html; } if (data != null) { - try { - html = new String(data.get(index), "UTF-8"); - } catch (UnsupportedEncodingException e) { - throw new RuntimeException("Dictionary HTML data corrupted", e); - } + html = new String(data.get(index), StandardCharsets.UTF_8); htmlRef = new SoftReference<>(html); return html; } @@ -285,7 +282,7 @@ public class HtmlEntry extends AbstractEntry implements Comparable { } try { final byte[] bytes = StringUtil.unzipFully(zipBytes, numBytes); - html = new String(bytes, "UTF-8"); + html = new String(bytes, StandardCharsets.UTF_8); } catch (IOException e) { throw new RuntimeException("Dictionary HTML data corrupted", e); } diff --git a/src/com/hughes/android/dictionary/engine/Index.java b/src/com/hughes/android/dictionary/engine/Index.java index e8d9789..b58384d 100644 --- a/src/com/hughes/android/dictionary/engine/Index.java +++ b/src/com/hughes/android/dictionary/engine/Index.java @@ -125,9 +125,6 @@ public final class Index implements RAFSerializable { sortLanguage = Language.lookup(languageCode); normalizerRules = raf.readUTF(); swapPairEntries = raf.readBoolean(); - if (sortLanguage == null) { - throw new IOException("Unsupported language: " + languageCode); - } if (dict.dictFileVersion >= 2) { mainTokenCount = raf.readInt(); } diff --git a/src/com/hughes/android/dictionary/engine/Language.java b/src/com/hughes/android/dictionary/engine/Language.java index 4bef67c..1822d93 100644 --- a/src/com/hughes/android/dictionary/engine/Language.java +++ b/src/com/hughes/android/dictionary/engine/Language.java @@ -66,7 +66,7 @@ public class Language { return new Comparator() { @Override public int compare(Object o, Object t1) { - return String.class.cast(o).compareToIgnoreCase(String.class.cast(t1)); + return ((String)o).compareToIgnoreCase((String)t1); } }; // TODO: consider if this should be cached - but must be thread-safe diff --git a/src/com/hughes/android/util/PersistentObjectCache.java b/src/com/hughes/android/util/PersistentObjectCache.java index 17be956..7ac0745 100644 --- a/src/com/hughes/android/util/PersistentObjectCache.java +++ b/src/com/hughes/android/util/PersistentObjectCache.java @@ -43,7 +43,7 @@ public class PersistentObjectCache { private final File dir; private final Map objects = new HashMap<>(); - class ConstrainedOIS extends ObjectInputStream { + static class ConstrainedOIS extends ObjectInputStream { ConstrainedOIS(InputStream in) throws IOException { super(in); } -- 2.43.0