From ce32762c28bb195b49a9ef1c0ac3137357ea1880 Mon Sep 17 00:00:00 2001
From: Nathaniel Wesley Filardo <nwfilardo@gmail.com>
Date: Sun, 22 Sep 2019 15:19:34 +0100
Subject: [PATCH] treewide: fix inspection-reported issues

---
 .../ctfwstimer/AboutActivity.java             | 14 ++--
 .../ctfwstimer/AndroidResourceUtils.java      |  1 +
 .../ctfwstimer/CheckedAsyncDownloader.java    | 10 ++-
 .../ctfwstimer/CtFwSCallbacksMQTT.java        | 12 ++--
 .../ctfwstimer/CtFwSDisplayLocal.java         |  6 +-
 .../ctfwstimer/CtFwSDisplayTinyChrono.java    |  2 -
 .../ctfwstimer/HandbookDownloader.java        |  7 +-
 .../ctfwstimer/MainService.java               |  2 +-
 .../ctfwstimer/MainServiceNotification.java   |  3 -
 mobile/src/main/res/layout/activity_main.xml  | 72 +++++++++----------
 10 files changed, 60 insertions(+), 69 deletions(-)

diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/AboutActivity.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/AboutActivity.java
index 369219a..cb2b399 100644
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/AboutActivity.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/AboutActivity.java
@@ -40,7 +40,7 @@ public class AboutActivity extends AppCompatActivity {
     private TextView mTvDebug;
 
     private void makeDebugText() {
-        final StringBuffer sb = new StringBuffer("");
+        final StringBuffer sb = new StringBuffer();
 
         sb.append("Android host version: ");
         sb.append(Build.VERSION.RELEASE);
@@ -93,7 +93,7 @@ public class AboutActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_about);
 
-        mTvDebug = (TextView) findViewById(R.id.about_debug_tv);
+        mTvDebug = findViewById(R.id.about_debug_tv);
         makeDebugText();
 
         ActionBar ab = getSupportActionBar();
@@ -115,17 +115,17 @@ public class AboutActivity extends AppCompatActivity {
         });
 
         {
-            final WebView wv = (WebView) findViewById(R.id.about_text);
+            final WebView wv = findViewById(R.id.about_text);
             wv.loadData(getResources().getString(R.string.about_text),
                     "text/html", null);
         }
 
         {
-            final WebView wv = (WebView) findViewById(R.id.about_licenses);
+            final WebView wv = findViewById(R.id.about_licenses);
             wv.loadUrl("file:///android_asset/licenses.html");
         }
 
-        TabHost th = (TabHost) findViewById(R.id.about_tab_host);
+        TabHost th = findViewById(R.id.about_tab_host);
         th.setup();
 
         th.addTab(th.newTabSpec(TAB_PROG)
@@ -154,7 +154,7 @@ public class AboutActivity extends AppCompatActivity {
         return true;
     }
 
-    private MainService.Observer mSrvObs = new MainService.Observer() {
+    private final MainService.Observer mSrvObs = new MainService.Observer() {
         @Override
         public void onMqttServerChanged(MainService.LocalBinder b, String sURL) {
 
@@ -172,7 +172,7 @@ public class AboutActivity extends AppCompatActivity {
         }
     };
 
-    private CtFwSGameStateManager.Observer mCtFwSObs = new CtFwSGameStateManager.Observer() {
+    private final CtFwSGameStateManager.Observer mCtFwSObs = new CtFwSGameStateManager.Observer() {
         @Override
         public void onCtFwSConfigure(CtFwSGameStateManager game) {
             makeDebugText();
diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/AndroidResourceUtils.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/AndroidResourceUtils.java
index ac64571..aee9aa0 100644
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/AndroidResourceUtils.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/AndroidResourceUtils.java
@@ -10,6 +10,7 @@ public class AndroidResourceUtils {
         if (Build.VERSION.SDK_INT >= 24) {
             return Html.fromHtml(String.format(rs.getString(id), args), 0);
         } else {
+            //noinspection deprecation
             return Html.fromHtml(String.format(rs.getString(id), args));
         }
     }
diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/CheckedAsyncDownloader.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/CheckedAsyncDownloader.java
index 38c7dab..91e415c 100644
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/CheckedAsyncDownloader.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/CheckedAsyncDownloader.java
@@ -1,6 +1,5 @@
 package com.acmetensortoys.ctfwstimer;
 
-import android.content.Context;
 import android.os.AsyncTask;
 
 import java.io.BufferedInputStream;
@@ -12,7 +11,6 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.net.URL;
 import java.net.URLConnection;
-import java.nio.file.NoSuchFileException;
 import java.security.DigestInputStream;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -75,6 +73,7 @@ public class CheckedAsyncDownloader extends AsyncTask<CheckedAsyncDownloader.DL,
 
                 byte[] data = new byte[4096];
 
+                //noinspection StatementWithEmptyBody
                 while (is.read(data) != -1) { ; }
 
                 if (java.util.Arrays.equals(is.getMessageDigest().digest(), dl.sha256)) {
@@ -90,6 +89,7 @@ public class CheckedAsyncDownloader extends AsyncTask<CheckedAsyncDownloader.DL,
                  * Something has gone really wrong.
                  * Unlink the file and try to fetch it
                  */
+                //noinspection ResultOfMethodCallIgnored
                 dl.dest.delete();
             }
 
@@ -109,6 +109,7 @@ public class CheckedAsyncDownloader extends AsyncTask<CheckedAsyncDownloader.DL,
                 os = new FileOutputStream(oft);
             } catch (IOException ioe) {
                 dl.result = Result.ERR_WRITE;
+                //noinspection ResultOfMethodCallIgnored
                 oft.delete();
                 continue;
             }
@@ -122,6 +123,7 @@ public class CheckedAsyncDownloader extends AsyncTask<CheckedAsyncDownloader.DL,
                     );
             } catch (IOException ioe) {
                 dl.result = Result.ERR_HOSTUNREACH;
+                //noinspection ResultOfMethodCallIgnored
                 oft.delete();
                 continue;
             }
@@ -138,6 +140,7 @@ public class CheckedAsyncDownloader extends AsyncTask<CheckedAsyncDownloader.DL,
                         is.close();
                         os.close();
                         dl.result = Result.ERR_TOO_LONG;
+                        //noinspection ResultOfMethodCallIgnored
                         oft.delete();
                         continue dlfor;
                     }
@@ -147,18 +150,21 @@ public class CheckedAsyncDownloader extends AsyncTask<CheckedAsyncDownloader.DL,
                 os.close();
             } catch (IOException ioe) {
                 dl.result = Result.ERR_XFER;
+                //noinspection ResultOfMethodCallIgnored
                 oft.delete();
                 continue;
             }
 
             if (!java.util.Arrays.equals(is.getMessageDigest().digest(), dl.sha256)) {
                 dl.result = Result.ERR_CHECKSUM;
+                //noinspection ResultOfMethodCallIgnored
                 oft.delete();
                 continue;
             }
 
             if (!oft.renameTo(dl.dest)) {
                 dl.result = Result.ERR_WRITE;
+                //noinspection ResultOfMethodCallIgnored
                 oft.delete();
                 continue;
             }
diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/CtFwSCallbacksMQTT.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/CtFwSCallbacksMQTT.java
index 69d7e1a..ed53b71 100644
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/CtFwSCallbacksMQTT.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/CtFwSCallbacksMQTT.java
@@ -20,7 +20,7 @@ class CtFwSCallbacksMQTT {
 
     final IMqttMessageListener onConfig = new IMqttMessageListener() {
         @Override
-        public void messageArrived(String topic, MqttMessage message) throws Exception {
+        public void messageArrived(String topic, MqttMessage message) {
             String tm = message.toString().trim();
             Log.d("CtFwS", "Message(Config): " + tm);
             mCgs.fromMqttConfigMessage(tm);
@@ -29,7 +29,7 @@ class CtFwSCallbacksMQTT {
 
     final IMqttMessageListener onEnd = new IMqttMessageListener() {
         @Override
-        public void messageArrived(String topic, MqttMessage message) throws Exception {
+        public void messageArrived(String topic, MqttMessage message) {
             Log.d("CtFwS", "Message(End): " + message);
             long endT;
             try {
@@ -43,7 +43,7 @@ class CtFwSCallbacksMQTT {
 
     final IMqttMessageListener onFlags = new IMqttMessageListener() {
         @Override
-        public void messageArrived(String topic, MqttMessage message) throws Exception {
+        public void messageArrived(String topic, MqttMessage message) {
             String tm = message.toString().trim();
             Log.d("CtFwS", "Message(Flags): " + tm);
             mCgs.fromMqttFlagsMessage(tm);
@@ -52,7 +52,7 @@ class CtFwSCallbacksMQTT {
 
     final IMqttMessageListener onMessage = new IMqttMessageListener() {
         @Override
-        public void messageArrived(String topic, MqttMessage message) throws Exception {
+        public void messageArrived(String topic, MqttMessage message) {
             String str = message.toString();
             Log.d("CtFwS", "Message(Broadcast): " + str);
             mCgs.onNewMessage(str);
@@ -61,7 +61,7 @@ class CtFwSCallbacksMQTT {
 
     final IMqttMessageListener onPlayerMessage = new IMqttMessageListener() {
         @Override
-        public void messageArrived(String topic, MqttMessage message) throws Exception {
+        public void messageArrived(String topic, MqttMessage message) {
             String str = message.toString();
             Log.d("CtFwS", "Message(Players): " + str);
             mCgs.onNewMessage(str);
@@ -70,7 +70,7 @@ class CtFwSCallbacksMQTT {
 
     final IMqttMessageListener onMessageReset = new IMqttMessageListener() {
         @Override
-        public void messageArrived(String topic, MqttMessage message) throws Exception {
+        public void messageArrived(String topic, MqttMessage message) {
             String str = message.toString();
             Log.d("CtFwS", "Message(Reset): " + str);
             long before;
diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/CtFwSDisplayLocal.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/CtFwSDisplayLocal.java
index 332bcd3..0b812f9 100644
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/CtFwSDisplayLocal.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/CtFwSDisplayLocal.java
@@ -6,7 +6,6 @@ import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.SystemClock;
-import android.text.Html;
 import android.text.Spanned;
 import android.text.format.DateUtils;
 import android.util.Log;
@@ -27,7 +26,7 @@ class CtFwSDisplayLocal implements CtFwSGameStateManager.Observer {
     final private Activity mAct;
     String gameStateLabelText;
 
-    private StunTimer stun_short, stun_long;
+    private final StunTimer stun_short, stun_long;
 
     CtFwSDisplayLocal(Activity a) {
         mAct = a;
@@ -103,8 +102,6 @@ class CtFwSDisplayLocal implements CtFwSGameStateManager.Observer {
                         sfx = rs.getString(R.string.notify_game_afoot);
                     }
                     break;
-                case NR_NOT_CONFIG:
-                    // Handled above; fallthru to placate static analysers
                 default:
                     sfx = "";
             }
@@ -394,6 +391,7 @@ class CtFwSDisplayLocal implements CtFwSGameStateManager.Observer {
         final StringBuffer sb = new StringBuffer();
         for (CtFwSGameStateManager.Msg m : msgs) {
 
+            //noinspection StatementWithEmptyBody
             if (m.when == 0 || !gs.isConfigured()) {
                 // leave out the time stamp
             } else if (m.when <= gs.getFirstRoundStartT()) {
diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/CtFwSDisplayTinyChrono.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/CtFwSDisplayTinyChrono.java
index c962786..a4802b3 100644
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/CtFwSDisplayTinyChrono.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/CtFwSDisplayTinyChrono.java
@@ -6,8 +6,6 @@ import android.widget.Chronometer;
 
 import com.acmetensortoys.ctfwstimer.lib.CtFwSGameStateManager;
 
-import java.util.List;
-import java.util.Locale;
 import java.util.SortedSet;
 
 /*
diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/HandbookDownloader.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/HandbookDownloader.java
index c33107f..dae590d 100644
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/HandbookDownloader.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/HandbookDownloader.java
@@ -5,11 +5,8 @@ import android.os.Handler;
 import android.support.v4.util.Consumer;
 import android.util.Log;
 
-import com.acmetensortoys.ctfwstimer.CheckedAsyncDownloader;
-
 import org.eclipse.paho.client.mqttv3.IMqttAsyncClient;
 import org.eclipse.paho.client.mqttv3.IMqttMessageListener;
-import org.eclipse.paho.client.mqttv3.MqttClient;
 import org.eclipse.paho.client.mqttv3.MqttException;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
 
@@ -20,14 +17,14 @@ import java.util.Scanner;
 
 public class HandbookDownloader implements IMqttMessageListener {
 
-    private static String TAG = "HandbookDownloader";
+    private static final String TAG = "HandbookDownloader";
 
     private static final long HAND_MAX_LEN = 1024*1024; /* 1 MiB */
 
     private final Context mCtx;
     private final Consumer<CheckedAsyncDownloader.DL> mDLFiniCB;
     private IMqttAsyncClient mMqc;
-    private Handler mHdl;
+    private final Handler mHdl;
     private Runnable nextSubRunnable;
 
     public HandbookDownloader(Context ctx, Handler hdl,
diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/MainService.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/MainService.java
index e0766d1..6f0e614 100644
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/MainService.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/MainService.java
@@ -62,7 +62,7 @@ public class MainService extends Service {
 
     // Handbook fetch logic; this is a singleton for the service, even as connections come and go.
     private CheckedAsyncDownloader.DL lastHandDL;
-    private HandbookDownloader mHandDL = new HandbookDownloader(this,
+    private final HandbookDownloader mHandDL = new HandbookDownloader(this,
             new Handler(Looper.getMainLooper()),
             new Consumer<CheckedAsyncDownloader.DL>() {
                 @Override
diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/MainServiceNotification.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/MainServiceNotification.java
index e94894b..be9c038 100644
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/MainServiceNotification.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/MainServiceNotification.java
@@ -20,7 +20,6 @@ import android.util.Log;
 import com.acmetensortoys.ctfwstimer.lib.CtFwSGameStateManager;
 
 import java.text.NumberFormat;
-import java.util.List;
 import java.util.SortedSet;
 
 class MainServiceNotification {
@@ -105,8 +104,6 @@ class MainServiceNotification {
                     String txt;
                     switch(now.rationale) {
                         default:
-                        case NR_GAME_IN_PROGRESS:
-                        case NR_START_FUTURE:
                             txt = "";
                             break;
                         case NR_TIME_UP:
diff --git a/mobile/src/main/res/layout/activity_main.xml b/mobile/src/main/res/layout/activity_main.xml
index 8dcc45d..735ee3f 100644
--- a/mobile/src/main/res/layout/activity_main.xml
+++ b/mobile/src/main/res/layout/activity_main.xml
@@ -209,54 +209,48 @@
 
     </LinearLayout>
 
-    <LinearLayout
+    <TableLayout
         android:id="@+id/connmeta"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:orientation="vertical">
+        android:stretchColumns="1">
 
-        <TableLayout
+        <TableRow
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:stretchColumns="1">
-
-            <TableRow
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="end"
-                    android:text="@string/mqtt_uri_label" />
-
-                <TextView
-                    android:id="@+id/tv_mqtt_server_uri"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="center" />
-            </TableRow>
+            android:layout_height="match_parent">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="end"
+                android:text="@string/mqtt_uri_label" />
+
+            <TextView
+                android:id="@+id/tv_mqtt_server_uri"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center" />
+        </TableRow>
+
+        <TableRow
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
 
-            <TableRow
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="end"
+                android:text="@string/mqtt_state_label" />
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="end"
-                    android:text="@string/mqtt_state_label" />
+            <TextView
+                android:id="@+id/tv_mqtt_state"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center" />
 
-                <TextView
-                    android:id="@+id/tv_mqtt_state"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="center" />
+        </TableRow>
 
-            </TableRow>
-
-        </TableLayout>
-    </LinearLayout>
+    </TableLayout>
 
 </RelativeLayout>
-- 
2.50.1