Skip to content

Commit 4081e8a

Browse files
committed
move unregisterReceivers to methods
1 parent a741d7f commit 4081e8a

1 file changed

Lines changed: 26 additions & 34 deletions

File tree

OpenPods/app/src/main/java/com/dosse/airpods/pods/PodsService.java

Lines changed: 26 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -135,14 +135,7 @@ public void onCreate () {
135135
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R)
136136
startForeground(101, createBackgroundNotification());
137137

138-
try {
139-
if (btReceiver != null) {
140-
unregisterReceiver(btReceiver);
141-
btReceiver = null;
142-
}
143-
} catch (Throwable t) {
144-
Logger.error(t);
145-
}
138+
unregisterBtReceiver();
146139

147140
btReceiver = new BluetoothReceiver() {
148141
@Override
@@ -215,14 +208,7 @@ public void onDisconnect () {
215208
startAirPodsScanner(); // If BT is already on when the app is started, start the scanner without waiting for an event to happen
216209

217210
// Screen on/off listener to suspend scanning when the screen is off, to save battery
218-
try {
219-
if (screenReceiver != null) {
220-
unregisterReceiver(screenReceiver);
221-
screenReceiver = null;
222-
}
223-
} catch (Throwable t) {
224-
Logger.error(t);
225-
}
211+
unregisterScreenReceiver();
226212

227213
if (isSavingBattery(getApplicationContext())) {
228214
screenReceiver = new ScreenReceiver() {
@@ -267,24 +253,8 @@ private static boolean checkUUID (BluetoothDevice bluetoothDevice) {
267253
@Override
268254
public void onDestroy () {
269255
super.onDestroy();
270-
271-
try {
272-
if (btReceiver != null) {
273-
unregisterReceiver(btReceiver);
274-
btReceiver = null;
275-
}
276-
} catch (Throwable t) {
277-
Logger.error(t);
278-
}
279-
280-
try {
281-
if (screenReceiver != null) {
282-
unregisterReceiver(screenReceiver);
283-
screenReceiver = null;
284-
}
285-
} catch (Throwable t) {
286-
Logger.error(t);
287-
}
256+
unregisterBtReceiver();
257+
unregisterScreenReceiver();
288258
}
289259

290260
@Override
@@ -334,4 +304,26 @@ private Notification createBackgroundNotification () {
334304
return builder.build();
335305
}
336306

307+
private void unregisterBtReceiver () {
308+
try {
309+
if (btReceiver != null) {
310+
unregisterReceiver(btReceiver);
311+
btReceiver = null;
312+
}
313+
} catch (Throwable t) {
314+
Logger.error(t);
315+
}
316+
}
317+
318+
private void unregisterScreenReceiver () {
319+
try {
320+
if (screenReceiver != null) {
321+
unregisterReceiver(screenReceiver);
322+
screenReceiver = null;
323+
}
324+
} catch (Throwable t) {
325+
Logger.error(t);
326+
}
327+
}
328+
337329
}

0 commit comments

Comments
 (0)