From ea1c1c808cf7c7c90020743b245beef14c573e49 Mon Sep 17 00:00:00 2001 From: Daniele Gobbetti Date: Thu, 16 May 2024 14:37:56 +0200 Subject: [PATCH] Change java package of garmin protobuf files --- .../service/devices/garmin/GarminSupport.java | 10 +++++----- .../service/devices/garmin/GarminUtils.java | 2 +- .../devices/garmin/ProtocolBufferHandler.java | 16 ++++++++-------- .../garmin/http/DataTransferHandler.java | 2 +- .../devices/garmin/http/HttpHandler.java | 2 +- .../gdi_calendar_service.proto | 2 +- .../gdi_core.proto | 2 +- .../gdi_data_transfer_service.proto | 2 +- .../gdi_device_status.proto | 2 +- .../gdi_find_my_watch.proto | 2 +- .../gdi_http_service.proto | 2 +- .../gdi_settings_service.proto | 2 +- .../gdi_smart_proto.proto | 18 +++++++++--------- .../gdi_sms_notification.proto | 2 +- 14 files changed, 33 insertions(+), 33 deletions(-) rename app/src/main/proto/{garmin_vivomovehr => garmin}/gdi_calendar_service.proto (99%) rename app/src/main/proto/{garmin_vivomovehr => garmin}/gdi_core.proto (99%) rename app/src/main/proto/{garmin_vivomovehr => garmin}/gdi_data_transfer_service.proto (97%) rename app/src/main/proto/{garmin_vivomovehr => garmin}/gdi_device_status.proto (98%) rename app/src/main/proto/{garmin_vivomovehr => garmin}/gdi_find_my_watch.proto (98%) rename app/src/main/proto/{garmin_vivomovehr => garmin}/gdi_http_service.proto (98%) rename app/src/main/proto/{garmin_vivomovehr => garmin}/gdi_settings_service.proto (97%) rename app/src/main/proto/{garmin_vivomovehr => garmin}/gdi_smart_proto.proto (81%) rename app/src/main/proto/{garmin_vivomovehr => garmin}/gdi_sms_notification.proto (98%) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/GarminSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/GarminSupport.java index ae297bf34..a97462d6b 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/GarminSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/GarminSupport.java @@ -48,11 +48,11 @@ import nodomain.freeyourgadget.gadgetbridge.model.MusicStateSpec; import nodomain.freeyourgadget.gadgetbridge.model.NotificationSpec; import nodomain.freeyourgadget.gadgetbridge.model.Weather; import nodomain.freeyourgadget.gadgetbridge.model.WeatherSpec; -import nodomain.freeyourgadget.gadgetbridge.proto.vivomovehr.GdiCore; -import nodomain.freeyourgadget.gadgetbridge.proto.vivomovehr.GdiDeviceStatus; -import nodomain.freeyourgadget.gadgetbridge.proto.vivomovehr.GdiFindMyWatch; -import nodomain.freeyourgadget.gadgetbridge.proto.vivomovehr.GdiSettingsService; -import nodomain.freeyourgadget.gadgetbridge.proto.vivomovehr.GdiSmartProto; +import nodomain.freeyourgadget.gadgetbridge.proto.garmin.GdiCore; +import nodomain.freeyourgadget.gadgetbridge.proto.garmin.GdiDeviceStatus; +import nodomain.freeyourgadget.gadgetbridge.proto.garmin.GdiFindMyWatch; +import nodomain.freeyourgadget.gadgetbridge.proto.garmin.GdiSettingsService; +import nodomain.freeyourgadget.gadgetbridge.proto.garmin.GdiSmartProto; import nodomain.freeyourgadget.gadgetbridge.service.btle.AbstractBTLEDeviceSupport; import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder; import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetDeviceStateAction; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/GarminUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/GarminUtils.java index 9d54b0d2f..75c6e5c65 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/GarminUtils.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/GarminUtils.java @@ -3,7 +3,7 @@ package nodomain.freeyourgadget.gadgetbridge.service.devices.garmin; import android.location.Location; import android.os.Build; -import nodomain.freeyourgadget.gadgetbridge.proto.vivomovehr.GdiCore; +import nodomain.freeyourgadget.gadgetbridge.proto.garmin.GdiCore; public final class GarminUtils { private GarminUtils() { diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/ProtocolBufferHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/ProtocolBufferHandler.java index c609a5125..1f232a477 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/ProtocolBufferHandler.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/ProtocolBufferHandler.java @@ -22,14 +22,14 @@ import nodomain.freeyourgadget.gadgetbridge.devices.garmin.GarminPreferences; import nodomain.freeyourgadget.gadgetbridge.externalevents.gps.GBLocationProviderType; import nodomain.freeyourgadget.gadgetbridge.externalevents.gps.GBLocationService; import nodomain.freeyourgadget.gadgetbridge.model.CannedMessagesSpec; -import nodomain.freeyourgadget.gadgetbridge.proto.vivomovehr.GdiCalendarService; -import nodomain.freeyourgadget.gadgetbridge.proto.vivomovehr.GdiCore; -import nodomain.freeyourgadget.gadgetbridge.proto.vivomovehr.GdiDataTransferService; -import nodomain.freeyourgadget.gadgetbridge.proto.vivomovehr.GdiDeviceStatus; -import nodomain.freeyourgadget.gadgetbridge.proto.vivomovehr.GdiFindMyWatch; -import nodomain.freeyourgadget.gadgetbridge.proto.vivomovehr.GdiHttpService; -import nodomain.freeyourgadget.gadgetbridge.proto.vivomovehr.GdiSmartProto; -import nodomain.freeyourgadget.gadgetbridge.proto.vivomovehr.GdiSmsNotification; +import nodomain.freeyourgadget.gadgetbridge.proto.garmin.GdiCalendarService; +import nodomain.freeyourgadget.gadgetbridge.proto.garmin.GdiCore; +import nodomain.freeyourgadget.gadgetbridge.proto.garmin.GdiDataTransferService; +import nodomain.freeyourgadget.gadgetbridge.proto.garmin.GdiDeviceStatus; +import nodomain.freeyourgadget.gadgetbridge.proto.garmin.GdiFindMyWatch; +import nodomain.freeyourgadget.gadgetbridge.proto.garmin.GdiHttpService; +import nodomain.freeyourgadget.gadgetbridge.proto.garmin.GdiSmartProto; +import nodomain.freeyourgadget.gadgetbridge.proto.garmin.GdiSmsNotification; import nodomain.freeyourgadget.gadgetbridge.service.devices.garmin.http.DataTransferHandler; import nodomain.freeyourgadget.gadgetbridge.service.devices.garmin.http.HttpHandler; import nodomain.freeyourgadget.gadgetbridge.service.devices.garmin.messages.GFDIMessage; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/http/DataTransferHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/http/DataTransferHandler.java index dbad3edb6..2472aa887 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/http/DataTransferHandler.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/http/DataTransferHandler.java @@ -16,7 +16,7 @@ import java.util.TreeMap; import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicInteger; -import nodomain.freeyourgadget.gadgetbridge.proto.vivomovehr.GdiDataTransferService; +import nodomain.freeyourgadget.gadgetbridge.proto.garmin.GdiDataTransferService; public class DataTransferHandler { private static final Logger LOG = LoggerFactory.getLogger(DataTransferHandler.class); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/http/HttpHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/http/HttpHandler.java index c2f2cef5b..a205be10a 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/http/HttpHandler.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/http/HttpHandler.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.concurrent.Callable; import java.util.zip.GZIPOutputStream; -import nodomain.freeyourgadget.gadgetbridge.proto.vivomovehr.GdiHttpService; +import nodomain.freeyourgadget.gadgetbridge.proto.garmin.GdiHttpService; import nodomain.freeyourgadget.gadgetbridge.service.devices.garmin.GarminSupport; import nodomain.freeyourgadget.gadgetbridge.service.devices.garmin.agps.AgpsHandler; import nodomain.freeyourgadget.gadgetbridge.util.HttpUtils; diff --git a/app/src/main/proto/garmin_vivomovehr/gdi_calendar_service.proto b/app/src/main/proto/garmin/gdi_calendar_service.proto similarity index 99% rename from app/src/main/proto/garmin_vivomovehr/gdi_calendar_service.proto rename to app/src/main/proto/garmin/gdi_calendar_service.proto index ac3ea2e12..24eb4972e 100644 --- a/app/src/main/proto/garmin_vivomovehr/gdi_calendar_service.proto +++ b/app/src/main/proto/garmin/gdi_calendar_service.proto @@ -2,7 +2,7 @@ syntax = "proto2"; package garmin_vivomovehr; -option java_package = "nodomain.freeyourgadget.gadgetbridge.proto.vivomovehr"; +option java_package = "nodomain.freeyourgadget.gadgetbridge.proto.garmin"; message CalendarService { optional CalendarServiceRequest calendar_request = 1; diff --git a/app/src/main/proto/garmin_vivomovehr/gdi_core.proto b/app/src/main/proto/garmin/gdi_core.proto similarity index 99% rename from app/src/main/proto/garmin_vivomovehr/gdi_core.proto rename to app/src/main/proto/garmin/gdi_core.proto index ab43f8b55..1deac9f2b 100644 --- a/app/src/main/proto/garmin_vivomovehr/gdi_core.proto +++ b/app/src/main/proto/garmin/gdi_core.proto @@ -2,7 +2,7 @@ syntax = "proto2"; package garmin_vivomovehr; -option java_package = "nodomain.freeyourgadget.gadgetbridge.proto.vivomovehr"; +option java_package = "nodomain.freeyourgadget.gadgetbridge.proto.garmin"; message CoreService { optional SyncRequest sync_request = 1; diff --git a/app/src/main/proto/garmin_vivomovehr/gdi_data_transfer_service.proto b/app/src/main/proto/garmin/gdi_data_transfer_service.proto similarity index 97% rename from app/src/main/proto/garmin_vivomovehr/gdi_data_transfer_service.proto rename to app/src/main/proto/garmin/gdi_data_transfer_service.proto index 199f90afb..1cab3241b 100644 --- a/app/src/main/proto/garmin_vivomovehr/gdi_data_transfer_service.proto +++ b/app/src/main/proto/garmin/gdi_data_transfer_service.proto @@ -2,7 +2,7 @@ syntax = "proto2"; package garmin_vivomovehr; -option java_package = "nodomain.freeyourgadget.gadgetbridge.proto.vivomovehr"; +option java_package = "nodomain.freeyourgadget.gadgetbridge.proto.garmin"; message DataTransferService { enum Status { diff --git a/app/src/main/proto/garmin_vivomovehr/gdi_device_status.proto b/app/src/main/proto/garmin/gdi_device_status.proto similarity index 98% rename from app/src/main/proto/garmin_vivomovehr/gdi_device_status.proto rename to app/src/main/proto/garmin/gdi_device_status.proto index 99ee75c64..10594870b 100644 --- a/app/src/main/proto/garmin_vivomovehr/gdi_device_status.proto +++ b/app/src/main/proto/garmin/gdi_device_status.proto @@ -2,7 +2,7 @@ syntax = "proto2"; package garmin_vivomovehr; -option java_package = "nodomain.freeyourgadget.gadgetbridge.proto.vivomovehr"; +option java_package = "nodomain.freeyourgadget.gadgetbridge.proto.garmin"; message DeviceStatusService { optional RemoteDeviceBatteryStatusChangedNotification remote_device_battery_status_changed_notification = 1; diff --git a/app/src/main/proto/garmin_vivomovehr/gdi_find_my_watch.proto b/app/src/main/proto/garmin/gdi_find_my_watch.proto similarity index 98% rename from app/src/main/proto/garmin_vivomovehr/gdi_find_my_watch.proto rename to app/src/main/proto/garmin/gdi_find_my_watch.proto index 23e75c588..b6d6885bc 100644 --- a/app/src/main/proto/garmin_vivomovehr/gdi_find_my_watch.proto +++ b/app/src/main/proto/garmin/gdi_find_my_watch.proto @@ -2,7 +2,7 @@ syntax = "proto2"; package garmin_vivomovehr; -option java_package = "nodomain.freeyourgadget.gadgetbridge.proto.vivomovehr"; +option java_package = "nodomain.freeyourgadget.gadgetbridge.proto.garmin"; message FindMyWatchService { optional FindMyWatchRequest find_request = 1; diff --git a/app/src/main/proto/garmin_vivomovehr/gdi_http_service.proto b/app/src/main/proto/garmin/gdi_http_service.proto similarity index 98% rename from app/src/main/proto/garmin_vivomovehr/gdi_http_service.proto rename to app/src/main/proto/garmin/gdi_http_service.proto index 4af6644c2..63f1b019f 100644 --- a/app/src/main/proto/garmin_vivomovehr/gdi_http_service.proto +++ b/app/src/main/proto/garmin/gdi_http_service.proto @@ -2,7 +2,7 @@ syntax = "proto2"; package garmin_vivomovehr; -option java_package = "nodomain.freeyourgadget.gadgetbridge.proto.vivomovehr"; +option java_package = "nodomain.freeyourgadget.gadgetbridge.proto.garmin"; message HttpService { enum Method { diff --git a/app/src/main/proto/garmin_vivomovehr/gdi_settings_service.proto b/app/src/main/proto/garmin/gdi_settings_service.proto similarity index 97% rename from app/src/main/proto/garmin_vivomovehr/gdi_settings_service.proto rename to app/src/main/proto/garmin/gdi_settings_service.proto index f204a8aa8..88bbcc998 100644 --- a/app/src/main/proto/garmin_vivomovehr/gdi_settings_service.proto +++ b/app/src/main/proto/garmin/gdi_settings_service.proto @@ -2,7 +2,7 @@ syntax = "proto2"; package garmin_vivomovehr; -option java_package = "nodomain.freeyourgadget.gadgetbridge.proto.vivomovehr"; +option java_package = "nodomain.freeyourgadget.gadgetbridge.proto.garmin"; message SettingsService { optional ChangeRequest change_request = 5; diff --git a/app/src/main/proto/garmin_vivomovehr/gdi_smart_proto.proto b/app/src/main/proto/garmin/gdi_smart_proto.proto similarity index 81% rename from app/src/main/proto/garmin_vivomovehr/gdi_smart_proto.proto rename to app/src/main/proto/garmin/gdi_smart_proto.proto index 59621c5f7..218592db3 100644 --- a/app/src/main/proto/garmin_vivomovehr/gdi_smart_proto.proto +++ b/app/src/main/proto/garmin/gdi_smart_proto.proto @@ -2,16 +2,16 @@ syntax = "proto2"; package garmin_vivomovehr; -option java_package = "nodomain.freeyourgadget.gadgetbridge.proto.vivomovehr"; +option java_package = "nodomain.freeyourgadget.gadgetbridge.proto.garmin"; -import "garmin_vivomovehr/gdi_device_status.proto"; -import "garmin_vivomovehr/gdi_find_my_watch.proto"; -import "garmin_vivomovehr/gdi_core.proto"; -import "garmin_vivomovehr/gdi_http_service.proto"; -import "garmin_vivomovehr/gdi_data_transfer_service.proto"; -import "garmin_vivomovehr/gdi_sms_notification.proto"; -import "garmin_vivomovehr/gdi_calendar_service.proto"; -import "garmin_vivomovehr/gdi_settings_service.proto"; +import "garmin/gdi_device_status.proto"; +import "garmin/gdi_find_my_watch.proto"; +import "garmin/gdi_core.proto"; +import "garmin/gdi_http_service.proto"; +import "garmin/gdi_data_transfer_service.proto"; +import "garmin/gdi_sms_notification.proto"; +import "garmin/gdi_calendar_service.proto"; +import "garmin/gdi_settings_service.proto"; message Smart { optional CalendarService calendar_service = 1; diff --git a/app/src/main/proto/garmin_vivomovehr/gdi_sms_notification.proto b/app/src/main/proto/garmin/gdi_sms_notification.proto similarity index 98% rename from app/src/main/proto/garmin_vivomovehr/gdi_sms_notification.proto rename to app/src/main/proto/garmin/gdi_sms_notification.proto index 1a61ff911..bc525a6f8 100644 --- a/app/src/main/proto/garmin_vivomovehr/gdi_sms_notification.proto +++ b/app/src/main/proto/garmin/gdi_sms_notification.proto @@ -2,7 +2,7 @@ syntax = "proto2"; package garmin_vivomovehr; -option java_package = "nodomain.freeyourgadget.gadgetbridge.proto.vivomovehr"; +option java_package = "nodomain.freeyourgadget.gadgetbridge.proto.garmin"; message SmsNotificationService { optional SmsSendMessageRequest sms_send_message_request = 1;