Merge branch 'two-apps' into 'master'

Fix BLE callback issues

See merge request card10/companion-app-android!25

app/src/main/java/de/ccc/events/badge/card10/common/ConnectionService.kt

@@ -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

@@ -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