Commit Graph

416 Commits

Author SHA1 Message Date
cpfeiffer 03fa05756e As a test, draw limit lines for sleep/activity changes.
Unfortunately it looks like the labels for it don't get rendered ;-(
2015-06-18 23:41:54 +02:00
cpfeiffer 83079b0456 Stub for device notification changes 2015-06-18 23:07:22 +02:00
Daniele Gobbetti cb3be26349 Do something when we receive a CharacteristicChanged message
on the UUID_CHARACTERISTIC_BATTERY characteristic.

This is a first try at addressing #71

Please note that this will probably not work at this point, but it's
worth a try. To make it work probably we have to tell the device to
send updates, and we don't know how to do it.
2015-06-18 22:17:41 +02:00
Andreas Shimokawa ea43d76705 Bump version, update CHANGELOG.md and LICENSE.artwork
not yet ready for release
2015-06-18 21:51:06 +02:00
Andreas Shimokawa 1801a679c5 Pebble: fix FW 3.x detection 2015-06-18 18:39:32 +02:00
rober c1769fb4b4 revamp icons 2015-06-17 23:44:53 +02:00
Andreas Shimokawa bffd7f332f remove SleepChartActivityOld, as the new one is usable now ;) 2015-06-17 08:18:24 +02:00
cpfeiffer a5ae7acc63 Improved sleep chart #45
- use just one data set, because multiple data sets is not supported
  by MPAndroidChart (the way we need it)

Now there is hardly any space between the bars anymore

Also:
- allow scaling x and y axis independently via pinch gesture
- set fixed y max value (1.0) so that the display is stable and
  independent of the actual available data
- (at least temporarily) display y labels
2015-06-17 07:03:50 +02:00
cpfeiffer 8709b95a95 Use a single data set instead of one per activity kind
The reason is that multiple data sets will always be grouped.
If we add null values to fix the grouping issue, we will still have
space between the bars.
2015-06-17 07:03:50 +02:00
Andreas Shimokawa a07aed62ad Pebble: Experiment with 3.x compatible notifications
This will most probably not work, but please test if you can ;)
2015-06-16 23:15:51 +02:00
Andreas Shimokawa 70c021e92c SleepChartActivity: Make light sleep color brighter 2015-06-13 20:47:36 +02:00
Andreas Shimokawa 73187431b2 Use old Sleep Monitor Activity for Pebble/Morpheuz
The new one does not look good with Morpheuz data yet (samples every 10 minutes)
2015-06-13 20:37:53 +02:00
Andreas Shimokawa d2f7169de4 Really, I see no reason to look up a string for a preference key in an xml file
If we have to use a key to lookup the string for the key, we can just use that key as the preference key.
2015-06-13 01:12:08 +02:00
Andreas Shimokawa cfedf4acde Put log file option in a development option category, change order in Mi Band preference screen. 2015-06-13 00:58:23 +02:00
Andreas Shimokawa 3a6e8789c1 Update German translation
Also remove a string that was not supposed to be translated.
It is a preference key. Maybe it should not be in strings.xml but in its own file.
2015-06-13 00:54:43 +02:00
Andreas Shimokawa 56d314d054 Reformat code and optimize imports 2015-06-13 00:32:48 +02:00
Andreas Shimokawa ad4f708140 Send 2.x style notifications when on FW 3.x (on FW 2.x else use 1.x style notifications)
This could improve #24. Unfortunally I cannot test it since I have no Pebble Time.
2015-06-13 00:26:55 +02:00
Daniele Gobbetti ac7e21be48 Remove the activity log debug file.
This partially reverts commit 8b268a676c
2015-06-12 22:30:14 +02:00
Daniele Gobbetti 376f9c53a0 Fix crash on startup
Fixed a typo that was causing a force close on database creation.
2015-06-12 21:26:11 +02:00
Daniele Gobbetti 75de3b21e1 Use colors that are easier on the eyes
Changed the colors of the Deep-/Light Sleep and Activity datasets.
* Deep sleep has been used as basic color,
* Light sleep is a color that is monochromatically analogous
* Activity is a color triadic to the basic one
2015-06-12 11:17:44 +02:00
cpfeiffer 8aef92026c A new sleep chart based on MPAndroidChart 45
- supports zooming an panning
- displays labels for all x-values (= time of day)
- fix deep vs. light sleep constants
- increase activity data buffer size for Mi Band
2015-06-11 23:37:00 +02:00
Andreas Shimokawa 9051e10aad switch constants for deep sleep and light sleep to match native miband data 2015-06-11 23:00:59 +02:00
Andreas Shimokawa 0fa87b9eed update CHANGELOG.md and bump version to 0.4.0
Planned release is Sunday 14. June
2015-06-11 21:12:25 +02:00
Andreas Shimokawa dfcad94c2c Pebble: Make firmware installation possible from recovery (Closes #54)
Also make HW revision displayable for Pebble Time.
2015-06-11 20:40:31 +02:00
cpfeiffer d0b9914770 Keep the db open while adding samples 2015-06-09 21:05:44 +02:00
cpfeiffer e78e79a9a9 Added missing returns.. 2015-06-08 23:31:12 +02:00
Andreas Shimokawa efac912929 Pebble: Fix error when reinstalling apps, useful for upgrading/downgrading
Fixes #65
2015-06-08 22:38:58 +02:00
Andreas Shimokawa 4f8a7ea64d Misuse device_candidate_item insead of device_item for AppManager 2015-06-07 22:02:40 +02:00
Andreas Shimokawa c98716d469 Morpheuz support: Fix 3.1 compatibility 2015-06-07 21:49:05 +02:00
Andreas Shimokawa 042963f2e2 Escape ' in Turkish translation to fix build 2015-06-07 21:31:47 +02:00
Carsten Pfeiffer 1c8173c218 Merge pull request #64 from mtsekm/master
Add Turkish translation
2015-06-07 20:59:00 +02:00
cpfeiffer 3d49426a4c updated translations from transifex 2015-06-07 20:58:04 +02:00
Tarik Sekmen 56a0935d62 Add Turkish translation 2015-06-07 17:32:47 +03:00
cpfeiffer ba76f64bf6 Disable context menu while busy and add "Disconnect" to context menu 2015-06-07 15:31:42 +02:00
cpfeiffer dc8d1e961d Fix position of progress bar 2015-06-07 00:05:36 +02:00
cpfeiffer ab97b544f0 Some cleanup + actually remember event time and kind for throttling 2015-06-06 23:59:53 +02:00
cpfeiffer f5a569610f Wrap DeviceSupport instances.
The wrapper provides support for busy-checking and throttling
(sometimes I get multiple events of the same kind within milli seconds
and the Mi Band vibrates 20 times)
2015-06-06 23:54:34 +02:00
cpfeiffer f6d5767276 Remove reference to PebbleIOThread from BluetoothCommunicationService
Let PebbleSupport do this instead.
2015-06-06 23:24:00 +02:00
cpfeiffer 3fe9195d0d Avoid warning in unsetDynamicState() 2015-06-06 23:13:26 +02:00
cpfeiffer 020d8d74d6 Added "Fetch Activity Data" to the context menu.
With some kind of progress reporting during the fetching #45
2015-06-06 19:39:04 +02:00
cpfeiffer 9e4e50be47 Initial work on synchronizing activity data with feedback.
A device now has a busy flag (set during synchronization). While busy,
no other communication with the device shall occur (TODO)

Refactors the non-bluetooth actions a bit  #45

Next step: make use of the busy state in ControlCenter (show
a busy cursor) and in BluetoothCommunicationService (to not call other
operations while busy)
2015-06-06 00:40:16 +02:00
cpfeiffer 2f0d00d645 avoid WITHOUT ROWID when not running at least lollipop #62 2015-06-06 00:10:38 +02:00
cpfeiffer 1e89b12b15 Avoid creating lots of SimpleDateFormat instances 2015-06-05 23:09:28 +02:00
cpfeiffer dea4ee82a1 Merge branch 'db_refactoring_proposal' 2015-06-05 21:57:55 +02:00
cpfeiffer c4096e6d3c Add daniele's db optimization the WITHOUT ROWID
closes #62
2015-06-05 21:46:56 +02:00
Andreas Shimokawa b12a3e74cd MorpheuzSupport: remove limit of 54 samples. Morpheuz 3.1 supports 60 2015-06-05 20:26:11 +02:00
Andreas Shimokawa baecc20742 SleepMonitorActivity: Rotate annotation text for better readability 2015-06-05 19:59:58 +02:00
Andreas Shimokawa 813a02d5c7 Unify SleepMonitor with code from PR #59. Thanks Daniele! 2015-06-05 19:32:09 +02:00
cpfeiffer 2f1908e480 Make sure to always close the database 2015-06-04 23:45:46 +02:00
Daniele Gobbetti fc374881c5 Get rid of the unused ID in the DB, this could help in:
* reducing the used space
* reducing the time needed for inserts
2015-06-04 21:37:48 +02:00
Carsten Pfeiffer 7ad38c5e1a Merge pull request #61 from danielegobbetti/fix_data_in_the_future
Do not iterate over the whole buffer, but only on the effectively use…
2015-06-04 21:15:52 +02:00
Daniele Gobbetti a1ff9aab21 Do not iterate over the whole buffer, but only on the effectively used part.
This should fix the "data in the future" issue
2015-06-04 18:56:35 +02:00
Andreas Shimokawa 7d86396e30 Support CM 12.1 Music App 2015-06-02 21:48:21 +02:00
Daniele Gobbetti 406f9ab90d Do not allocate the buffer if there's no data available.
Perhaps could fix the "data in the future" issue
2015-06-02 18:33:12 +02:00
Daniele Gobbetti 9e2d32c33f Fixed timestamp conversion for DB, added local variables to make the code clearer 2015-06-01 22:20:28 +02:00
Daniele Gobbetti ea97a902d1 *unchecked* Storing activity values in the DB. 2015-06-01 22:20:28 +02:00
Daniele Gobbetti 8b268a676c Refactoring of the data ingestion method.
* no more ByteBuffer, but a fixed size byte array that gets flushed everytime it's needed
* log of activity data to a separate file (no DB integration yet)
* the size of the buffer must be a multiple of 3 (1 minute of data = 3 bytes) and 20 (the normal size of the chunks we get from the device)
* better logging and more comments in code
2015-06-01 22:20:22 +02:00
cpfeiffer 5d950dc407 Fix reconnection after connection loss
Well, obviously we must not ignore connection state changes even if they
come with an error code.

Unfortunately the API docs are a bit terse in that respect.
2015-06-01 21:47:02 +02:00
cpfeiffer 7f89f4bb57 Some fixes regarding device initialization, should avoid disconnects
Avoid repeated initializations and device info requests. Fix unsetting
of dynamic state (e.g. battery info) when initialized.
2015-06-01 21:47:02 +02:00
Daniele Gobbetti f60903699e Delete MiBandSupport.java.orig
I believe it was committed by mistake (perhaps a merge conflict?) It's out of date in any case.
2015-06-01 21:47:02 +02:00
cpfeiffer 11884d8073 Improve logging 2015-06-01 21:47:02 +02:00
cpfeiffer 75b9fe4c4d ignore connection state changes with status != GATT_SUCCESS
And add logging. Maybe this helps with #57
2015-06-01 21:47:02 +02:00
Daniele Gobbetti 228e922ce7 forgotten refactor of a variable 2015-06-01 21:47:01 +02:00
Daniele Gobbetti e4076dc725 Ingesting the activity data the right way, but they are still being thrown away afterwards. 2015-06-01 21:47:01 +02:00
cpfeiffer 92caed5af4 Some cleanup 2015-06-01 21:47:01 +02:00
cpfeiffer a7792f6b72 improve some log statements 2015-06-01 21:47:01 +02:00
cpfeiffer 637b43e892 Also wait for descriptor reads and writes
(not just characteristic reads/writes)

This fixes initialization of notification characteristics
(activity, sensor data, battery, ...)
2015-06-01 21:47:01 +02:00
cpfeiffer f004b7b11c WIP for fetching activity data
This probably affects #44 and #45

Thanks go to Daniele Gobbetti <daniele@gobbetti.name>!
2015-06-01 21:47:01 +02:00
Andreas Shimokawa 6ea9537d38 Start sleep activity with context menu (long press on a device)
This allows to see sleep data even if devices are not connected.
2015-06-01 16:57:45 +02:00
Andreas Shimokawa 81b1d1d28d Pebble: Put WeatherNeat test in separate file 2015-05-30 22:24:53 +02:00
Andreas Shimokawa 603d31a59e add some constants to GBActivitySample 2015-05-30 21:52:29 +02:00
Andreas Shimokawa 41207516b1 Move BluetoothChangeReceiver to externalevents 2015-05-30 21:40:42 +02:00
Andreas Shimokawa 900b3f3833 use ORDER BY timestamp in SQL statement
Also optimize imports...
2015-05-30 17:40:23 +02:00
Andreas Shimokawa e79f4523c3 Add SQLite database support for activity data
This is now used for morpheuz data and the SleepMonitorActivity
2015-05-30 17:28:03 +02:00
Andreas Shimokawa 08fbbb9152 SleepMonitor: draw colored bars instead of a graph
red = awake
yellow = light sleep
greep = deep sleep
2015-05-27 00:59:05 +02:00
Andreas Shimokawa 8366af736c Pebble: Fix firmware installation when all 8 app slots are in use
We were trying to get a free slot when installing a firmware which is not neccessary.
This should also fix firmware installation in recovery (#54)
2015-05-25 01:26:27 +02:00
Carsten Pfeiffer 6fb6b5c164 Merge pull request #55 from danielegobbetti/master
Use constants instead of hardcoded values
2015-05-24 23:16:52 +02:00
cpfeiffer 8a26ce9d67 Pull evaluateGBDeviceCommand() and handle* methods up
Otherwise, MiSupport can't use 'em
2015-05-23 00:54:14 +02:00
cpfeiffer 4518e8819d Make file-logging configurable 2015-05-23 00:45:12 +02:00
cpfeiffer c469248de1 Updated from transifex (thanks!) 2015-05-22 23:21:37 +02:00
cpfeiffer 880dc7b3a4 Improve BLE gatt handling
- close() the gatt instance when explicitly disconnecting
- create a new gatt instance when explicitly connecting

Unfortunately I still appear to get spontaneous disconnects after some
notifications.
2015-05-22 23:18:29 +02:00
Andreas Shimokawa f54927624b Move non Pebble specific code from PebbleIoThread to AbstractBTDeviceSupport 2015-05-22 20:20:33 +02:00
Andreas Shimokawa 8309234784 Pebble: fix wrong calculation of timestamp. 2015-05-21 18:57:34 +02:00
Daniele Gobbetti 7e2545f9b4 Use constants instead of hardcoded values 2015-05-21 18:19:07 +02:00
Andreas Shimokawa 68b76aa5c5 Pebble: Get Morpheuz sleep data visualize through SleepMonitorActivity
This very very experimental, and needs a complete overhaul.
But it is a start ;)
2015-05-21 18:17:39 +02:00
Andreas Shimokawa 1c5d6de3ad Pebble: fix App installation 2015-05-18 23:14:32 +02:00
Andreas Shimokawa 50c7206cf6 Pebble: implement reboot 2015-05-18 22:40:39 +02:00
Andreas Shimokawa c4f7fc1531 Start App on Pebble when tapping it AppManager 2015-05-18 22:20:01 +02:00
Andreas Shimokawa c37cacf43d Remove id and index from GBDeviceApp in favor of UUIDs 2015-05-18 20:56:19 +02:00
cpfeiffer 6fa2017dda Logging: Compress package names and rotate log files 2015-05-17 23:37:28 +02:00
cpfeiffer e3c42ace2d Updated translations from transifex (thanks!) 2015-05-17 23:01:47 +02:00
cpfeiffer d1d3e758d9 Support configurable notifications. Closes #53
To close #29, we need to have a bit more configuration options than
just the number of vibrations. E.g.
- duration
- pause
- LED flashing (again, number of flashes, duration and pause, but also
  the colour and maybe which LEDs)

Also implements reboot-functionality for Mi Band.
2015-05-17 22:57:37 +02:00
cpfeiffer 4be50b3a82 Fix typo 2015-05-17 22:57:26 +02:00
cpfeiffer 301c7622ef Is in assets/ now, was not supposed to be committed here 2015-05-17 21:59:13 +02:00
cpfeiffer 14a05c3383 Initial support for rebooting the device
(via the Debug activity)
Attention: no safety-confirmation dialog yet!
2015-05-17 21:58:08 +02:00
cpfeiffer 9819819b92 Create the wait-latch before running the action, and only if neeeded
Otherwise the result handler might be called before the wait-latch
has been created, leading to a deadlock of the thread.

Also: only wait for read- and write actions, but not for wait-actions.
2015-05-17 21:55:02 +02:00
Andreas Shimokawa 55400817b4 Pebble: experiment with extensible notifications
This allows lot more flexible notifications including custom actions (replys, etc)

When used without actions it could serve as a simple replacement for the current notifications.
The main showstopper is that I do not know how to assign icons (mail, chat) to these.
Unfortunately I ended up in recovery when playing around with unknown parameters trial&error style.
2015-05-15 21:34:38 +02:00
Andreas Shimokawa 2b98620ee0 Mi Band: Prepare preferences for vibration count, use number as input type for numeric field 2015-05-14 13:04:21 +02:00
cpfeiffer 562840a7c5 Actually call the new generic notification handler 2015-05-14 00:04:54 +02:00
Andreas Shimokawa 80eb386dd8 fix DebugActivity, was broken since we translated it :/ 2015-05-13 23:21:49 +02:00
cpfeiffer d2bcccaeef Use logback-android for logging to external storage
(no WRITE_EXTERNAL_STORAGE permission necessary!)
2015-05-13 23:15:20 +02:00
cpfeiffer 27d725853f Add extra handler for generic notifications
(instead of misusing onSMS handler). Pebble still does that,
but not everybody has to.

Small step for #53
2015-05-13 21:55:22 +02:00
Andreas Shimokawa c81e28c030 simplify code 2015-05-12 20:32:34 +02:00
Andreas Shimokawa 1b2f20160a fix some lint warnings, mostly simplifications 2015-05-12 20:09:35 +02:00
Andreas Shimokawa f8341918ee compile fix 2015-05-12 11:12:53 +02:00
Andreas Shimokawa 7540a3955b Pebble: experiment with launching watchapps from Gadgetbridge 2015-05-12 11:06:22 +02:00
cpfeiffer 68383b6c05 Updated translations from transifex (thanks!) 2015-05-12 06:34:44 +02:00
cpfeiffer 9a26769c3e Search & replace: use slf4j for logging instead of Logcat directly
For a start, use android-logger as backend. Needs a better configuration
but no time right now.

For file-logging we will use logback as slf4j-implementation.
2015-05-12 06:33:37 +02:00
Andreas Shimokawa 6fab01a3c2 Pebble: experimenting with more generic application message encoding 2015-05-11 23:30:38 +02:00
cpfeiffer 87512149a5 This should fix pebble-pairing on bt+btle devices #33 2015-05-11 00:50:18 +02:00
cpfeiffer 9195652f11 Reformatted from transifex 2015-05-10 23:59:00 +02:00
cpfeiffer 84d1e95767 Fix removal of async runnable to stop pairing after 60s (#3) 2015-05-10 23:14:32 +02:00
cpfeiffer b25da80656 Stop discovery when attempting to pair #33 2015-05-10 21:35:31 +02:00
cpfeiffer 095ada8e5d Attempt to improve Pebble bonding when bonding fails #33 2015-05-10 21:32:41 +02:00
cpfeiffer be52724fdd Also commit leftover 2015-05-10 21:19:24 +02:00
cpfeiffer c89bba0cba Remove explicit "Refresh" device list action 2015-05-10 21:19:07 +02:00
cpfeiffer 61e8d88de4 Rename constant 2015-05-10 21:13:05 +02:00
cpfeiffer bd2d5fd608 Ensure that device list is refreshed when changing MAC address
(the set-summary preference change listener overwrote our own
listener)
2015-05-10 21:12:10 +02:00
Andreas Shimokawa 2b84ffdc1a update Russian translation 2015-05-10 19:07:48 +02:00
Andreas Shimokawa b1cb5f3f21 update CHANGELOG, README and bump version to 0.3.5
We might delay the release a bit due to missing translations.
2015-05-10 17:09:57 +02:00
Andreas Shimokawa c8feea9f37 Refreshing device list when paired devices change now works.
I was using LocalBroadcastManager.... :/
2015-05-10 17:05:24 +02:00
Andreas Shimokawa 0d77a5ac05 Try to refresh device list if BluetoothDevice.ACTION_BOND_STATE_CHANGED is received.
On my Android 4.4 device, this does not work however (no Intents arrive)
2015-05-10 16:56:09 +02:00
Andreas Shimokawa f101926186 Pebble: No pairing activity, just call createBond() and finish discovery activity 2015-05-10 16:27:31 +02:00
Andreas Shimokawa a70426d84d Display found Pebbles in DiscoveryActivity 2015-05-10 15:52:19 +02:00
Andreas Shimokawa 1443c8088c Change default for Pebble Notification Intents back to "when screen off"
Conversations accepted our PR, so we will continue to get these intents.
The option cann still turned off, in that case Conversations' notifications are
picked up by our generic notification support.
2015-05-10 15:07:28 +02:00
Andreas Shimokawa 22daa507ce readd Italian string that was removed by accident (or by transifex) 2015-05-10 14:22:44 +02:00
Andreas Shimokawa 7f5b495480 Move Mi Band MAC address setting to Mi Band Settings 2015-05-10 13:08:28 +02:00
Andreas Shimokawa e78c912be3 Only sync time on time/timezone changes if appropriate option is set. 2015-05-10 11:21:16 +02:00
Andreas Shimokawa f9efa36322 Add Russian translation (thanks astra1!) 2015-05-10 10:02:12 +02:00
cpfeiffer fa9bed81ce Updated translations 2015-05-10 00:21:08 +02:00
cpfeiffer 86119a877a Slight refactoring, add some Logging 2015-05-10 00:18:42 +02:00
cpfeiffer 39d84831ed Unset dynamic device state (like battery level, etc.) when disconnected 2015-05-10 00:05:29 +02:00
cpfeiffer 1a7c3c42e4 Do both BT and BTLE discovery (one after another) #33 2015-05-09 23:54:47 +02:00
cpfeiffer 60210e069c Fix validity check with gender and type 2015-05-09 23:13:47 +02:00
cpfeiffer 29cc364f8a Updated translations 2015-05-09 21:47:03 +02:00
cpfeiffer ab5d5f6c6f Made Mi Band preferences localizable 2015-05-09 21:43:04 +02:00
Andreas Shimokawa 8112d4afd8 update stings 2015-05-08 12:56:17 +02:00
Andreas Shimokawa 6f162c593b Pebble message intent notifications default to "never" now
If these get turned on, Conversations notifications will be handled through Pebble message intents and get filtered out from generic notifcation handling.
2015-05-08 12:50:42 +02:00
Andreas Shimokawa c999c52501 convert sequence of ifs to switch 2015-05-08 11:18:06 +02:00
cpfeiffer ddc2f116aa Updated German translation 2015-05-08 00:48:51 +02:00
cpfeiffer d036f0539d Added missing resource strings and clean up layouts 2015-05-08 00:42:46 +02:00
cpfeiffer 9801a94704 Revert "Updated translation from transifex"
This reverts commit 45fde87df6.
2015-05-07 23:56:04 +02:00
cpfeiffer 45fde87df6 Updated translation from transifex 2015-05-07 23:54:59 +02:00
cpfeiffer b2518ff927 Discovery + pairing now works
User info is asked on demand before starting the actual pairing.
When no (valid) user info is given, dummy user infor will be  used instead.
2015-05-07 23:52:44 +02:00
Andreas Shimokawa 157deff237 Send current time to device if time/timezone changes. Closes #51. 2015-05-07 23:46:18 +02:00
Andreas Shimokawa 70889e5326 fix italian string, which would cause FC 2015-05-07 22:32:30 +02:00
cpfeiffer 1604ae2c22 #33 only start discovery activity when bt is enabled 2015-05-07 22:15:53 +02:00
cpfeiffer cf360455a0 updated translations from transifex 2015-05-07 22:05:57 +02:00
cpfeiffer 84a89c7c9b ignore values-en, always created by tx pull -a 2015-05-07 20:46:24 +02:00
cpfeiffer a23690c8e1 Initial support for Mi Band specific settings
(User info for now).

TODO: We need to have that information *before* starting a connect
2015-05-07 01:32:17 +02:00