mirror of
https://github.com/adolfintel/OpenPods.git
synced 2026-09-14 14:56:11 -04:00
move unregisterReceivers to methods
This commit is contained in:
@@ -135,14 +135,7 @@ public class PodsService extends Service {
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R)
|
||||
startForeground(101, createBackgroundNotification());
|
||||
|
||||
try {
|
||||
if (btReceiver != null) {
|
||||
unregisterReceiver(btReceiver);
|
||||
btReceiver = null;
|
||||
}
|
||||
} catch (Throwable t) {
|
||||
Logger.error(t);
|
||||
}
|
||||
unregisterBtReceiver();
|
||||
|
||||
btReceiver = new BluetoothReceiver() {
|
||||
@Override
|
||||
@@ -215,14 +208,7 @@ public class PodsService extends Service {
|
||||
startAirPodsScanner(); // If BT is already on when the app is started, start the scanner without waiting for an event to happen
|
||||
|
||||
// Screen on/off listener to suspend scanning when the screen is off, to save battery
|
||||
try {
|
||||
if (screenReceiver != null) {
|
||||
unregisterReceiver(screenReceiver);
|
||||
screenReceiver = null;
|
||||
}
|
||||
} catch (Throwable t) {
|
||||
Logger.error(t);
|
||||
}
|
||||
unregisterScreenReceiver();
|
||||
|
||||
if (isSavingBattery(getApplicationContext())) {
|
||||
screenReceiver = new ScreenReceiver() {
|
||||
@@ -267,24 +253,8 @@ public class PodsService extends Service {
|
||||
@Override
|
||||
public void onDestroy () {
|
||||
super.onDestroy();
|
||||
|
||||
try {
|
||||
if (btReceiver != null) {
|
||||
unregisterReceiver(btReceiver);
|
||||
btReceiver = null;
|
||||
}
|
||||
} catch (Throwable t) {
|
||||
Logger.error(t);
|
||||
}
|
||||
|
||||
try {
|
||||
if (screenReceiver != null) {
|
||||
unregisterReceiver(screenReceiver);
|
||||
screenReceiver = null;
|
||||
}
|
||||
} catch (Throwable t) {
|
||||
Logger.error(t);
|
||||
}
|
||||
unregisterBtReceiver();
|
||||
unregisterScreenReceiver();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -334,4 +304,26 @@ public class PodsService extends Service {
|
||||
return builder.build();
|
||||
}
|
||||
|
||||
private void unregisterBtReceiver () {
|
||||
try {
|
||||
if (btReceiver != null) {
|
||||
unregisterReceiver(btReceiver);
|
||||
btReceiver = null;
|
||||
}
|
||||
} catch (Throwable t) {
|
||||
Logger.error(t);
|
||||
}
|
||||
}
|
||||
|
||||
private void unregisterScreenReceiver () {
|
||||
try {
|
||||
if (screenReceiver != null) {
|
||||
unregisterReceiver(screenReceiver);
|
||||
screenReceiver = null;
|
||||
}
|
||||
} catch (Throwable t) {
|
||||
Logger.error(t);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user