Commit 4e599107 authored by Craig Earley's avatar Craig Earley
Browse files

updates default database host and fixes a Lint warning

parent 9a3c58aa
......@@ -154,7 +154,7 @@ public class SensorSampleActivity extends AppCompatActivity {
registerReceiver(sampleServiceReceiver, makeSensorUpdateFilter());
sensor = getIntent().getStringExtra(WHICH_SENSOR);
if (sensor.equals("bluetooth")) {
if (Objects.requireNonNull(sensor).equals("bluetooth")) {
bluetoothSensor = getIntent().getParcelableExtra(DEVICE);
streamButton.setImageDrawable(res.getDrawable(R.drawable.stream_unavailable, null));
sampleButton.setImageDrawable(res.getDrawable(R.drawable.sample_unavailable, null));
......
......@@ -77,7 +77,7 @@
<!-- My Documents strings -->
<string name="fileHost">URL of server where the files are hosted.</string>
<string name="pathOfDir">Path of directory where files are located.</string>
<string name="default_ip">hopper.cluster.earlham.edu</string>
<string name="default_ip">bowie.cs.earlham.edu</string>
<string name="default_database_name">field_science</string>
<string name="default_username">fieldsci</string>
<string name="stop">Stop</string>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment