gudbjartur22/clinx02-androidpebble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed MainActivity crash on startup when not bound to server.

Browse Source
This commit is contained in:
Graham Jones
2015-12-09 20:46:46 +00:00
parent fe7cd37896
commit a5af07b4cf
1 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/uk/org/openseizuredetector/MainActivity.java
View File

@@ -291,7 +291,6 @@ public class MainActivity extends Activity {
} }
/* /*
* updateServerStatus - called by the uiTimer timer periodically. * updateServerStatus - called by the uiTimer timer periodically.
* requests the ui to be updated by calling serverStatusRunnable. * requests the ui to be updated by calling serverStatusRunnable.
@@ -419,6 +418,7 @@ public class MainActivity extends Activity {
// Deal with Cancel Audible button // Deal with Cancel Audible button
Button cancelAudibleButton = Button cancelAudibleButton =
(Button) findViewById(R.id.cancelAudibleButton); (Button) findViewById(R.id.cancelAudibleButton);
if (mConnection.mBound)
if (mConnection.mSdServer.isAudibleCancelled()) { if (mConnection.mSdServer.isAudibleCancelled()) {
cancelAudibleButton.setText("Audible Alarms Cancelled " cancelAudibleButton.setText("Audible Alarms Cancelled "
+ "for " + "for "
@@ -479,7 +479,6 @@ public class MainActivity extends Activity {
} }
private void showAbout() { private void showAbout() {
View aboutView = getLayoutInflater().inflate(R.layout.about_layout, null, false); View aboutView = getLayoutInflater().inflate(R.layout.about_layout, null, false);
String versionName = mUtil.getAppVersionName(); String versionName = mUtil.getAppVersionName();