From a5af07b4cf651f47a2b985d852347730c25a5406 Mon Sep 17 00:00:00 2001
From: Graham Jones <grahamjones139@gmail.com>
Date: Wed, 9 Dec 2015 20:46:46 +0000
Subject: [PATCH] Fixed MainActivity crash on startup when not bound to server.

---
 .../org/openseizuredetector/MainActivity.java | 57 +++++++++----------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/app/src/main/java/uk/org/openseizuredetector/MainActivity.java b/app/src/main/java/uk/org/openseizuredetector/MainActivity.java
index d24339b..f2f09df 100644
--- a/app/src/main/java/uk/org/openseizuredetector/MainActivity.java
+++ b/app/src/main/java/uk/org/openseizuredetector/MainActivity.java
@@ -260,7 +260,7 @@ public class MainActivity extends Activity {
     @Override
     protected void onStop() {
         super.onStop();
-        mUtil.unbindFromServer(this,mConnection);
+        mUtil.unbindFromServer(this, mConnection);
     }
 
 
@@ -291,7 +291,6 @@ public class MainActivity extends Activity {
     }
 
 
-
     /*
      * updateServerStatus - called by the uiTimer timer periodically.
      * requests the ui to be updated by calling serverStatusRunnable.
@@ -384,27 +383,27 @@ public class MainActivity extends Activity {
                             mConnection.mSdServer.mSdData.specPower) /
                             mConnection.mSdServer.mSdData.alarmRatioThresh;
 
-                    ((TextView)findViewById(R.id.powerTv)).setText("Power = "+mConnection.mSdServer.mSdData.roiPower+
-                        " (threshold = "+mConnection.mSdServer.mSdData.alarmThresh+")");
-                    ((TextView)findViewById(R.id.spectrumTv)).setText("Spectrum Ratio = "+10 * mConnection.mSdServer.mSdData.roiPower /
-                            mConnection.mSdServer.mSdData.specPower+
-                            " (threshold = "+mConnection.mSdServer.mSdData.alarmRatioThresh+")");
+                    ((TextView) findViewById(R.id.powerTv)).setText("Power = " + mConnection.mSdServer.mSdData.roiPower +
+                            " (threshold = " + mConnection.mSdServer.mSdData.alarmThresh + ")");
+                    ((TextView) findViewById(R.id.spectrumTv)).setText("Spectrum Ratio = " + 10 * mConnection.mSdServer.mSdData.roiPower /
+                            mConnection.mSdServer.mSdData.specPower +
+                            " (threshold = " + mConnection.mSdServer.mSdData.alarmRatioThresh + ")");
 
                     ProgressBar pb;
-                    pb =   ((ProgressBar)findViewById(R.id.powerProgressBar));
+                    pb = ((ProgressBar) findViewById(R.id.powerProgressBar));
                     pb.setMax(100);
-                    pb.setProgress((int)powerPc);
+                    pb.setProgress((int) powerPc);
                     int colour = Color.BLUE;
-                    if (powerPc>75) colour = Color.YELLOW;
-                    if (powerPc>100) colour = Color.RED;
+                    if (powerPc > 75) colour = Color.YELLOW;
+                    if (powerPc > 100) colour = Color.RED;
                     pb.getProgressDrawable().setColorFilter(colour, PorterDuff.Mode.SRC_IN);
 
-                    pb =   ((ProgressBar)findViewById(R.id.spectrumProgressBar));
+                    pb = ((ProgressBar) findViewById(R.id.spectrumProgressBar));
                     pb.setMax(100);
-                    pb.setProgress((int)specPc);
+                    pb.setProgress((int) specPc);
                     colour = Color.BLUE;
-                    if (specPc>75) colour = Color.YELLOW;
-                    if (specPc>100) colour = Color.RED;
+                    if (specPc > 75) colour = Color.YELLOW;
+                    if (specPc > 100) colour = Color.RED;
                     pb.getProgressDrawable().setColorFilter(colour, PorterDuff.Mode.SRC_IN);
                 } else {
                     tv = (TextView) findViewById(R.id.alarmTv);
@@ -419,20 +418,21 @@ public class MainActivity extends Activity {
             // Deal with Cancel Audible button
             Button cancelAudibleButton =
                     (Button) findViewById(R.id.cancelAudibleButton);
-            if (mConnection.mSdServer.isAudibleCancelled()) {
-                cancelAudibleButton.setText("Audible Alarms Cancelled "
-                        + "for "
-                        + mConnection.mSdServer.
-                        cancelAudibleTimeRemaining()
-                        + " sec."
-                        + " Press to re-enable");
-            } else {
-                if (mConnection.mSdServer.mAudibleAlarm) {
-                    cancelAudibleButton.setText("Cancel Audible Alarms (temporarily)");
+            if (mConnection.mBound)
+                if (mConnection.mSdServer.isAudibleCancelled()) {
+                    cancelAudibleButton.setText("Audible Alarms Cancelled "
+                            + "for "
+                            + mConnection.mSdServer.
+                            cancelAudibleTimeRemaining()
+                            + " sec."
+                            + " Press to re-enable");
                 } else {
-                    cancelAudibleButton.setText("Audible Alarms OFF");
+                    if (mConnection.mSdServer.mAudibleAlarm) {
+                        cancelAudibleButton.setText("Cancel Audible Alarms (temporarily)");
+                    } else {
+                        cancelAudibleButton.setText("Audible Alarms OFF");
+                    }
                 }
-            }
 
             ////////////////////////////////////////////////////////////
             // Produce graph
@@ -479,14 +479,13 @@ public class MainActivity extends Activity {
     }
 
 
-
     private void showAbout() {
         View aboutView = getLayoutInflater().inflate(R.layout.about_layout, null, false);
         String versionName = mUtil.getAppVersionName();
         Log.v(TAG, "showAbout() - version name = " + versionName);
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
         builder.setIcon(R.drawable.icon_24x24);
-        builder.setTitle("OpenSeizureDetector V"+versionName);
+        builder.setTitle("OpenSeizureDetector V" + versionName);
         builder.setView(aboutView);
         builder.create();
         builder.show();