MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-07-22 14:52:25 +02:00
Code Releases Wiki Activity

Adjust service for CalendarReceiver for multidevice (#2765)

Browse Source 
Co-authored-by: vanous <vanous@noreply.codeberg.org>
Co-committed-by: vanous <vanous@noreply.codeberg.org>
This commit is contained in:
vanous 2022-07-20 17:29:40 +02:00 committed by Andreas Shimokawa
parent 2a0b7b64fb
commit f589487588
2 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/CalendarReceiver.java
View File

@ -90,6 +90,10 @@ public class CalendarReceiver extends BroadcastReceiver {
onReceive(GBApplication.getContext(), new Intent()); onReceive(GBApplication.getContext(), new Intent());
} }
public GBDevice getGBDevice(){
return mGBDevice;
}
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
LOG.info("got calendar changed broadcast"); LOG.info("got calendar changed broadcast");

37
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
View File

@ -316,7 +316,7 @@ public class DeviceCommunicationService extends Service implements SharedPrefere
private AutoConnectIntervalReceiver mAutoConnectInvervalReceiver= null; private AutoConnectIntervalReceiver mAutoConnectInvervalReceiver= null;
private AlarmReceiver mAlarmReceiver = null; private AlarmReceiver mAlarmReceiver = null;
private CalendarReceiver mCalendarReceiver = null; private List<CalendarReceiver> mCalendarReceiver = new ArrayList<>();
private CMWeatherReceiver mCMWeatherReceiver = null; private CMWeatherReceiver mCMWeatherReceiver = null;
private LineageOsWeatherReceiver mLineageOsWeatherReceiver = null; private LineageOsWeatherReceiver mLineageOsWeatherReceiver = null;
private TinyWeatherForecastGermanyReceiver mTinyWeatherForecastGermanyReceiver = null; private TinyWeatherForecastGermanyReceiver mTinyWeatherForecastGermanyReceiver = null;
@ -371,6 +371,7 @@ public class DeviceCommunicationService extends Service implements SharedPrefere
private void updateReceiversState(){ private void updateReceiversState(){
boolean enableReceivers = false; boolean enableReceivers = false;
boolean anyDeviceInitialized = false; boolean anyDeviceInitialized = false;
List <GBDevice> devicesWithCalendar = new ArrayList<>();
FeatureSet features = new FeatureSet(); FeatureSet features = new FeatureSet();
@ -386,10 +387,12 @@ public class DeviceCommunicationService extends Service implements SharedPrefere
DeviceCoordinator coordinator = struct.getCoordinator(); DeviceCoordinator coordinator = struct.getCoordinator();
if(coordinator != null){ if(coordinator != null){
features.logicalOr(coordinator); features.logicalOr(coordinator);
if (coordinator.supportsCalendarEvents()){
devicesWithCalendar.add(struct.getDevice());
} }
} }
}
setReceiversEnableState(enableReceivers, anyDeviceInitialized, features); setReceiversEnableState(enableReceivers, anyDeviceInitialized, features, devicesWithCalendar);
} }
@Override @Override
@ -967,8 +970,17 @@ public class DeviceCommunicationService extends Service implements SharedPrefere
return false; return false;
} }
private boolean deviceHasCalendarReceiverRegistered(GBDevice device){
for (CalendarReceiver receiver: mCalendarReceiver){
if(receiver.getGBDevice().equals(device)){
return true;
}
}
return false;
}
private void setReceiversEnableState(boolean enable, boolean initialized, FeatureSet features) {
private void setReceiversEnableState(boolean enable, boolean initialized, FeatureSet features, List <GBDevice> devicesWithCalendar) {
LOG.info("Setting broadcast receivers to: " + enable); LOG.info("Setting broadcast receivers to: " + enable);
if(enable && features == null){ if(enable && features == null){
@ -976,14 +988,17 @@ public class DeviceCommunicationService extends Service implements SharedPrefere
} }
if (enable && initialized && features.supportsCalendarEvents()) { if (enable && initialized && features.supportsCalendarEvents()) {
if (mCalendarReceiver == null) { for (GBDevice deviceWithCalendar : devicesWithCalendar) {
if (!deviceHasCalendarReceiverRegistered(deviceWithCalendar)) {
if (!(GBApplication.isRunningMarshmallowOrLater() && ContextCompat.checkSelfPermission(this, Manifest.permission.READ_CALENDAR) == PackageManager.PERMISSION_DENIED)) { if (!(GBApplication.isRunningMarshmallowOrLater() && ContextCompat.checkSelfPermission(this, Manifest.permission.READ_CALENDAR) == PackageManager.PERMISSION_DENIED)) {
IntentFilter calendarIntentFilter = new IntentFilter(); IntentFilter calendarIntentFilter = new IntentFilter();
calendarIntentFilter.addAction("android.intent.action.PROVIDER_CHANGED"); calendarIntentFilter.addAction("android.intent.action.PROVIDER_CHANGED");
calendarIntentFilter.addDataScheme("content"); calendarIntentFilter.addDataScheme("content");
calendarIntentFilter.addDataAuthority("com.android.calendar", null); calendarIntentFilter.addDataAuthority("com.android.calendar", null);
mCalendarReceiver = new CalendarReceiver(null); CalendarReceiver receiver = new CalendarReceiver(deviceWithCalendar);
registerReceiver(mCalendarReceiver, calendarIntentFilter); registerReceiver(receiver, calendarIntentFilter);
mCalendarReceiver.add(receiver);
}
} }
} }
if (mAlarmReceiver == null) { if (mAlarmReceiver == null) {
@ -991,10 +1006,10 @@ public class DeviceCommunicationService extends Service implements SharedPrefere
registerReceiver(mAlarmReceiver, new IntentFilter("DAILY_ALARM")); registerReceiver(mAlarmReceiver, new IntentFilter("DAILY_ALARM"));
} }
} else { } else {
if (mCalendarReceiver != null) { for (CalendarReceiver registeredReceiver: mCalendarReceiver){
unregisterReceiver(mCalendarReceiver); unregisterReceiver(registeredReceiver);
mCalendarReceiver = null;
} }
mCalendarReceiver.clear();
if (mAlarmReceiver != null) { if (mAlarmReceiver != null) {
unregisterReceiver(mAlarmReceiver); unregisterReceiver(mAlarmReceiver);
mAlarmReceiver = null; mAlarmReceiver = null;
@ -1152,7 +1167,7 @@ public class DeviceCommunicationService extends Service implements SharedPrefere
super.onDestroy(); super.onDestroy();
LocalBroadcastManager.getInstance(this).unregisterReceiver(mReceiver); LocalBroadcastManager.getInstance(this).unregisterReceiver(mReceiver);
setReceiversEnableState(false, false, null); // disable BroadcastReceivers setReceiversEnableState(false, false, null, null); // disable BroadcastReceivers
unregisterReceiver(mBlueToothConnectReceiver); unregisterReceiver(mBlueToothConnectReceiver);