diff --git a/.idea/dictionaries/t.xml b/.idea/dictionaries/t.xml index 49c6fad8be..442a846564 100644 --- a/.idea/dictionaries/t.xml +++ b/.idea/dictionaries/t.xml @@ -49,6 +49,7 @@ eomäe ericsson exrizu + femometer findphone françois freeyourgadget @@ -59,6 +60,7 @@ gfdi gideão girolamo + glonass gloryfit gobbetti gree @@ -69,10 +71,13 @@ handcycling hasants hauck + haylou + heartrate hiit hmac hplus huami + idasen ieee infini inkscape @@ -92,6 +97,7 @@ kabaddi kasha kaushan + keephealth keeshii kitesurfing kompact @@ -101,6 +107,8 @@ lacross ladbsoft ladera + laxas + lefun lemfo lenovo liebergeld @@ -119,6 +127,7 @@ moondrop morpheuz mosenkovs + moyoung multisport musicspec musicstatespec @@ -131,6 +140,7 @@ onetouch opentracks oraclejdk + osmand oukitel paddleboarding padel @@ -193,6 +203,7 @@ vebryn veneziano vibratissimo + vivomove wakeboarding wakesurfing walkjivefly @@ -201,6 +212,8 @@ watchface watchfaces wechat + weixin + wena whatsapp xiaomi xplus diff --git a/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java b/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java index 87552f122f..582f747ab3 100644 --- a/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java +++ b/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java @@ -782,7 +782,7 @@ public class GBDaoGenerator { activitySample.addIntProperty(SAMPLE_HEART_RATE).notNull().codeBeforeGetterAndSetter(OVERRIDE); } - private static void addBloodPressureProperies(Entity activitySample) { + private static void addBloodPressureProperties(Entity activitySample) { activitySample.addIntProperty(SAMPLE_BLOOD_PRESSURE_SYSTOLIC).codeBeforeGetter(OVERRIDE).notNull(); activitySample.addIntProperty(SAMPLE_BLOOD_PRESSURE_DIASTOLIC).codeBeforeGetter(OVERRIDE).notNull(); } @@ -1288,7 +1288,7 @@ public class GBDaoGenerator { private static Entity addMoyoungBloodPressureSample(Schema schema, Entity user, Entity device) { Entity bpSample = addEntity(schema, "MoyoungBloodPressureSample"); addCommonTimeSampleProperties("AbstractBloodPressureSample", bpSample, user, device); - addBloodPressureProperies(bpSample); + addBloodPressureProperties(bpSample); return bpSample; } @@ -1334,7 +1334,7 @@ public class GBDaoGenerator { private static Entity addKeephealthBloodPressureSample(Schema schema, Entity user, Entity device) { Entity bpSample = addEntity(schema, "KeephealthBloodPressureSample"); addCommonTimeSampleProperties("AbstractBloodPressureSample", bpSample, user, device); - addBloodPressureProperies(bpSample); + addBloodPressureProperties(bpSample); return bpSample; } @@ -1528,27 +1528,27 @@ public class GBDaoGenerator { } private static void addNotificationFilterEntry(Schema schema, Entity notificationFilterEntity) { - Entity notificatonFilterEntry = addEntity(schema, "NotificationFilterEntry"); - notificatonFilterEntry.addIdProperty().autoincrement(); - Property notificationFilterId = notificatonFilterEntry.addLongProperty("notificationFilterId").notNull().getProperty(); - notificatonFilterEntry.addStringProperty("notificationFilterContent").notNull(); - notificatonFilterEntry.addToOne(notificationFilterEntity, notificationFilterId); + Entity notificationFilterEntry = addEntity(schema, "NotificationFilterEntry"); + notificationFilterEntry.addIdProperty().autoincrement(); + Property notificationFilterId = notificationFilterEntry.addLongProperty("notificationFilterId").notNull().getProperty(); + notificationFilterEntry.addStringProperty("notificationFilterContent").notNull(); + notificationFilterEntry.addToOne(notificationFilterEntity, notificationFilterId); } private static Entity addNotificationFilters(Schema schema) { - Entity notificatonFilter = addEntity(schema, "NotificationFilter"); - Property appIdentifier = notificatonFilter.addStringProperty("appIdentifier").notNull().getProperty(); + Entity notificationFilter = addEntity(schema, "NotificationFilter"); + Property appIdentifier = notificationFilter.addStringProperty("appIdentifier").notNull().getProperty(); - notificatonFilter.addIdProperty().autoincrement(); + notificationFilter.addIdProperty().autoincrement(); Index indexUnique = new Index(); indexUnique.addProperty(appIdentifier); indexUnique.makeUnique(); - notificatonFilter.addIndex(indexUnique); + notificationFilter.addIndex(indexUnique); - Property notificationFilterMode = notificatonFilter.addIntProperty("notificationFilterMode").notNull().getProperty(); - Property notificationFilterSubMode = notificatonFilter.addIntProperty("notificationFilterSubMode").notNull().getProperty(); - return notificatonFilter; + Property notificationFilterMode = notificationFilter.addIntProperty("notificationFilterMode").notNull().getProperty(); + Property notificationFilterSubMode = notificationFilter.addIntProperty("notificationFilterSubMode").notNull().getProperty(); + return notificationFilter; } private static void addPebbleAppstoreIdEntry(Schema schema) { @@ -2319,7 +2319,7 @@ public class GBDaoGenerator { private static Entity addGenericBloodPressureSample(Schema schema, Entity user, Entity device) { Entity bloodPressureSample = addEntity(schema, "GenericBloodPressureSample"); addCommonTimeSampleProperties("AbstractBloodPressureSample", bloodPressureSample, user, device); - addBloodPressureProperies(bloodPressureSample); + addBloodPressureProperties(bloodPressureSample); bloodPressureSample.addIntProperty("userIndex"); bloodPressureSample.addIntProperty("meanArterialPressure"); bloodPressureSample.addIntProperty("pulseRate"); diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0786890c0d..4d9923078d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -56,7 +56,7 @@ - + diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DevicesFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DevicesFragment.java index 21bfab4e4e..5b99f260b4 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DevicesFragment.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DevicesFragment.java @@ -143,7 +143,7 @@ public class DevicesFragment extends Fragment { } }); - showFabIfNeccessary(); + showFabIfNecessary(); /* uncomment to enable fixed-swipe to reveal more actions @@ -197,7 +197,7 @@ public class DevicesFragment extends Fragment { startActivity(new Intent(getActivity(), DiscoveryActivityV2.class)); } - private void showFabIfNeccessary() { + private void showFabIfNecessary() { if (GBApplication.getPrefs().getBoolean("display_add_device_fab", true)) { fab.show(); } else { diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/workouts/charts/DefaultWorkoutCharts.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/workouts/charts/DefaultWorkoutCharts.java index 9aa09097db..992c63f1d0 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/workouts/charts/DefaultWorkoutCharts.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/workouts/charts/DefaultWorkoutCharts.java @@ -66,21 +66,21 @@ public class DefaultWorkoutCharts { final ActivityKind.CycleUnit cycleUnit = ActivityKind.getCycleUnit(activityKind); final List charts = new LinkedList<>(); final TimestampTranslation tsTranslation = new TimestampTranslation(); - final int initalCapacity = activityPoints.size(); - final List heartRateDataPoints = new ArrayList<>(initalCapacity); - final List speedDataPoints = new ArrayList<>(initalCapacity); - final List cadenceDataPoints = new ArrayList<>(initalCapacity); - final List elevationDataPoints = new ArrayList<>(initalCapacity); - final List powerDataPoints = new ArrayList<>(initalCapacity); - final List respiratoryRatePoints = new ArrayList<>(initalCapacity); - final List temperatureDataPoints = new ArrayList<>(initalCapacity); - final List depthDataPoints = new ArrayList<>(initalCapacity); - final List distancePoints = new ArrayList<>(initalCapacity); - final List staminaPoints = new ArrayList<>(initalCapacity); - final List bodyEnergyPoints = new ArrayList<>(initalCapacity); - final List stepLengthPoints = new ArrayList<>(initalCapacity); - final List n2LoadPoints = new ArrayList<>(initalCapacity); - final List cnsToxicityPoints = new ArrayList<>(initalCapacity); + final int initialCapacity = activityPoints.size(); + final List heartRateDataPoints = new ArrayList<>(initialCapacity); + final List speedDataPoints = new ArrayList<>(initialCapacity); + final List cadenceDataPoints = new ArrayList<>(initialCapacity); + final List elevationDataPoints = new ArrayList<>(initialCapacity); + final List powerDataPoints = new ArrayList<>(initialCapacity); + final List respiratoryRatePoints = new ArrayList<>(initialCapacity); + final List temperatureDataPoints = new ArrayList<>(initialCapacity); + final List depthDataPoints = new ArrayList<>(initialCapacity); + final List distancePoints = new ArrayList<>(initialCapacity); + final List staminaPoints = new ArrayList<>(initialCapacity); + final List bodyEnergyPoints = new ArrayList<>(initialCapacity); + final List stepLengthPoints = new ArrayList<>(initialCapacity); + final List n2LoadPoints = new ArrayList<>(initialCapacity); + final List cnsToxicityPoints = new ArrayList<>(initialCapacity); // some activities / devices provide all points with zero values boolean hasSpeedValues = false; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBHelper.java index 0ca8560642..a3ea1b5344 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBHelper.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBHelper.java @@ -471,7 +471,7 @@ public class DBHelper { } @NonNull - public static List findActivityDecriptions(@NonNull User user, int tsFrom, int tsTo, @NonNull DaoSession session) { + public static List findActivityDescriptions(@NonNull User user, int tsFrom, int tsTo, @NonNull DaoSession session) { Property tsFromProperty = ActivityDescriptionDao.Properties.TimestampFrom; Property tsToProperty = ActivityDescriptionDao.Properties.TimestampTo; Property userIdProperty = ActivityDescriptionDao.Properties.UserId; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_35.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_35.java index 5253d90de7..13a6db9b8d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_35.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_35.java @@ -35,13 +35,13 @@ public class GadgetbridgeUpdate_35 implements DBUpdateScript { "PRIMARY KEY (\"TIMESTAMP\" ,\"DEVICE_ID\" ,\"BATTERY_INDEX\" ) ON CONFLICT REPLACE) WITHOUT ROWID;"; db.execSQL(CREATE_TABLE); - String MIGATE_DATA = "insert into " + BatteryLevelDao.TABLENAME + String MIGRATE_DATA = "insert into " + BatteryLevelDao.TABLENAME + " (" + BatteryLevelDao.Properties.Timestamp.columnName + "," + BatteryLevelDao.Properties.DeviceId.columnName + "," + BatteryLevelDao.Properties.BatteryIndex.columnName + "," + BatteryLevelDao.Properties.Level.columnName + ") " + " select Timestamp, Device_ID, 0, Level from battery_levels_temp;"; - db.execSQL(MIGATE_DATA); + db.execSQL(MIGRATE_DATA); String DROP_TEMP_TABLE = "drop table if exists battery_levels_temp"; db.execSQL(DROP_TEMP_TABLE); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_83.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_83.java index 05a269c85b..d0d373a65b 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_83.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_83.java @@ -40,7 +40,7 @@ public class GadgetbridgeUpdate_83 implements DBUpdateScript { "PRIMARY KEY (\""+HuaweiWorkoutPaceSampleDao.Properties.WorkoutId.columnName+"\" ,\""+ HuaweiWorkoutPaceSampleDao.Properties.PaceIndex.columnName +"\" ,\""+ HuaweiWorkoutPaceSampleDao.Properties.Distance.columnName +"\", \""+ HuaweiWorkoutPaceSampleDao.Properties.Type.columnName +"\") ON CONFLICT REPLACE) WITHOUT ROWID;"; db.execSQL(CREATE_TABLE); - String MIGATE_DATA = "INSERT INTO " + HuaweiWorkoutPaceSampleDao.TABLENAME + String MIGRATE_DATA = "INSERT INTO " + HuaweiWorkoutPaceSampleDao.TABLENAME + " (" +HuaweiWorkoutPaceSampleDao.Properties.WorkoutId.columnName+ "," + HuaweiWorkoutPaceSampleDao.Properties.PaceIndex.columnName + "," + HuaweiWorkoutPaceSampleDao.Properties.Distance.columnName+ "," @@ -50,7 +50,7 @@ public class GadgetbridgeUpdate_83 implements DBUpdateScript { + HuaweiWorkoutPaceSampleDao.Properties.Correction.columnName + ") " + " SELECT WORKOUT_ID, -1, DISTANCE, TYPE, PACE, 0, CORRECTION FROM " +HuaweiWorkoutPaceSampleDao.TABLENAME + "_temp;"; - db.execSQL(MIGATE_DATA); + db.execSQL(MIGRATE_DATA); String DROP_TEMP_TABLE = "drop table if exists " +HuaweiWorkoutPaceSampleDao.TABLENAME + "_temp;"; db.execSQL(DROP_TEMP_TABLE); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractSampleProvider.java index e10d32ae79..c05ec46b26 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractSampleProvider.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractSampleProvider.java @@ -61,7 +61,7 @@ import nodomain.freeyourgadget.gadgetbridge.util.GB; * access to the device specific samples. There are both read and write operations. * @param the sample type */ -public abstract class AbstractSampleProvider implements SampleProvider, PersistanceProvider { +public abstract class AbstractSampleProvider implements SampleProvider, PersistenceProvider { private static final Logger LOG = LoggerFactory.getLogger(AbstractSampleProvider.class); private static final WhereCondition[] NO_CONDITIONS = new WhereCondition[0]; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractTimeSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractTimeSampleProvider.java index 6167a263e8..8db9f53b1c 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractTimeSampleProvider.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractTimeSampleProvider.java @@ -49,7 +49,7 @@ import nodomain.freeyourgadget.gadgetbridge.util.GB; * * @param the sample type */ -public abstract class AbstractTimeSampleProvider implements TimeSampleProvider, PersistanceProvider { +public abstract class AbstractTimeSampleProvider implements TimeSampleProvider, PersistenceProvider { private static final Logger LOG = LoggerFactory.getLogger(AbstractTimeSampleProvider.class); private final DaoSession mSession; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/BaseActivitySummaryProvider.kt b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/BaseActivitySummaryProvider.kt index c0c3c4f686..c8acbd5e7e 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/BaseActivitySummaryProvider.kt +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/BaseActivitySummaryProvider.kt @@ -29,7 +29,7 @@ import org.slf4j.Logger import org.slf4j.LoggerFactory class BaseActivitySummaryProvider(val device: GBDevice, val session: DaoSession) : - PersistanceProvider { + PersistenceProvider { override fun persistSamples( samples: List, context: Context? ): Boolean { diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/BatteryLevelProvider.kt b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/BatteryLevelProvider.kt index 4444525e26..1f2dd3eeb1 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/BatteryLevelProvider.kt +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/BatteryLevelProvider.kt @@ -29,7 +29,7 @@ import org.slf4j.Logger import org.slf4j.LoggerFactory class BatteryLevelProvider(val device: GBDevice, val session: DaoSession) : - PersistanceProvider { + PersistenceProvider { override fun persistSamples( samples: List, context: Context? diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/PersistanceProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/PersistenceProvider.java similarity index 97% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/PersistanceProvider.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/PersistenceProvider.java index d6ca776b35..98c41b6540 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/PersistanceProvider.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/PersistenceProvider.java @@ -24,7 +24,7 @@ import androidx.annotation.Nullable; import java.util.Collections; import java.util.List; -public interface PersistanceProvider { +public interface PersistenceProvider { /// Set the relevant metadata for all samples like device ID, user ID, etc. and then /// stores them all in the database. Existing samples with identical primary key /// already stored in the database will be replaced. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/CMWeatherReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/CMWeatherReceiver.java index 254f50869d..279d400c1f 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/CMWeatherReceiver.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/CMWeatherReceiver.java @@ -158,7 +158,7 @@ public class CMWeatherReceiver extends BroadcastReceiver implements CMWeatherMan } weatherSpec.setWindDirection((int) weatherInfo.getWindDirection()); - weatherSpec.setCurrentConditionCode(WeatherMapper.mapToOpenWeatherMapCondition(CMtoYahooCondintion(weatherInfo.getConditionCode()))); + weatherSpec.setCurrentConditionCode(WeatherMapper.mapToOpenWeatherMapCondition(CMtoYahooCondition(weatherInfo.getConditionCode()))); weatherSpec.setCurrentCondition(WeatherMapper.getConditionString(mContext, weatherSpec.getCurrentConditionCode())); weatherSpec.setCurrentHumidity((int) weatherInfo.getHumidity()); @@ -174,7 +174,7 @@ public class CMWeatherReceiver extends BroadcastReceiver implements CMWeatherMan gbForecast.setMaxTemp((int) cmForecast.getHigh() + 273); gbForecast.setMinTemp((int) cmForecast.getLow() + 273); } - gbForecast.setConditionCode(WeatherMapper.mapToOpenWeatherMapCondition(CMtoYahooCondintion(cmForecast.getConditionCode()))); + gbForecast.setConditionCode(WeatherMapper.mapToOpenWeatherMapCondition(CMtoYahooCondition(cmForecast.getConditionCode()))); weatherSpec.getForecasts().add(gbForecast); } ArrayList weatherSpecs = new ArrayList<>(Collections.singletonList(weatherSpec)); @@ -189,7 +189,7 @@ public class CMWeatherReceiver extends BroadcastReceiver implements CMWeatherMan * @param cmCondition * @return */ - private int CMtoYahooCondintion(int cmCondition) { + private int CMtoYahooCondition(int cmCondition) { int yahooCondition; if (cmCondition <= SHOWERS) { yahooCondition = cmCondition; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/OsmandEventReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/OsmandEventReceiver.java index 813ba3b03c..bd59289449 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/OsmandEventReceiver.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/OsmandEventReceiver.java @@ -92,9 +92,9 @@ public class OsmandEventReceiver { @Override public void onVoiceRouterNotify(OnVoiceNavigationParams params) { List played = params.getPlayed(); - for (String instuction : played) { - navigationInfoSpec.instruction = instuction; - LOG.debug("instruction: {}", instuction); + for (String instruction : played) { + navigationInfoSpec.instruction = instruction; + LOG.debug("instruction: {}", instruction); // only first one for now break; } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java index 1883b7eccc..bd9484bc9f 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java @@ -272,7 +272,7 @@ public class DeviceCommunicationService extends Service implements SharedPrefere private AlarmClockReceiver mAlarmClockReceiver = null; private SilentModeReceiver mSilentModeReceiver = null; private GBAutoFetchReceiver mGBAutoFetchReceiver = null; - private AutoConnectIntervalReceiver mAutoConnectInvervalReceiver = null; + private AutoConnectIntervalReceiver mAutoConnectIntervalReceiver = null; private VolumeChangeReceiver mVolumeChangeReceiver = null; private HrvCacheInvalidationReceiver mHrvCacheInvalidationReceiver = null; @@ -532,8 +532,8 @@ public class DeviceCommunicationService extends Service implements SharedPrefere mBlueToothConnectReceiver = new BluetoothConnectReceiver(this); ContextCompat.registerReceiver(this, mBlueToothConnectReceiver, new IntentFilter(BluetoothDevice.ACTION_ACL_CONNECTED), ContextCompat.RECEIVER_EXPORTED); - mAutoConnectInvervalReceiver= new AutoConnectIntervalReceiver(this); - ContextCompat.registerReceiver(this, mAutoConnectInvervalReceiver, new IntentFilter("GB_RECONNECT"), ContextCompat.RECEIVER_EXPORTED); + mAutoConnectIntervalReceiver = new AutoConnectIntervalReceiver(this); + ContextCompat.registerReceiver(this, mAutoConnectIntervalReceiver, new IntentFilter("GB_RECONNECT"), ContextCompat.RECEIVER_EXPORTED); IntentFilter bluetoothCommandFilter = new IntentFilter(); bluetoothCommandFilter.addAction(API_LEGACY_COMMAND_BLUETOOTH_CONNECT); @@ -1629,9 +1629,9 @@ public class DeviceCommunicationService extends Service implements SharedPrefere unregisterReceiver(mBlueToothConnectReceiver); mBlueToothConnectReceiver = null; - unregisterReceiver(mAutoConnectInvervalReceiver); - mAutoConnectInvervalReceiver.destroy(); - mAutoConnectInvervalReceiver = null; + unregisterReceiver(mAutoConnectIntervalReceiver); + mAutoConnectIntervalReceiver.destroy(); + mAutoConnectIntervalReceiver = null; for(GBDevice device : getGBDevices()){ try { diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/Command.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/Command.java index 7e0908b431..e1482d052f 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/Command.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/Command.java @@ -23,7 +23,7 @@ public enum Command { EnableNewIncomingAlertNotification(0), EnableUnreadCategoryStatusNotification(1), DisableNewIncomingAlertNotification(2), - DisbleUnreadCategoryStatusNotification(3), + DisableUnreadCategoryStatusNotification(3), NotifyNewIncomingAlertImmediately(4), NotifyUnreadCategoryStatusImmediately(5),; // 6-255 reserved for future use diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/fit/FitImporter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/fit/FitImporter.java index 84f66a99f3..ed9183598a 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/fit/FitImporter.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/fit/FitImporter.java @@ -61,7 +61,7 @@ import nodomain.freeyourgadget.gadgetbridge.devices.GarminSpo2SampleProvider; import nodomain.freeyourgadget.gadgetbridge.devices.GarminStressSampleProvider; import nodomain.freeyourgadget.gadgetbridge.devices.GenericTrainingLoadAcuteSampleProvider; import nodomain.freeyourgadget.gadgetbridge.devices.GenericTrainingLoadChronicSampleProvider; -import nodomain.freeyourgadget.gadgetbridge.devices.PersistanceProvider; +import nodomain.freeyourgadget.gadgetbridge.devices.PersistenceProvider; import nodomain.freeyourgadget.gadgetbridge.devices.garmin.GarminActivitySampleProvider; import nodomain.freeyourgadget.gadgetbridge.devices.garmin.GarminEventSampleProvider; import nodomain.freeyourgadget.gadgetbridge.devices.garmin.GarminWorkoutParser; @@ -947,7 +947,7 @@ public class FitImporter { } private void persistAbstractSamples(@NonNull final List samples, - @NonNull final PersistanceProvider sampleProvider) { + @NonNull final PersistenceProvider sampleProvider) { sampleProvider.persistSamples(samples, context); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GB.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GB.java index df00d80ccc..b6631ec054 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GB.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GB.java @@ -126,11 +126,11 @@ public class GB { NotificationManager.IMPORTANCE_LOW); notificationManager.createNotificationChannel(channelGeneral); - NotificationChannel channelConnwectionStatus = new NotificationChannel( + NotificationChannel channelConnectionStatus = new NotificationChannel( NOTIFICATION_CHANNEL_ID_CONNECTION_STATUS, context.getString(R.string.notification_channel_connection_status_name), NotificationManager.IMPORTANCE_LOW); - notificationManager.createNotificationChannel(channelConnwectionStatus); + notificationManager.createNotificationChannel(channelConnectionStatus); NotificationChannel channelScanService = new NotificationChannel( NOTIFICATION_CHANNEL_ID_SCAN_SERVICE, @@ -267,13 +267,13 @@ public class GB { }else{ StringBuilder contentText = new StringBuilder(); boolean isConnected = true; - boolean anyDeviceSupportesActivityDataFetching = false; + boolean anyDeviceSupportsActivityDataFetching = false; for(GBDevice device : devices){ if(!device.isInitialized()){ isConnected = false; } - anyDeviceSupportesActivityDataFetching |= device.getDeviceCoordinator().supportsDataFetching(device); + anyDeviceSupportsActivityDataFetching |= device.getDeviceCoordinator().supportsDataFetching(device); String deviceName = device.getAliasOrName(); String text = device.getStateString(context); @@ -299,7 +299,7 @@ public class GB { builder.setColor(ContextCompat.getColor(context, R.color.accent)); } - if (anyDeviceSupportesActivityDataFetching) { + if (anyDeviceSupportsActivityDataFetching) { Intent deviceCommunicationServiceIntent = new Intent(context, DeviceCommunicationService.class); deviceCommunicationServiceIntent.setPackage(BuildConfig.APPLICATION_ID); deviceCommunicationServiceIntent.setAction(DeviceService.ACTION_FETCH_RECORDED_DATA); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/LanguageUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/LanguageUtils.java index ec8e77d660..388cf3e91e 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/LanguageUtils.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/LanguageUtils.java @@ -60,7 +60,7 @@ import nodomain.freeyourgadget.gadgetbridge.util.language.impl.RussianTransliter import nodomain.freeyourgadget.gadgetbridge.util.language.impl.ScandinavianTransliterator; import nodomain.freeyourgadget.gadgetbridge.util.language.impl.SerbianTransliterator; import nodomain.freeyourgadget.gadgetbridge.util.language.impl.TurkishTransliterator; -import nodomain.freeyourgadget.gadgetbridge.util.language.impl.UkranianTransliterator; +import nodomain.freeyourgadget.gadgetbridge.util.language.impl.UkrainianTransliterator; public class LanguageUtils { private static final Logger LOG = LoggerFactory.getLogger(LanguageUtils.class); @@ -90,7 +90,7 @@ public class LanguageUtils { put("scandinavian", new ScandinavianTransliterator()); put("serbian", new SerbianTransliterator()); put("turkish", new TurkishTransliterator()); - put("ukranian", new UkranianTransliterator()); + put("ukranian", new UkrainianTransliterator()); put("armenian", new ArmenianTransliterator()); }}; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/ArmenianTransliterator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/ArmenianTransliterator.java index 3b467fc63b..20fc04fcae 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/ArmenianTransliterator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/ArmenianTransliterator.java @@ -37,7 +37,7 @@ public class ArmenianTransliterator implements Transliterator { private static final Map transliterateMap = new LinkedHashMap() { { // Simple substitutions - Map simpleSubstitions = new HashMap() { + Map simpleSubstitutions = new HashMap() { { put("ա","a"); put("բ","b"); @@ -85,10 +85,10 @@ public class ArmenianTransliterator implements Transliterator { }; // Capitalize existing simple substitutions here - for (final Entry entry : new ArrayList>(simpleSubstitions.entrySet())) { + for (final Entry entry : new ArrayList>(simpleSubstitutions.entrySet())) { String capitalKey = entry.getKey().toUpperCase(); if (!capitalKey.equals(entry.getKey())) { - simpleSubstitions.put(capitalKey, entry.getValue().toUpperCase()); + simpleSubstitutions.put(capitalKey, entry.getValue().toUpperCase()); } } @@ -136,8 +136,8 @@ public class ArmenianTransliterator implements Transliterator { for (final String letter : letterMapU) { final String capitalLetter = letter.toUpperCase(); - final String transliteratedLetter = Objects.requireNonNull(simpleSubstitions.get(letter), letter); - final String transliteratedCapitalLetter = Objects.requireNonNull(simpleSubstitions.get(capitalLetter), capitalLetter); + final String transliteratedLetter = Objects.requireNonNull(simpleSubstitutions.get(letter), letter); + final String transliteratedCapitalLetter = Objects.requireNonNull(simpleSubstitutions.get(capitalLetter), capitalLetter); put(letter + "ու", transliteratedLetter + "u"); put(capitalLetter + "ու", transliteratedCapitalLetter + "u"); @@ -194,8 +194,8 @@ public class ArmenianTransliterator implements Transliterator { for (String letter : letterMapVo) { String capitalLetter = letter.toUpperCase(); - final String transliteratedLetter = Objects.requireNonNull(simpleSubstitions.get(letter)); - final String transliteratedCapitalLetter = Objects.requireNonNull(simpleSubstitions.get(capitalLetter)); + final String transliteratedLetter = Objects.requireNonNull(simpleSubstitutions.get(letter)); + final String transliteratedCapitalLetter = Objects.requireNonNull(simpleSubstitutions.get(capitalLetter)); put(letter + "ո", transliteratedLetter + "o"); put(capitalLetter + "ո", transliteratedCapitalLetter + "o"); @@ -220,7 +220,7 @@ public class ArmenianTransliterator implements Transliterator { put("Ւ",""); // Simple substitutions have last priority - for (final Map.Entry entry : simpleSubstitions.entrySet()) { + for (final Map.Entry entry : simpleSubstitutions.entrySet()) { put(entry.getKey(), entry.getValue()); put(entry.getKey().toUpperCase(), entry.getValue().toUpperCase()); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/UkranianTransliterator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/UkrainianTransliterator.java similarity index 91% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/UkranianTransliterator.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/UkrainianTransliterator.java index 280b2c6b1b..787594fe99 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/UkranianTransliterator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/UkrainianTransliterator.java @@ -20,8 +20,8 @@ import java.util.HashMap; import nodomain.freeyourgadget.gadgetbridge.util.language.SimpleTransliterator; -public class UkranianTransliterator extends SimpleTransliterator { - public UkranianTransliterator() { +public class UkrainianTransliterator extends SimpleTransliterator { + public UkrainianTransliterator() { super(new HashMap() {{ put('ґ', "gh"); put('є', "je"); put('і', "i"); put('ї', "ji"); put('Ґ', "GH"); put('Є', "JE"); put('І', "I"); put('Ї', "JI"); }}); diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml index bf6b65f5a5..866ba5a37e 100644 --- a/app/src/main/res/xml/changelog_master.xml +++ b/app/src/main/res/xml/changelog_master.xml @@ -136,7 +136,7 @@ Huawei/Honor: Fix workout processing for some devices Mi Band 9 Active: Fix activity fetching Pebble: Fix app configuration when internet helper is available but disallowed - Pebble: Fix crash when returning from exernal website from browser application + Pebble: Fix crash when returning from external website from browser application Pebble: Fix sending config to watchfaces Sony WF-1000XM4: Enable speak-to-chat support Webview: Do not check firewall when direct internet access is available @@ -274,7 +274,7 @@ Coospo HW807: Fix device discovery Even Realities G1: Fix support for some BLE names Even Realities G1: Improve connection reliability - Even Realities G1: Support non-latin charaters in notifications + Even Realities G1: Support non-latin characters in notifications Garmin: Add debug support to fetch DEVICE_XML Garmin: Add respiratory rate chart Garmin: Add temperature / diving depth charts @@ -309,7 +309,7 @@ Pebble: Support multiple weather location with system weather app (on fw 4.x) Pebble: Support night icons on TrekVolle and TimeStyle Pebble 2/2 Duo: Fix random crashes on disconnect - Pebble 2 Duo: Support getting inital battery level + Pebble 2 Duo: Support getting initial battery level Pebble: support night weather icons in TrekVolle watch face Sony Wena 3: Enable body energy Withings Steel HR: Improve initialization reliability @@ -423,7 +423,7 @@ Charts: Add additional sleep chart with sleep stages Charts: Add sleep charts overlays (hr, spo2, temperature, respiratory rate) Charts: Add training load - Charts: Compute time weighted avarage for heart rate + Charts: Compute time weighted average for heart rate Charts: Fix crash if database fetch fails Charts: Improve values text contrast Charts: Rework blood oxygen chart @@ -607,7 +607,7 @@ Charts: Restore steps balance on weekly and monthly charts Colmi R09: Add preference to toggle temperature measurements Colmi R09: Fix temperature data parsing - Colmi R0x: Add support for realtime heart rate meassurements and live activity tracking + Colmi R0x: Add support for realtime heart rate measurements and live activity tracking Garmin: Add basic fit file viewer Garmin: Add custom notification actions Garmin: Allow fake OAuth @@ -958,7 +958,7 @@ Bangle.js: Set filename on save file dialogs Bangle.js: Improve communication stability Bangle.js: Sync activity tracks - Bangle.js: remove unwanted charaters from calendar events + Bangle.js: remove unwanted characters from calendar events Femometer Vinca II: Add temperature charts Fossil/Skagen Hybrids: Remove activity fetching toasts and add finished signal Fossil/Skagen Hybrids: Use steps instead of calories for activity intensity @@ -1197,7 +1197,7 @@ Bangle.js: Send last received activity timestamp on connect (to allow sync of activity samples) Bangle.js: Allow connecting HW keyboard without closing app loader Bangle.js: Bump flavor target SDK version to 31 - Bangle.js: Fix convertion of emoji/unicode to bitmap without width/height + Bangle.js: Fix conversion of emoji/unicode to bitmap without width/height Bangle.js: Fix location listener not being cleaned up when waiting for reconnect Bangle.js: Fix memory leak from HTTP requests Bangle.js: Fix orientation changes closing app loader @@ -1346,7 +1346,7 @@ Huami: Implement proper find device Huami: Change default find band vibration pattern Flipper Zero: added duration to Intent API - Flipper Zero: fixed crash due to unregistered boradcast receiver + Flipper Zero: fixed crash due to unregistered broadcast receiver Flipper Zero: fetch firmware version from flipper Fossil Hybrid HR: Correctly initialize watchface after reset or crash Fossil Hybrid HR: Set OpenTracks track category and icon to workout type selected on watch diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/database/EntitiesTest.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/database/EntitiesTest.java index 16f6d349f3..2a23f0d628 100644 --- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/database/EntitiesTest.java +++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/database/EntitiesTest.java @@ -102,7 +102,7 @@ public class EntitiesTest extends TestBase { ActivityDescriptionDao descDao = daoSession.getActivityDescriptionDao(); assertEquals(0, descDao.count()); - List list = DBHelper.findActivityDecriptions(user, 10, 100, daoSession); + List list = DBHelper.findActivityDescriptions(user, 10, 100, daoSession); assertTrue(list.isEmpty()); ActivityDescription desc = DBHelper.createActivityDescription(user, 10, 100, daoSession); @@ -119,59 +119,59 @@ public class EntitiesTest extends TestBase { t1.setDescription("Table tennis training for Olympia"); tagList.add(t1); - list = DBHelper.findActivityDecriptions(user, 10, 100, daoSession); + list = DBHelper.findActivityDescriptions(user, 10, 100, daoSession); assertEquals(1, list.size()); ActivityDescription desc1 = list.get(0); assertEquals(desc, desc1); assertEquals(1, desc1.getTagList().size()); // check for partial range overlaps - list = DBHelper.findActivityDecriptions(user, 20, 80, daoSession); + list = DBHelper.findActivityDescriptions(user, 20, 80, daoSession); assertEquals(1, list.size()); - list = DBHelper.findActivityDecriptions(user, 5, 120, daoSession); + list = DBHelper.findActivityDescriptions(user, 5, 120, daoSession); assertEquals(1, list.size()); - list = DBHelper.findActivityDecriptions(user, 20, 120, daoSession); + list = DBHelper.findActivityDescriptions(user, 20, 120, daoSession); assertEquals(1, list.size()); - list = DBHelper.findActivityDecriptions(user, 5, 80, daoSession); + list = DBHelper.findActivityDescriptions(user, 5, 80, daoSession); assertEquals(1, list.size()); // Now with a second, adjacent ActivityDescription ActivityDescription desc2 = DBHelper.createActivityDescription(user, 101, 200, daoSession); - list = DBHelper.findActivityDecriptions(user, 10, 100, daoSession); + list = DBHelper.findActivityDescriptions(user, 10, 100, daoSession); assertEquals(1, list.size()); - list = DBHelper.findActivityDecriptions(user, 20, 80, daoSession); + list = DBHelper.findActivityDescriptions(user, 20, 80, daoSession); assertEquals(1, list.size()); - list = DBHelper.findActivityDecriptions(user, 5, 120, daoSession); + list = DBHelper.findActivityDescriptions(user, 5, 120, daoSession); assertEquals(2, list.size()); - list = DBHelper.findActivityDecriptions(user, 20, 120, daoSession); + list = DBHelper.findActivityDescriptions(user, 20, 120, daoSession); assertEquals(2, list.size()); - list = DBHelper.findActivityDecriptions(user, 5, 80, daoSession); + list = DBHelper.findActivityDescriptions(user, 5, 80, daoSession); assertEquals(1, list.size()); // Now with a third, partially overlapping ActivityDescription ActivityDescription desc3 = DBHelper.createActivityDescription(user, 5, 15, daoSession); - list = DBHelper.findActivityDecriptions(user, 10, 100, daoSession); + list = DBHelper.findActivityDescriptions(user, 10, 100, daoSession); assertEquals(2, list.size()); - list = DBHelper.findActivityDecriptions(user, 20, 80, daoSession); + list = DBHelper.findActivityDescriptions(user, 20, 80, daoSession); assertEquals(1, list.size()); - list = DBHelper.findActivityDecriptions(user, 5, 120, daoSession); + list = DBHelper.findActivityDescriptions(user, 5, 120, daoSession); assertEquals(3, list.size()); - list = DBHelper.findActivityDecriptions(user, 20, 120, daoSession); + list = DBHelper.findActivityDescriptions(user, 20, 120, daoSession); assertEquals(2, list.size()); - list = DBHelper.findActivityDecriptions(user, 5, 80, daoSession); + list = DBHelper.findActivityDescriptions(user, 5, 80, daoSession); assertEquals(2, list.size()); } diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/MessageBuilderTest.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/MessageBuilderTest.java index a3bf285df7..0eba90bb95 100644 --- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/MessageBuilderTest.java +++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/MessageBuilderTest.java @@ -39,7 +39,7 @@ public class MessageBuilderTest { } @Test - public void testUnresolveableMessage() { + public void testUnresolvableMessage() { // arrange byte[] data = GB.hexStringToByteArray("143fbcce"); when(messageFactoryMock.createMessageFromRawData(data)).thenReturn(null);