MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2025-01-13 03:07:32 +01:00
Code Releases Wiki Activity

Fix the code that forces a calendar sync on Bangle.js - previously sending "android.intent.action.PROVIDER_CHANGED" didn't work

Browse Source
This commit is contained in:
Gordon Williams 2022-11-23 20:10:28 +00:00 committed by Gitea
parent ee159f29c7
commit e003e0b672
2 changed files with 8 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1087,7 +1087,6 @@ public class DeviceCommunicationService extends Service implements SharedPrefere
return false; return false;
} }
private void setReceiversEnableState(boolean enable, boolean initialized, FeatureSet features, List <GBDevice> devicesWithCalendar) { 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);
@ -1106,6 +1105,8 @@ public class DeviceCommunicationService extends Service implements SharedPrefere
CalendarReceiver receiver = new CalendarReceiver(deviceWithCalendar); CalendarReceiver receiver = new CalendarReceiver(deviceWithCalendar);
registerReceiver(receiver, calendarIntentFilter); registerReceiver(receiver, calendarIntentFilter);
mCalendarReceiver.add(receiver); mCalendarReceiver.add(receiver);
// Add a receiver to allow us to quickly force as calendar sync (without having to provide data)
registerReceiver(receiver, new IntentFilter("FORCE_CALENDAR_SYNC"));
} }
} }
} }

49
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java
View File

@ -741,7 +741,7 @@ public class BangleJSDeviceSupport extends AbstractBTLEDeviceSupport {
idsList.add(id); idsList.add(id);
} }
} }
if(idsList.size() == states.size()) return;
//remove all elements not in ids from database (we don't have them) //remove all elements not in ids from database (we don't have them)
for(CalendarSyncState calendarSyncState : states) { for(CalendarSyncState calendarSyncState : states) {
long id = calendarSyncState.getCalendarEntryId(); long id = calendarSyncState.getCalendarEntryId();
@ -757,9 +757,10 @@ public class BangleJSDeviceSupport extends AbstractBTLEDeviceSupport {
GB.toast("Database Error while forcefully syncing Calendar", Toast.LENGTH_SHORT, GB.ERROR, e1); GB.toast("Database Error while forcefully syncing Calendar", Toast.LENGTH_SHORT, GB.ERROR, e1);
} }
//force a syncCalendar now, send missing events //force a syncCalendar now, send missing events
Intent in = new Intent(this.getContext().getApplicationContext(), CalendarReceiver.class); Context context = GBApplication.getContext();
in.setAction("android.intent.action.PROVIDER_CHANGED"); Intent intent = new Intent("FORCE_CALENDAR_SYNC");
this.getContext().getApplicationContext().sendBroadcast(in); intent.setPackage(BuildConfig.APPLICATION_ID);
GBApplication.getContext().sendBroadcast(intent);
} break; } break;
default : { default : {
LOG.info("UART RX JSON packet type '"+packetType+"' not understood."); LOG.info("UART RX JSON packet type '"+packetType+"' not understood.");
@ -923,8 +924,7 @@ public class BangleJSDeviceSupport extends AbstractBTLEDeviceSupport {
TransactionBuilder builder = performInitialized("setTime"); TransactionBuilder builder = performInitialized("setTime");
transmitTime(builder); transmitTime(builder);
//TODO: once we have a common strategy for sending events (e.g. EventHandler), remove this call from here. Meanwhile it does no harm. //TODO: once we have a common strategy for sending events (e.g. EventHandler), remove this call from here. Meanwhile it does no harm.
// = we should genaralize the pebble calender code // = we should generalize the pebble calender code
//sendCalendarEvents();
forceCalendarSync(); forceCalendarSync();
builder.queue(getQueue()); builder.queue(getQueue());
} catch (Exception e) { } catch (Exception e) {
@ -1412,41 +1412,4 @@ public class BangleJSDeviceSupport extends AbstractBTLEDeviceSupport {
} }
} }
/*
* Sending all events together, not used for now, keep for future reference
*/
private void sendCalendarEvents() {
//Prefs prefs = new Prefs(GBApplication.getDeviceSpecificSharedPrefs(gbDevice.getAddress()));
//TODO set a limit as number in the preferences?
//int availableSlots = prefs.getInt(PREF_CALENDAR_EVENTS_MAX, 0);
int availableSlots = 6;
try {
CalendarManager upcomingEvents = new CalendarManager(getContext(), getDevice().getAddress());
List<CalendarEvent> mEvents = upcomingEvents.getCalendarEventList();
JSONObject cal = new JSONObject();
JSONArray events = new JSONArray();
cal.put("t", "calendarevents");
for (CalendarEvent mEvt : mEvents) {
if(availableSlots<1) break;
JSONObject o = new JSONObject();
o.put("timestamp", mEvt.getBeginSeconds());
o.put("durationInSeconds", mEvt.getDurationSeconds());
o.put("title", mEvt.getTitle());
//avoid making the message too long
//o.put("description", mEvt.getDescription());
o.put("location", mEvt.getLocation());
o.put("allDay", mEvt.isAllDay());
events.put(o);
availableSlots--;
}
cal.put("events", events);
uartTxJSON("sendCalendarEvents", cal);
LOG.info("sendCalendarEvents: sent " + events.length());
} catch(JSONException e) {
LOG.info("JSONException: " + e.getLocalizedMessage());
}
}
} }