From: Nathaniel Wesley Filardo Date: Sat, 27 Oct 2018 03:53:58 +0000 (+0100) Subject: Treewide: tidy many warnings X-Git-Tag: release-1.2~17 X-Git-Url: https://hydra-www.ietfng.org/gitweb/?a=commitdiff_plain;h=0d48d90a8eadde004d56ed3039e4070a3c8c6de2;p=acmetensortoys-ctfws-android Treewide: tidy many warnings --- 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 de2730a..44c529b 100644 --- a/lib/src/main/java/com/acmetensortoys/ctfwstimer/lib/CtFwSGameStateManager.java +++ b/lib/src/main/java/com/acmetensortoys/ctfwstimer/lib/CtFwSGameStateManager.java @@ -38,7 +38,7 @@ public class CtFwSGameStateManager { && (this.endT == g.endT) && (this.flagsTotal == g.flagsTotal); } - }; + } private Game curstate = new Game(); public synchronized void fromMqttConfigMessage(String st) { @@ -219,7 +219,7 @@ public class CtFwSGameStateManager { if (this.when == m.when) { return this.msg.compareTo(m.msg); } - return (Long.valueOf(when).compareTo(Long.valueOf(m.when))); + return Long.compare(this.when, m.when); } @Override diff --git a/mobile/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml index b0d53bd..b1fde30 100644 --- a/mobile/src/main/AndroidManifest.xml +++ b/mobile/src/main/AndroidManifest.xml @@ -13,6 +13,7 @@ + + + + + diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/CtFwSDisplayLocal.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/CtFwSDisplayLocal.java index 1e9a837..5b8b4ce 100644 --- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/CtFwSDisplayLocal.java +++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/CtFwSDisplayLocal.java @@ -53,10 +53,10 @@ class CtFwSDisplayLocal implements CtFwSGameStateManager.Observer { }); } - public void timersToBundle(Bundle out, String key) { + void timersToBundle(Bundle out, String key) { out.putLongArray(key, new long[]{ stun_short.wallEndMS, stun_long.wallEndMS }); } - public void timersFromBundle(Bundle in, String key) { + void timersFromBundle(Bundle in, String key) { long[] es = in.getLongArray(key); if(es == null) { return; } if(es.length > 0) { resumeTimer(stun_short, es[0]); } @@ -81,7 +81,7 @@ class CtFwSDisplayLocal implements CtFwSGameStateManager.Observer { gameStateLabelText = pfx; } - final TextView gstv = (TextView) mAct.findViewById(R.id.header_gamestate); + final TextView gstv = mAct.findViewById(R.id.header_gamestate); gstv.post(new Runnable() { @Override public void run() { @@ -113,7 +113,7 @@ class CtFwSDisplayLocal implements CtFwSGameStateManager.Observer { // Upper line text { - final TextView tv_jb = (TextView) (mAct.findViewById(R.id.tv_jailbreak)); + final TextView tv_jb = mAct.findViewById(R.id.tv_jailbreak); tv_jb.post(new Runnable() { @Override public void run() { @@ -132,7 +132,7 @@ class CtFwSDisplayLocal implements CtFwSGameStateManager.Observer { // Upper progress bar and chronometer { - final ProgressBar pb_jb = (ProgressBar) (mAct.findViewById(R.id.pb_jailbreak)); + final ProgressBar pb_jb = mAct.findViewById(R.id.pb_jailbreak); pb_jb.post(new Runnable() { @Override public void run() { @@ -142,7 +142,7 @@ class CtFwSDisplayLocal implements CtFwSGameStateManager.Observer { } }); - final Chronometer ch_jb = (Chronometer) (mAct.findViewById(R.id.ch_jailbreak)); + final Chronometer ch_jb = mAct.findViewById(R.id.ch_jailbreak); ch_jb.post(new Runnable() { @Override public void run() { @@ -168,7 +168,7 @@ class CtFwSDisplayLocal implements CtFwSGameStateManager.Observer { // Lower progress bar and chronometer if (now.round > 0) { - final ProgressBar pb_gp = (ProgressBar) (mAct.findViewById(R.id.pb_gameProgress)); + final ProgressBar pb_gp = mAct.findViewById(R.id.pb_gameProgress); pb_gp.post(new Runnable() { @Override public void run() { @@ -178,7 +178,7 @@ class CtFwSDisplayLocal implements CtFwSGameStateManager.Observer { } }); - final Chronometer ch_gp = (Chronometer) (mAct.findViewById(R.id.ch_gameProgress)); + final Chronometer ch_gp = mAct.findViewById(R.id.ch_gameProgress); ch_gp.post(new Runnable() { @Override public void run() { @@ -195,7 +195,7 @@ class CtFwSDisplayLocal implements CtFwSGameStateManager.Observer { } }); } else { - final ProgressBar pb_gp = (ProgressBar) (mAct.findViewById(R.id.pb_gameProgress)); + final ProgressBar pb_gp = mAct.findViewById(R.id.pb_gameProgress); pb_gp.post(new Runnable() { @Override public void run() { @@ -203,7 +203,7 @@ class CtFwSDisplayLocal implements CtFwSGameStateManager.Observer { } }); - final Chronometer ch_gp = (Chronometer) (mAct.findViewById(R.id.ch_gameProgress)); + final Chronometer ch_gp = mAct.findViewById(R.id.ch_gameProgress); ch_gp.post(new Runnable() { @Override public void run() { @@ -214,7 +214,7 @@ class CtFwSDisplayLocal implements CtFwSGameStateManager.Observer { }); } { - final TextView tv_flags = (TextView) (mAct.findViewById(R.id.tv_flags_label)); + final TextView tv_flags = mAct.findViewById(R.id.tv_flags_label); tv_flags.post(new Runnable() { @Override public void run() { @@ -231,7 +231,7 @@ class CtFwSDisplayLocal implements CtFwSGameStateManager.Observer { Log.d("CtFwS", "Display Reset"); { - final Chronometer ch = (Chronometer) (mAct.findViewById(R.id.ch_jailbreak)); + final Chronometer ch = mAct.findViewById(R.id.ch_jailbreak); ch.post(new Runnable() { @Override public void run() { @@ -243,7 +243,7 @@ class CtFwSDisplayLocal implements CtFwSGameStateManager.Observer { }); } { - final Chronometer ch = (Chronometer) (mAct.findViewById(R.id.ch_gameProgress)); + final Chronometer ch = mAct.findViewById(R.id.ch_gameProgress); ch.post(new Runnable() { @Override public void run() { @@ -254,7 +254,7 @@ class CtFwSDisplayLocal implements CtFwSGameStateManager.Observer { }); } { - final ProgressBar pb = (ProgressBar) (mAct.findViewById(R.id.pb_jailbreak)); + final ProgressBar pb = mAct.findViewById(R.id.pb_jailbreak); pb.post(new Runnable() { @Override public void run() { @@ -263,7 +263,7 @@ class CtFwSDisplayLocal implements CtFwSGameStateManager.Observer { }); } { - final ProgressBar pb = (ProgressBar) (mAct.findViewById(R.id.pb_gameProgress)); + final ProgressBar pb = mAct.findViewById(R.id.pb_gameProgress); pb.post(new Runnable() { @Override public void run() { @@ -289,7 +289,7 @@ class CtFwSDisplayLocal implements CtFwSGameStateManager.Observer { } } - final TextView msgs = (TextView) (mAct.findViewById(R.id.tv_flags)); + final TextView msgs = mAct.findViewById(R.id.tv_flags); msgs.post(new Runnable() { @Override public void run() { @@ -301,7 +301,7 @@ class CtFwSDisplayLocal implements CtFwSGameStateManager.Observer { private CtFwSGameStateManager.Msg lastMsg; @Override public void onCtFwSMessage(CtFwSGameStateManager gs, List msgs) { - final TextView msgstv = (TextView) (mAct.findViewById(R.id.msgs)); + final TextView msgstv = mAct.findViewById(R.id.msgs); int s = msgs.size(); if (s == 0) { diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/MainActivity.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/MainActivity.java index f03c707..d60d075 100644 --- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/MainActivity.java +++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/MainActivity.java @@ -1,6 +1,5 @@ package com.acmetensortoys.ctfwstimer; -import android.annotation.SuppressLint; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -63,6 +62,20 @@ public class MainActivity extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); + findViewById(R.id.connmeta).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + onclick_connmeta(v); + } + }); + + findViewById(R.id.header_gamestate).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + onclick_gamestate(v); + } + }); + setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this); @@ -73,8 +86,8 @@ public class MainActivity extends AppCompatActivity { throw new AssertionError("Shared Preferences not sticking!"); } - mTvSU = (TextView) findViewById(R.id.tv_mqtt_server_uri); - mTvSS = (TextView) findViewById(R.id.tv_mqtt_state); + mTvSU = findViewById(R.id.tv_mqtt_server_uri); + mTvSS = findViewById(R.id.tv_mqtt_state); mCdl = new CtFwSDisplayLocal(this); } @@ -158,13 +171,12 @@ public class MainActivity extends AppCompatActivity { // Every good application needs an easter egg private boolean egg = false; - @SuppressLint({"SetTextI18n"}) public void onclick_gamestate(View v) { final TextView tv = (TextView) v; // Cam: Because every good easter egg needs to be way over-engineered. if (!egg) { egg = true; - tv.setText("DO NOT TAP ON GLASS"); + tv.setText(R.string.header_egg); tv.postDelayed(new Runnable() { public void run() { if (mCdl != null) { @@ -179,15 +191,12 @@ public class MainActivity extends AppCompatActivity { } // Kick the mqtt layer on a click on the status stuff - public void onclick_connmeta(@SuppressWarnings("UnusedParameters") View v) { + public void onclick_connmeta(View v) { if (mSrvBinder != null) { mSrvBinder.connect(true); } } - // TODO should we be using onClick instead for routing? - // Cam: According to official documentation, this is the preferred way to into menus, so - // we're (overall) fine. @Override public boolean onOptionsItemSelected(MenuItem mi) { switch(mi.getItemId()) { diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/MainService.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/MainService.java index b7d6ad7..097244b 100644 --- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/MainService.java +++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/MainService.java @@ -92,7 +92,7 @@ public class MainService extends Service { }; // And this handles making our subscriptions for us private class MyMQTTCallbacks implements MqttCallbackExtended { - public CtFwSCallbacksMQTT mCtfwscbs; + CtFwSCallbacksMQTT mCtfwscbs; @Override public void connectComplete(boolean reconnect, String serverURI) { @@ -121,7 +121,7 @@ public class MainService extends Service { } @Override - public void messageArrived(String topic, MqttMessage message) throws Exception { + public void messageArrived(String topic, MqttMessage message) { Log.d("CtFwS", "Message(Generic) " + topic + " : '" + message + "'" ); } @@ -130,7 +130,7 @@ public class MainService extends Service { // Unused, as we never publish Log.d("CtFwS", "Delivery OK"); } - }; + } private final MyMQTTCallbacks mqttcb = new MyMQTTCallbacks(); // And this handles yet more about connecting diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/SettingsActivity.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/SettingsActivity.java index d007765..5d5e3ae 100644 --- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/SettingsActivity.java +++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/SettingsActivity.java @@ -4,7 +4,6 @@ import android.preference.PreferenceActivity; import android.preference.PreferenceFragment; import android.os.Bundle; -// TODO (Cam): changing the server doesn't actually work yet public class SettingsActivity extends PreferenceActivity { @Override protected void onCreate(Bundle savedInstanceState) { diff --git a/mobile/src/main/res/layout-land/activity_main.xml b/mobile/src/main/res/layout-land/activity_main.xml index b27aa51..b2064c2 100644 --- a/mobile/src/main/res/layout-land/activity_main.xml +++ b/mobile/src/main/res/layout-land/activity_main.xml @@ -225,7 +225,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" - android:onClick="onclick_connmeta" android:orientation="vertical"> Game State: Game %1$d State: + DO NOT TAP ON GLASS Game\nTime\nElapsed Messages: diff --git a/mobile/src/main/res/xml/backup_rules.xml b/mobile/src/main/res/xml/backup_rules.xml new file mode 100644 index 0000000..231c813 --- /dev/null +++ b/mobile/src/main/res/xml/backup_rules.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file