Cleanups as directed by code analysis

diff --git a/lib/src/main/java/com/acmetensortoys/ctfwstimer/lib/CtFwSGameStateManager.java b/lib/src/main/java/com/acmetensortoys/ctfwstimer/lib/CtFwSGameStateManager.java
index c3889f33221323f0a46cd1164db65cf95dba9609..26967d9b0fa97221756c464bbe5acc8b562a15f3 100644 (file)
--- a/lib/src/main/java/com/acmetensortoys/ctfwstimer/lib/CtFwSGameStateManager.java
+++ b/lib/src/main/java/com/acmetensortoys/ctfwstimer/lib/CtFwSGameStateManager.java
@@ -2,7 +2,6 @@ package com.acmetensortoys.ctfwstimer.lib;
 
 import java.util.HashSet;
 import java.util.InputMismatchException;
-import java.util.List;
 import java.util.Locale;
 import java.util.NoSuchElementException;
 import java.util.Scanner;

diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/AboutActivity.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/AboutActivity.java
index b6068fcbb7711d691d27f578b12266dbe9c37acb..71188a3c392cfee7f676745627e327510f5911bd 100644 (file)
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/AboutActivity.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/AboutActivity.java
@@ -144,7 +144,7 @@ public class AboutActivity extends CtFwSActivityBase {
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.aboutmenu, menu);
 
-        Chronometer ch = (Chronometer) menu.findItem(R.id.about_menu_crono).getActionView();
+        Chronometer ch = (Chronometer) menu.findItem(R.id.about_menu_chrono).getActionView();
         mTitleChronoObs = new CtFwSDisplayTinyChrono(getResources(), ch);
         if (mSrvBinder != null) {
             doRegisterObservers();

diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/HandbookActivity.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/HandbookActivity.java
index f8809e76c408b9aa0c34f192c429406f88397adc..b84a61684c60ea6d71f43431d00cbffc6e465e07 100644 (file)
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/HandbookActivity.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/HandbookActivity.java
@@ -94,7 +94,7 @@ public class HandbookActivity extends CtFwSActivityBase {
         Log.d(TAG, "onCreateOptionsMenu");
         getMenuInflater().inflate(R.menu.handmenu, menu);
 
-        Chronometer ch = (Chronometer) menu.findItem(R.id.hand_menu_crono).getActionView();
+        Chronometer ch = (Chronometer) menu.findItem(R.id.hand_menu_chrono).getActionView();
         mTitleChronoObs = new CtFwSDisplayTinyChrono(getResources(), ch);
 
         if (mSrvBinder != null) {

diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/MainActivity.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/MainActivity.java
index be9eb55daa3c1fcc2f057542fcc5c5b4377d556e..b56c9cc56630ae467f850c43bb8a972a2d2f498f 100644 (file)
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/MainActivity.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/MainActivity.java
@@ -1,15 +1,10 @@
 package com.acmetensortoys.ctfwstimer.activity;
 
-import android.content.ComponentName;
-import android.content.Context;
 import android.content.Intent;
-import android.content.ServiceConnection;
 import android.content.SharedPreferences;
 import android.content.pm.ActivityInfo;
-import android.os.IBinder;
 import android.preference.PreferenceManager;
 import android.support.annotation.StringRes;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.text.Spanned;
 import android.util.Log;

diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/MainActivityCtFwSDisplay.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/MainActivityCtFwSDisplay.java
index cb1473848677f028481442f038be6d51b9a0d610..90f5fef0585405a92eab24671c4e07a2570f262a 100644 (file)
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/MainActivityCtFwSDisplay.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/MainActivityCtFwSDisplay.java
@@ -87,8 +87,6 @@ class MainActivityCtFwSDisplay implements CtFwSGameStateManager.Observer {
             String sfx;
             switch (nr) {
                 case NR_EXPLICIT_END:
-                    sfx = rs.getString(R.string.notify_game_over);
-                    break;
                 case NR_TIME_UP:
                     sfx = rs.getString(R.string.notify_game_over);
                     break;

diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/service/MainService.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/service/MainService.java
index a8f67a85ad391194af312af5c20391141a29827a..7cedc233b9698fe42cfa98d75a21cfca2085a494 100644 (file)
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/service/MainService.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/service/MainService.java
@@ -57,7 +57,7 @@ public class MainService extends Service {
         }
     });
 
-    @SuppressWarnings({"FieldCanBeLocal", "unused"})
+    @SuppressWarnings({"FieldCanBeLocal"})
     private MainServiceNotification mMsn; // set in onCreate
 
     public MainService() { }

diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/utils/CtFwSDisplayTinyChrono.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/utils/CtFwSDisplayTinyChrono.java
index 0ea1ecea94328195a142b4672262855ea773a78f..7159074466056b13223d6be3fb0b5ce9993fb636 100644 (file)
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/utils/CtFwSDisplayTinyChrono.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/utils/CtFwSDisplayTinyChrono.java
@@ -48,10 +48,16 @@ public class CtFwSDisplayTinyChrono implements CtFwSGameStateManager.Observer {
                 if (now.rationale != CtFwSGameStateManager.NowRationale.NR_GAME_IN_PROGRESS) {
                     int rid = R.string.ctfws_chrono_nogame;
                     switch(now.rationale) {
-                        case NR_TIME_UP:      rid = R.string.ctfws_chrono_over  ; break;
-                        case NR_EXPLICIT_END: rid = R.string.ctfws_chrono_over  ; break;
-                        case NR_START_FUTURE: rid = R.string.ctfws_chrono_future; break;
-                        case NR_NOT_CONFIG:   rid = R.string.ctfws_chrono_nogame; break;
+                        case NR_TIME_UP:
+                        case NR_EXPLICIT_END:
+                            rid = R.string.ctfws_chrono_over;
+                            break;
+                        case NR_START_FUTURE:
+                            rid = R.string.ctfws_chrono_future;
+                            break;
+                        case NR_NOT_CONFIG:
+                            rid = R.string.ctfws_chrono_nogame;
+                            break;
                     }
                     mCh.setText(rid);
                     return;

diff --git a/mobile/src/main/res/drawable/hand_tab_div.xml b/mobile/src/main/res/drawable/hand_tab_div.xml
deleted file mode 100644 (file)
index fb8e136..0000000
--- a/mobile/src/main/res/drawable/hand_tab_div.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <size android:height="@dimen/hand_tab_div_size" android:width="@dimen/hand_tab_div_size"/>
-    <solid android:color="@android:color/transparent"/>
-</shape>
\ No newline at end of file

diff --git a/mobile/src/main/res/menu/aboutmenu.xml b/mobile/src/main/res/menu/aboutmenu.xml
index aba983fef91cab25467ac8d8e786a081deb86a1b..06ba996a777ceb5893554804e269295aae8a191f 100644 (file)
--- a/mobile/src/main/res/menu/aboutmenu.xml
+++ b/mobile/src/main/res/menu/aboutmenu.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
-        android:id="@+id/about_menu_crono"
+        android:id="@+id/about_menu_chrono"
         android:title="@string/ctfws_chrono_menutext"
         app:actionViewClass="android.widget.Chronometer"
         app:showAsAction="always" />

diff --git a/mobile/src/main/res/menu/handmenu.xml b/mobile/src/main/res/menu/handmenu.xml
index 8c1a666278569ba637acb5e0312f741f437d6af9..8295bf3188bdb6d4fccaf7ef9bc1cfe597620304 100644 (file)
--- a/mobile/src/main/res/menu/handmenu.xml
+++ b/mobile/src/main/res/menu/handmenu.xml
@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
-        android:id="@+id/hand_menu_crono"
+        android:id="@+id/hand_menu_chrono"
         android:title="@string/ctfws_chrono_menutext"
         app:actionViewClass="android.widget.Chronometer"
         app:showAsAction="always" />

diff --git a/mobile/src/main/res/values/dimens.xml b/mobile/src/main/res/values/dimens.xml
index 974ec000bd9ebdf1490b4f068d051c9fad6e1c40..47c82246738c4d056e8030d3a259206f42e8e15d 100644 (file)
--- a/mobile/src/main/res/values/dimens.xml
+++ b/mobile/src/main/res/values/dimens.xml
@@ -2,6 +2,4 @@
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
-
-    <dimen name="hand_tab_div_size">4dp</dimen>
 </resources>