mirror-AU-COVIDSafe/mobile-android
1
0
Fork 0
mirror of https://github.com/AU-COVIDSafe/mobile-android.git synced 2025-01-18 16:56:34 +00:00
Code Issues Projects Releases Wiki Activity

Include final pull request for release 2.0. (#39)

Browse source
This commit is contained in:
COVIDSafe Support 2020-12-21 12:19:00 +11:00 committed by GitHub
parent 26ca20fc3d
commit 47d4b1e2e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/debug/java/au/gov/health/covidsafe/PeekActivity.kt
View file

@ -167,9 +167,8 @@ class PeekActivity : AppCompatActivity() {
return timePeriod return timePeriod
} }
private fun startService() { private fun startService() {
Utils.startBluetoothMonitoringService(this) // Utils.startBluetoothMonitoringService(this)
} }
private fun stopService() { private fun stopService() {

2
app/src/main/java/au/gov/health/covidsafe/receivers/UpgradeReceiver.kt
View file

@ -14,7 +14,7 @@ class UpgradeReceiver : BroadcastReceiver() {
if (Intent.ACTION_MY_PACKAGE_REPLACED != intent!!.action) return if (Intent.ACTION_MY_PACKAGE_REPLACED != intent!!.action) return
context?.let { context?.let {
CentralLog.i("UpgradeReceiver", "Starting service from upgrade receiver") CentralLog.i("UpgradeReceiver", "Starting service from upgrade receiver")
Utils.startBluetoothMonitoringService(context) // Utils.startBluetoothMonitoringService(context)
} }
} catch (e: Exception) { } catch (e: Exception) {
CentralLog.e("UpgradeReceiver", "Unable to handle upgrade: ${e.localizedMessage}") CentralLog.e("UpgradeReceiver", "Unable to handle upgrade: ${e.localizedMessage}")

5
app/src/main/java/au/gov/health/covidsafe/services/BluetoothMonitoringService.kt
View file

@ -98,7 +98,7 @@ class BluetoothMonitoringService : LifecycleService(), CoroutineScope, SensorDel
Utils.cancelBMUpdateCheck(this.applicationContext) Utils.cancelBMUpdateCheck(this.applicationContext)
Utils.cancelNextScan(this.applicationContext) Utils.cancelNextScan(this.applicationContext)
Utils.cancelNextAdvertise(this.applicationContext) Utils.cancelNextAdvertise(this.applicationContext)
sensor?.stop() // sensor?.stop()
} }
private fun setupNotifications() { private fun setupNotifications() {
@ -332,6 +332,7 @@ class BluetoothMonitoringService : LifecycleService(), CoroutineScope, SensorDel
job.cancel() job.cancel()
CentralLog.i(TAG, "BluetoothMonitoringService destroyed") CentralLog.i(TAG, "BluetoothMonitoringService destroyed")
sensor?.stop()
} }
private fun showForegroundNotification() { private fun showForegroundNotification() {
@ -458,7 +459,7 @@ class BluetoothMonitoringService : LifecycleService(), CoroutineScope, SensorDel
} }
BluetoothAdapter.STATE_ON -> { BluetoothAdapter.STATE_ON -> {
CentralLog.d(TAG, "BluetoothAdapter.STATE_ON") CentralLog.d(TAG, "BluetoothAdapter.STATE_ON")
Utils.startBluetoothMonitoringService(this@BluetoothMonitoringService.applicationContext) // Utils.startBluetoothMonitoringService(this@BluetoothMonitoringService.applicationContext)
showForegroundNotification() showForegroundNotification()
} }
} }