Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Andy B-S
Companion App Android
Commits
4b2776d9
Commit
4b2776d9
authored
Aug 23, 2019
by
Anon
Browse files
Merge branch 'two-apps' into 'master'
Fix BLE callback issues See merge request
card10/companion-app-android!25
parents
68bdd85e
2995ccdf
Changes
2
Hide whitespace changes
Inline
Side-by-side
app/src/main/java/de/ccc/events/badge/card10/common/ConnectionService.kt
View file @
4b2776d9
...
...
@@ -63,6 +63,11 @@ object ConnectionService {
}
fun
connect
(
context
:
Context
)
{
if
(
isConnected
())
{
gattListeners
.
values
.
map
{
it
.
onConnectionReady
()
}
return
}
// Use first BLE devices that is bonded
val
bondedDevices
=
BluetoothAdapter
.
getDefaultAdapter
().
bondedDevices
.
filter
{
it
.
address
.
startsWith
(
...
...
app/src/main/java/de/ccc/events/badge/card10/main/MainFragment.kt
View file @
4b2776d9
...
...
@@ -80,6 +80,11 @@ class MainFragment : Fragment(), GattListener {
private
fun
showConnectedView
()
{
// The callback can happen when our UI is not visible
if
(
container_connected
==
null
)
{
return
}
activity
?.
runOnUiThread
{
container_connected
.
visibility
=
View
.
VISIBLE
container_disconnected
.
visibility
=
View
.
GONE
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment