From 3ce0dd16e69302365d3bc802f298a5388b293d86 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Reimar=20D=C3=B6ffinger?= Date: Mon, 20 Aug 2018 23:18:08 +0200 Subject: [PATCH] Fix some code inspection warnings. --- Util | 2 +- .../android/dictionary/AboutActivity.java | 2 +- .../dictionary/DictionaryActivity.java | 4 ++-- .../dictionary/DictionaryApplication.java | 6 +++--- .../dictionary/DictionaryManagerActivity.java | 19 ++++++++++++++----- .../dictionary/HtmlDisplayActivity.java | 2 +- .../dictionary/PreferenceActivity.java | 2 +- .../android/dictionary/engine/HtmlEntry.java | 4 +++- .../android/dictionary/engine/PairEntry.java | 4 +++- .../android/util/PersistentObjectCache.java | 4 ++-- 10 files changed, 31 insertions(+), 18 deletions(-) diff --git a/Util b/Util index 47ba24f..272a7b5 160000 --- a/Util +++ b/Util @@ -1 +1 @@ -Subproject commit 47ba24f81320001cf29f46e0069e0e7e83ad3553 +Subproject commit 272a7b504cb85b8dc2bba3718725b547750434b1 diff --git a/src/com/hughes/android/dictionary/AboutActivity.java b/src/com/hughes/android/dictionary/AboutActivity.java index 7af07bd..2f1ee13 100644 --- a/src/com/hughes/android/dictionary/AboutActivity.java +++ b/src/com/hughes/android/dictionary/AboutActivity.java @@ -37,7 +37,7 @@ public final class AboutActivity extends Activity { PackageInfo p = pm.getPackageInfo(getPackageName(), 0); ver = p.versionName + " (ID " + p.versionCode + ")"; } - } catch (Exception e) { + } catch (Exception ignored) { } TextView titleView = findViewById(R.id.titleText); titleView.setText("QuickDic " + ver); diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java index b9b5043..0637f16 100644 --- a/src/com/hughes/android/dictionary/DictionaryActivity.java +++ b/src/com/hughes/android/dictionary/DictionaryActivity.java @@ -1285,7 +1285,7 @@ public class DictionaryActivity extends AppCompatActivity { Log.d(LOG, "Trying to hide soft keyboard."); final InputMethodManager inputManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); View focus = getCurrentFocus(); - if (focus != null) { + if (inputManager != null && focus != null) { inputManager.hideSoftInputFromWindow(focus.getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS); } @@ -1501,7 +1501,7 @@ public class DictionaryActivity extends AppCompatActivity { DisplayMetrics dm = new DisplayMetrics(); getWindowManager().getDefaultDisplay().getMetrics(dm); scale = dm.density; - } catch (NullPointerException e) + } catch (NullPointerException ignored) {} // Convert the dps to pixels, based on density scale mPaddingDefault = (int) (PADDING_DEFAULT_DP * scale + 0.5f); diff --git a/src/com/hughes/android/dictionary/DictionaryApplication.java b/src/com/hughes/android/dictionary/DictionaryApplication.java index fac4851..c17c7ef 100644 --- a/src/com/hughes/android/dictionary/DictionaryApplication.java +++ b/src/com/hughes/android/dictionary/DictionaryApplication.java @@ -157,7 +157,7 @@ public enum DictionaryApplication { } try { reader.close(); - } catch (IOException e) {} + } catch (IOException ignored) {} } public synchronized void init(Context c) { @@ -256,7 +256,7 @@ public enum DictionaryApplication { File efd = null; try { efd = appContext.getExternalFilesDir(null); - } catch (Exception e) { + } catch (Exception ignored) { } if (efd != null) { efd.mkdirs(); @@ -295,7 +295,7 @@ public enum DictionaryApplication { try { testfile.delete(); res = testfile.createNewFile() & testfile.delete(); - } catch (Exception e) { + } catch (Exception ignored) { } return res; } diff --git a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java index 3cc5e82..265059e 100644 --- a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java +++ b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java @@ -224,7 +224,7 @@ public class DictionaryManagerActivity extends AppCompatActivity { } } zipFile = new ZipInputStream(new BufferedInputStream(zipFileStream)); - ZipEntry zipEntry = null; + ZipEntry zipEntry; while ((zipEntry = zipFile.getNextEntry()) != null) { // Note: this check prevents security issues like accidental path // traversal, which unfortunately ZipInputStream has no protection against. @@ -258,14 +258,15 @@ public class DictionaryManagerActivity extends AppCompatActivity { } finally { try { if (zipOut != null) zipOut.close(); - } catch (IOException e) {} + } catch (IOException ignored) {} try { if (zipFile != null) zipFile.close(); - } catch (IOException e) {} + } catch (IOException ignored) {} try { if (zipFileStream != null) zipFileStream.close(); - } catch (IOException e) {} - if (localZipFile != null && delete) localZipFile.delete(); + } catch (IOException ignored) {} + if (localZipFile != null && delete) //noinspection ResultOfMethodCallIgnored + localZipFile.delete(); } return result; } @@ -839,6 +840,14 @@ public class DictionaryManagerActivity extends AppCompatActivity { DownloadManager downloadManager = (DownloadManager) getSystemService(DOWNLOAD_SERVICE); + if (downloadManager == null) { + String msg = getString(R.string.downloadManagerQueryFailed); + new AlertDialog.Builder(DictionaryManagerActivity.this).setTitle(getString(R.string.error)) + .setMessage(getString(R.string.downloadFailed, msg)) + .setNeutralButton("Close", null).show(); + return; + } + try { downloadManager.enqueue(request); } catch (SecurityException e) { diff --git a/src/com/hughes/android/dictionary/HtmlDisplayActivity.java b/src/com/hughes/android/dictionary/HtmlDisplayActivity.java index c2f4a83..7a8a7e8 100644 --- a/src/com/hughes/android/dictionary/HtmlDisplayActivity.java +++ b/src/com/hughes/android/dictionary/HtmlDisplayActivity.java @@ -86,7 +86,7 @@ public final class HtmlDisplayActivity extends AppCompatActivity { html = StringUtil.readToString(res); try { res.close(); - } catch (IOException e) { + } catch (IOException ignored) { } } else { html = getIntent().getStringExtra(HTML); diff --git a/src/com/hughes/android/dictionary/PreferenceActivity.java b/src/com/hughes/android/dictionary/PreferenceActivity.java index 40784af..cda9a80 100644 --- a/src/com/hughes/android/dictionary/PreferenceActivity.java +++ b/src/com/hughes/android/dictionary/PreferenceActivity.java @@ -103,7 +103,7 @@ public class PreferenceActivity extends android.preference.PreferenceActivity File efd = null; try { efd = getApplicationContext().getExternalFilesDir(null); - } catch (Exception e) { + } catch (Exception ignored) { } if (efd != null) { String externalFilesDir = efd.getAbsolutePath(); diff --git a/src/com/hughes/android/dictionary/engine/HtmlEntry.java b/src/com/hughes/android/dictionary/engine/HtmlEntry.java index 1e34b00..1a602a0 100644 --- a/src/com/hughes/android/dictionary/engine/HtmlEntry.java +++ b/src/com/hughes/android/dictionary/engine/HtmlEntry.java @@ -1,6 +1,8 @@ package com.hughes.android.dictionary.engine; +import android.support.annotation.NonNull; + import com.hughes.util.StringUtil; import com.hughes.util.raf.RAFListSerializer; import com.hughes.util.raf.RAFListSerializerSkippable; @@ -137,7 +139,7 @@ public class HtmlEntry extends AbstractEntry implements Comparable { } @Override - public int compareTo(HtmlEntry another) { + public int compareTo(@NonNull HtmlEntry another) { if (title.compareTo(another.title) != 0) { return title.compareTo(another.title); } diff --git a/src/com/hughes/android/dictionary/engine/PairEntry.java b/src/com/hughes/android/dictionary/engine/PairEntry.java index a82063e..2fac99f 100644 --- a/src/com/hughes/android/dictionary/engine/PairEntry.java +++ b/src/com/hughes/android/dictionary/engine/PairEntry.java @@ -14,6 +14,8 @@ package com.hughes.android.dictionary.engine; +import android.support.annotation.NonNull; + import com.hughes.util.StringUtil; import com.hughes.util.raf.RAFListSerializerSkippable; import com.hughes.util.raf.RAFSerializable; @@ -219,7 +221,7 @@ public class PairEntry extends AbstractEntry implements RAFSerializable