diff options
author | Trygve Laugstøl <trygvis@inamo.no> | 2015-01-18 12:52:17 +0100 |
---|---|---|
committer | Trygve Laugstøl <trygvis@inamo.no> | 2015-01-18 12:52:17 +0100 |
commit | fe238450f161a503d61c5ae59ecdd82c60c0e9ec (patch) | |
tree | 075ac1aa9b90d6895505d203a806d262bc41f273 /app/src/main/java/io/trygvis/soilmoisture/MainActivity.java | |
parent | f3288422d8dec949fcad33a84e413d8aa45f4500 (diff) | |
download | io.trygvis.soilmoisture-android-1.0.tar.gz io.trygvis.soilmoisture-android-1.0.tar.bz2 io.trygvis.soilmoisture-android-1.0.tar.xz io.trygvis.soilmoisture-android-1.0.zip |
BtPromise: Adding a distinction between successful and failure.1.0
o Chain can now call fail() instead of stop() to signal failure.
o The finally handlers can be changed to get this info later.
o Should probably make all callbacks take the BtDevice as a callback instead of BluetoothGatt and make the gatt instance available through the device. This way state can be kept in the device's tag.
BtPromise: always discover services when operating inside a connection.
Diffstat (limited to 'app/src/main/java/io/trygvis/soilmoisture/MainActivity.java')
-rw-r--r-- | app/src/main/java/io/trygvis/soilmoisture/MainActivity.java | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/app/src/main/java/io/trygvis/soilmoisture/MainActivity.java b/app/src/main/java/io/trygvis/soilmoisture/MainActivity.java index e9ecae2..c6293c6 100644 --- a/app/src/main/java/io/trygvis/soilmoisture/MainActivity.java +++ b/app/src/main/java/io/trygvis/soilmoisture/MainActivity.java @@ -219,12 +219,6 @@ public class MainActivity extends ListActivity { public static class BtDeviceDialogFragment extends DialogFragment { private MainActivity mainActivity; -// private final BtDevice<SmDevice> device; -// -// public BtDeviceDialogFragment(MainActivity mainActivity, BtDevice<SmDevice> device) { -// this.mainActivity = mainActivity; -// this.device = device; -// } @Override public Dialog onCreateDialog(Bundle savedInstanceState) { @@ -472,7 +466,7 @@ public class MainActivity extends ListActivity { @Override public View getView(int position, View view, ViewGroup viewGroup) { - Log.i(TAG, "getView, position=" + position + ", view=" + view); +// Log.i(TAG, "getView, position=" + position + ", view=" + view); Object o = current.get(position); if (o instanceof BtDevice) { @@ -491,8 +485,6 @@ public class MainActivity extends ListActivity { if (view == null) { view = inflater.inflate(R.layout.fragment_device, null); view.setTag(new DeviceItem(view)); - view.setClickable(false); - view.setLongClickable(true); view.setOnLongClickListener(v -> MainActivity.this.onBtDeviceLongClick(device)); } @@ -584,11 +576,7 @@ public class MainActivity extends ListActivity { text += ", value: " + (value == null ? "Unknown" : value); item.description.setText(text); - if (value != null) { - item.sensorProgress.setProgress(value); - } else { - item.sensorProgress.setIndeterminate(true); - } + item.sensorProgress.setProgress(value != null ? value : 0); return view; } |