Compare commits

...

4 Commits

Author SHA1 Message Date
José Rebelo 11716c906b Allow 3rd party apps to set device settings 2022-09-25 11:55:48 +02:00
NekoBox d1e0df0832 Amazfit Neo: remove activity tracks (unsupported) 2022-09-25 11:50:24 +02:00
NekoBox ff40640a0f Amazfit Neo: fix long caller name display 2022-09-25 11:48:48 +02:00
Gabriele Monaco c2783ae82e Fixed number of days for all-day events
All events were forced to last 1 day, now longer events have their actual durations
2022-09-25 11:47:01 +02:00
8 changed files with 144 additions and 2 deletions

View File

@ -860,6 +860,7 @@ public class DeviceSpecificSettingsFragment extends PreferenceFragmentCompat imp
supportedSettings = ArrayUtils.addAll(supportedSettings, R.xml.devicesettings_chartstabs);
supportedSettings = ArrayUtils.addAll(supportedSettings, R.xml.devicesettings_device_card_activity_card_preferences);
}
supportedSettings = ArrayUtils.add(supportedSettings, R.xml.devicesettings_settings_third_party_apps);
} else if (applicationSpecificSettings.equals(DeviceSettingsActivity.MENU_ENTRY_POINTS.AUTH_SETTINGS)) { //auth settings screen
supportedSettings = ArrayUtils.insert(0, supportedSettings, coordinator.getSupportedDeviceSpecificAuthenticationSettings());
supportedSettings = ArrayUtils.addAll(supportedSettings, R.xml.devicesettings_pairingkey_explanation);

View File

@ -79,7 +79,7 @@ public class AmazfitNeoCoordinator extends HuamiCoordinator {
@Override
public boolean supportsActivityTracks() {
return true;
return false;
}
@Override

View File

@ -33,6 +33,7 @@ import java.util.List;
import java.time.LocalDateTime;
import java.time.OffsetDateTime;
import java.time.ZoneOffset;
import java.time.temporal.ChronoUnit;
import de.greenrobot.dao.query.QueryBuilder;
import nodomain.freeyourgadget.gadgetbridge.GBApplication;
@ -194,11 +195,13 @@ public class CalendarReceiver extends BroadcastReceiver {
//force the all day events to begin at midnight and last a whole day
OffsetDateTime o = OffsetDateTime.now();
LocalDateTime d = LocalDateTime.ofEpochSecond(calendarEvent.getBegin()/1000, 0, o.getOffset());
LocalDateTime fin = LocalDateTime.ofEpochSecond(calendarEvent.getEnd()/1000, 0, o.getOffset());
int numDays = (int)ChronoUnit.DAYS.between(d, fin);
o = OffsetDateTime.of(d, o.getOffset()).withHour(0);
//workaround for negative timezones
if(o.getOffset().compareTo(ZoneOffset.UTC)>0) o = o.plusDays(1);
calendarEventSpec.timestamp = (int)o.toEpochSecond();
calendarEventSpec.durationInSeconds = 24 * 60 * 60;
calendarEventSpec.durationInSeconds = 24 * 60 * 60 * numDays;
}
calendarEventSpec.description = calendarEvent.getDescription();
calendarEventSpec.location = calendarEvent.getLocation();

View File

@ -0,0 +1,110 @@
/* Copyright (C) 2022 José Rebelo
This file is part of Gadgetbridge.
Gadgetbridge is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published
by the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Gadgetbridge is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
package nodomain.freeyourgadget.gadgetbridge.externalevents;
import android.annotation.SuppressLint;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.Set;
import nodomain.freeyourgadget.gadgetbridge.GBApplication;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
public class DeviceSettingsReceiver extends BroadcastReceiver {
private static final Logger LOG = LoggerFactory.getLogger(DeviceSettingsReceiver.class);
public static final String COMMAND = "nodomain.freeyourgadget.gadgetbridge.action.SET_DEVICE_SETTING";
private static final String MAC_ADDR_PATTERN = "^([0-9a-fA-F]{2}:){5}[0-9a-fA-F]{2}$";
@Override
@SuppressLint("ApplySharedPref")
// use commit to ensure it's already applied when we call the device
public void onReceive(final Context context, final Intent intent) {
if (!COMMAND.equals(intent.getAction())) {
LOG.warn("Unexpected action {}", intent.getAction());
}
final String deviceAddress = intent.getStringExtra("device");
if (deviceAddress == null) {
LOG.warn("Missing device address");
return;
}
if (!deviceAddress.matches(MAC_ADDR_PATTERN)) {
LOG.warn("Device address '{}' does not match '{}'", deviceAddress, MAC_ADDR_PATTERN);
return;
}
final GBDevice targetDevice = GBApplication.app()
.getDeviceManager()
.getDeviceByAddress(deviceAddress);
if (targetDevice == null) {
LOG.warn("Unknown device {}", deviceAddress);
return;
}
final SharedPreferences prefs = GBApplication.getDeviceSpecificSharedPrefs(targetDevice.getAddress());
if (!prefs.getBoolean("third_party_apps_set_settings", false)) {
LOG.warn("Setting device settings from 3rd party apps not allowed for {}", deviceAddress);
return;
}
final String key = intent.getStringExtra("key");
final Object value = intent.getExtras().get("value");
if (key == null) {
LOG.warn("No key specified");
return;
}
LOG.info("Setting '{}' to '{}'", key, value);
final SharedPreferences.Editor editor = prefs.edit();
if (value == null) {
editor.remove(key);
} else if (value instanceof Integer) {
editor.putInt(key, (Integer) value);
} else if (value instanceof Boolean) {
editor.putBoolean(key, (Boolean) value);
} else if (value instanceof String) {
editor.putString(key, (String) value);
} else if (value instanceof Float) {
editor.putFloat(key, (Float) value);
} else if (value instanceof Long) {
editor.putLong(key, (Long) value);
} else if (value instanceof Set) {
editor.putStringSet(key, (Set) value);
} else {
LOG.warn("Unknown preference value type {} for {}", value.getClass(), key);
}
editor.commit();
GBApplication.deviceService().onSendConfiguration(key);
}
}

View File

@ -61,6 +61,7 @@ import nodomain.freeyourgadget.gadgetbridge.externalevents.BluetoothConnectRecei
import nodomain.freeyourgadget.gadgetbridge.externalevents.BluetoothPairingRequestReceiver;
import nodomain.freeyourgadget.gadgetbridge.externalevents.CMWeatherReceiver;
import nodomain.freeyourgadget.gadgetbridge.externalevents.CalendarReceiver;
import nodomain.freeyourgadget.gadgetbridge.externalevents.DeviceSettingsReceiver;
import nodomain.freeyourgadget.gadgetbridge.externalevents.LineageOsWeatherReceiver;
import nodomain.freeyourgadget.gadgetbridge.externalevents.MusicPlaybackReceiver;
import nodomain.freeyourgadget.gadgetbridge.externalevents.OmniJawsObserver;
@ -327,6 +328,7 @@ public class DeviceCommunicationService extends Service implements SharedPrefere
private LineageOsWeatherReceiver mLineageOsWeatherReceiver = null;
private TinyWeatherForecastGermanyReceiver mTinyWeatherForecastGermanyReceiver = null;
private OmniJawsObserver mOmniJawsObserver = null;
private final DeviceSettingsReceiver deviceSettingsReceiver = new DeviceSettingsReceiver();
private final String[] mMusicActions = {
"com.android.music.metachanged",
@ -488,6 +490,10 @@ public class DeviceCommunicationService extends Service implements SharedPrefere
IntentFilter bluetoothCommandFilter = new IntentFilter();
bluetoothCommandFilter.addAction(COMMAND_BLUETOOTH_CONNECT);
registerReceiver(bluetoothCommandReceiver, bluetoothCommandFilter);
final IntentFilter deviceSettingsIntentFilter = new IntentFilter();
deviceSettingsIntentFilter.addAction(DeviceSettingsReceiver.COMMAND);
registerReceiver(deviceSettingsReceiver, deviceSettingsIntentFilter);
}
private DeviceSupportFactory getDeviceSupportFactory() {
@ -1279,6 +1285,7 @@ public class DeviceCommunicationService extends Service implements SharedPrefere
GB.removeNotification(GB.NOTIFICATION_ID, this); // need to do this because the updated notification won't be cancelled when service stops
unregisterReceiver(bluetoothCommandReceiver);
unregisterReceiver(deviceSettingsReceiver);
}
@Override

View File

@ -33,6 +33,7 @@ import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiService;
import nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitneo.AmazfitNeoFWHelper;
import nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandCoordinator;
import nodomain.freeyourgadget.gadgetbridge.model.ActivityUser;
import nodomain.freeyourgadget.gadgetbridge.model.CallSpec;
import nodomain.freeyourgadget.gadgetbridge.model.NotificationSpec;
import nodomain.freeyourgadget.gadgetbridge.service.btle.BLETypeConversions;
import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
@ -157,6 +158,15 @@ public class AmazfitNeoSupport extends MiBand5Support {
onEnableRealtimeHeartRateMeasurement(false); //stop test after single measurement, disable HR notify
}
@Override
public void onSetCallState(CallSpec callSpec) {
if (callSpec.name != null)
if (callSpec.name.length() > 7) //if char 0 is number, +, ( or ) and char 1 is a number it renders in bold scrolling font with letters stripped, else it renders in thin font and displays 'incoming call' if the lengh is > 7
if (!((Character.isDigit(callSpec.name.charAt(0)) || callSpec.name.charAt(0) == '+' || callSpec.name.charAt(0) == '(' || callSpec.name.charAt(0) == ')') && Character.isDigit(callSpec.name.charAt(1))))
callSpec.name = callSpec.name.substring(0, 7);
super.onSetCallState(callSpec);
}
@Override
public HuamiFWHelper createFWHelper(Uri uri, Context context) throws IOException {
return new AmazfitNeoFWHelper(uri, context);

View File

@ -726,6 +726,8 @@
<string name="pref_summary_keep_data_on_device">Will keep activity data on the Mi Band even after synchronization. Useful if GB is used together with other apps.</string>
<string name="pref_title_low_latency_fw_update">Use low-latency mode for firmware flashing</string>
<string name="pref_summary_low_latency_fw_update">This might help on devices where firmware flashing fails.</string>
<string name="pref_title_third_party_app_device_settings">Allow 3rd party apps to change settings</string>
<string name="pref_summary_third_party_app_device_settings">Allow other installed 3rd party apps to set device settings through intents.</string>
<string name="live_activity_steps_history">Steps history</string>
<string name="live_activity_current_steps_per_minute">Current steps/min</string>
<string name="live_activity_total_steps">Total steps</string>

View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<SwitchPreference
android:icon="@drawable/ic_developer_mode"
android:defaultValue="false"
android:key="third_party_apps_set_settings"
android:summary="@string/pref_summary_third_party_app_device_settings"
android:title="@string/pref_title_third_party_app_device_settings" />
</androidx.preference.PreferenceScreen>