MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-06-18 11:00:09 +02:00
Code Releases Wiki Activity

Implemented better message preview, added ability to specify high-level alert by category

Browse Source
This commit is contained in:
foxstidious 2023-10-08 15:55:55 -04:00 committed by José Rebelo
parent 11bf0acf32
commit 4dc10d1d02
10 changed files with 168 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
View File

@ -221,6 +221,16 @@ public class DeviceSettingsPreferenceConst {
public static final String PREF_AUTOLIGHT = "autolight";
public static final String PREF_PREVIEW_MESSAGE_IN_TITLE = "preview_message_in_title";
public static final String PREF_CASIO_ALERT_CALENDAR = "casio_alert_calendar";
public static final String PREF_CASIO_ALERT_CALL = "casio_alert_call";
public static final String PREF_CASIO_ALERT_EMAIL = "casio_alert_email";
public static final String PREF_CASIO_ALERT_OTHER = "casio_alert_other";
public static final String PREF_CASIO_ALERT_SMS = "casio_alert_sms";
public static final String PREF_AUTOREMOVE_MESSAGE = "autoremove_message";
public static final String PREF_AUTOREMOVE_NOTIFICATIONS = "autoremove_notifications";
public static final String PREF_SCREEN_ON_ON_NOTIFICATIONS = "screen_on_on_notifications";

5
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
View File

@ -399,6 +399,11 @@ public class DeviceSpecificSettingsFragment extends AbstractPreferenceFragment i
addPreferenceHandlerFor(PREF_AUTOREMOVE_MESSAGE);
addPreferenceHandlerFor(PREF_AUTOREMOVE_NOTIFICATIONS);
addPreferenceHandlerFor(PREF_PREVIEW_MESSAGE_IN_TITLE);
addPreferenceHandlerFor(PREF_CASIO_ALERT_EMAIL);
addPreferenceHandlerFor(PREF_CASIO_ALERT_SMS);
addPreferenceHandlerFor(PREF_CASIO_ALERT_CALL);
addPreferenceHandlerFor(PREF_CASIO_ALERT_CALENDAR);
addPreferenceHandlerFor(PREF_CASIO_ALERT_OTHER);
addPreferenceHandlerFor(PREF_SCREEN_ON_ON_NOTIFICATIONS);
addPreferenceHandlerFor(PREF_WORKOUT_KEEP_SCREEN_ON);
addPreferenceHandlerFor(PREF_KEY_VIBRATION);

7
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/gbx100/CasioGBX100DeviceCoordinator.java
View File

@ -165,7 +165,12 @@ public class CasioGBX100DeviceCoordinator extends CasioDeviceCoordinator {
R.xml.devicesettings_fake_ring_duration,
R.xml.devicesettings_autoremove_message,
R.xml.devicesettings_transliteration,
R.xml.devicesettings_preview_message_in_title
R.xml.devicesettings_preview_message_in_title,
R.xml.devicesettings_casio_alert_calendar,
R.xml.devicesettings_casio_alert_call,
R.xml.devicesettings_casio_alert_email,
R.xml.devicesettings_casio_alert_other,
R.xml.devicesettings_casio_alert_sms
};
}

152
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/CasioGBX100DeviceSupport.java
View File

@ -32,8 +32,10 @@ import org.threeten.bp.ZonedDateTime;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
@ -74,6 +76,11 @@ import nodomain.freeyourgadget.gadgetbridge.util.GB;
import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_AUTOLIGHT;
import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_AUTOREMOVE_MESSAGE;
import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_CASIO_ALERT_CALENDAR;
import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_CASIO_ALERT_CALL;
import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_CASIO_ALERT_EMAIL;
import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_CASIO_ALERT_OTHER;
import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_CASIO_ALERT_SMS;
import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_FAKE_RING_DURATION;
import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_FIND_PHONE;
import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_FIND_PHONE_DURATION;
@ -258,14 +265,65 @@ public class CasioGBX100DeviceSupport extends Casio2C2DSupport implements Shared
}
}
/**
* Sends a notification to the watch module. Overloaded - this method does not specify a subtitle
* since subtitle isn't really used yet.
* @param icon Icon to use - see {@link CasioConstants}
* @param sender Sender (null if none)
* @param title Notification title (null if none)
* @param message Message body (null if none)
* @param id Notification id
* @param delete true if sending a delete of notification to the device
*/
private void showNotification(byte icon, String sender, String title, String message, int id, boolean delete) {
showNotification(icon, sender, title, null, message, id, delete);
}
/**
* Sends a notification to the watch module. Overloaded - this method does not specify a subtitle
* @param icon Icon to use - see {@link CasioConstants}
* @param sender Sender (null if none)
* @param title Notification title (null if none)
* @param subtitle Message subtitle (null if none)
* @param message Message body (null if none)
* @param id Notification id
*/
private void showNotification(byte icon, String sender, String title, String subtitle, String message, int id, boolean delete) {
SharedPreferences sharedPreferences = GBApplication.getDeviceSpecificSharedPrefs(getDevice().getAddress());
boolean showMessagePreview = sharedPreferences.getBoolean(PREF_PREVIEW_MESSAGE_IN_TITLE, true);
if (showMessagePreview) {
title = title + "-" + message;
title = title.substring(0, Math.min(title.length(), 30));
title = title + "..";
boolean shouldAlert = true;
switch (icon) {
case CasioConstants.CATEGORY_EMAIL:
shouldAlert = sharedPreferences.getBoolean(PREF_CASIO_ALERT_EMAIL, true);
break;
case CasioConstants.CATEGORY_OTHER:
shouldAlert = sharedPreferences.getBoolean(PREF_CASIO_ALERT_OTHER, true);
break;
case CasioConstants.CATEGORY_SNS:
sharedPreferences.getBoolean(PREF_CASIO_ALERT_SMS, true);
break;
case CasioConstants.CATEGORY_INCOMING_CALL:
sharedPreferences.getBoolean(PREF_CASIO_ALERT_CALL, true);
break;
case CasioConstants.CATEGORY_SCHEDULE_AND_ALARM:
sharedPreferences.getBoolean(PREF_CASIO_ALERT_CALENDAR, true);
break;
}
// If not a call or email, check the sender and if null, promote the title and message preview
// as subtitle
if (showMessagePreview && icon != CasioConstants.CATEGORY_INCOMING_CALL && icon != CasioConstants.CATEGORY_EMAIL) {
if (sender == null) {
// Shift title to sender slot
sender = title;
}
//Shift content to title
if (message != null) {
title = message.substring(0, Math.min(message.length(), 18)) + "..";
}
}
byte[] titleBytes = new byte[0];
if(title != null)
titleBytes = title.getBytes(StandardCharsets.UTF_8);
@ -278,68 +336,27 @@ public class CasioGBX100DeviceSupport extends Casio2C2DSupport implements Shared
if(sender != null)
senderBytes = sender.getBytes(StandardCharsets.UTF_8);
byte[] subtitleBytes = new byte[0];
if (subtitle != null)
subtitleBytes = subtitle.getBytes(StandardCharsets.UTF_8);
byte[] arr = new byte[22];
arr[0] = (byte)(id & 0xff);
arr[1] = (byte) ((id >> 8) & 0xff);
arr[2] = (byte) ((id >> 16) & 0xff);
arr[3] = (byte) ((id >> 24) & 0xff);
arr[4] = delete ? (byte) 0x02 : (byte) 0x00;
arr[5] = (byte) 0x01; // Set to 0x00 to not vibrate/ring for this notification
if (shouldAlert) {
arr[5] = (byte) 0x01; // Set to 0x0 to vibrate/ring for this notification
} else {
arr[5] = (byte) 0x00; // Set to 0x00 to not vibrate/ring for this notification
}
arr[6] = icon;
ZonedDateTime timestamp = ZonedDateTime.now();
String deviceName = getDevice().getName();
// It seems that GBD-200 has a different timestamp format than other variants.
if (deviceName.endsWith(CasioGBX100DeviceCoordinator.GBD_200_SUB_MODEL)) {
// These bytes are likely for designating year, but GBD-200 does not display them
// For now leave as 0's until exact encoding can be verified
arr[7] = (byte) 0x00;
arr[8] = (byte) 0x00;
arr[9] = (byte) 0x00;
arr[10] = (byte) 0x00;
// Bytes 11 - 19 are timestamp
// Encode the timestamp of the notification
// Month
arr[11] = (byte) (timestamp.getMonthValue() / 10 + 3); // Tens digit, but offset by 3 for some reason
arr[12] = (byte) (timestamp.getMonthValue() % 10);
// Day
arr[13] = (byte) (timestamp.getDayOfMonth() / 10 + 3); // Tens digit, but offset by 3 for some reason
arr[14] = (byte) (timestamp.getDayOfMonth() % 10);
// ??
arr[15] = (byte) 0; // Not sure what this byte is for?
// Hour
arr[16] = (byte) (timestamp.getHour() / 10 + 3); // Tens digit, but offset by 3 for some reason
arr[17] = (byte) (timestamp.getHour() % 10);
// Minute
arr[18] = (byte) (timestamp.getMinute() / 10 + 3);// Tens digit, but offset by 3 for some reason
arr[19] = (byte) (timestamp.getMinute() % 10);
// Thes bytes are likely for designating seconds, but GBD-200 does not display them.
// For now leave as 0's until exact encoding can be verified.
arr[20] = (byte) 0x00;
arr[21] = (byte) 0x00;
} else {
// Other devices appear to use ASCII from initial investigation, information below
// These bytes contain a timestamp, not yet decoded / implemented
// ASCII Codes:
/*arr[7] = (byte) 0x32; // 2
arr[8] = (byte) 0x30; // 0
arr[9] = (byte) 0x32; // 2
arr[10] = (byte) 0x30; // 0
arr[11] = (byte) 0x31; // 1
arr[12] = (byte) 0x31; // 1
arr[13] = (byte) 0x31; // 1
arr[14] = (byte) 0x33; // 3
arr[15] = (byte) 0x54; // T
arr[16] = (byte) 0x30; // 0
arr[17] = (byte) 0x39; // 9
arr[18] = (byte) 0x33; // 3
arr[19] = (byte) 0x31; // 1
arr[20] = (byte) 0x35; // 5
arr[21] = (byte) 0x33;*/// 3
}
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd'T'HHmmss");
String timestamp = dateFormat.format(new Date());
System.arraycopy(timestamp.getBytes(), 0, arr, 7, 15);
byte[] copy = Arrays.copyOf(arr, arr.length + 2);
copy[copy.length-2] = 0;
@ -360,9 +377,17 @@ public class CasioGBX100DeviceSupport extends Casio2C2DSupport implements Shared
System.arraycopy(titleBytes, 0, copy, copy.length - titleBytes.length, titleBytes.length);
}
copy = Arrays.copyOf(copy, copy.length + 2);
// Subtitle
copy[copy.length-2] = 0;
copy[copy.length-1] = 0;
//subtitle is currently not supported
if (subtitleBytes.length > 0) {
copy = Arrays.copyOf(copy, copy.length + subtitleBytes.length);
copy[copy.length-2-subtitleBytes.length] = (byte)(subtitleBytes.length & 0xff);
copy[copy.length-1-subtitleBytes.length] = (byte)((subtitleBytes.length >> 8) & 0xff);
System.arraycopy(subtitleBytes, 0, copy, copy.length - subtitleBytes.length, subtitleBytes.length);
}
copy = Arrays.copyOf(copy, copy.length + 2);
copy[copy.length-2] = 0;
copy[copy.length-1] = 0;
@ -395,6 +420,8 @@ public class CasioGBX100DeviceSupport extends Casio2C2DSupport implements Shared
icon = CasioConstants.CATEGORY_SCHEDULE_AND_ALARM;
break;
case GENERIC_EMAIL:
case GMAIL:
case GOOGLE_INBOX:
icon = CasioConstants.CATEGORY_EMAIL;
break;
case GENERIC_SMS:
@ -539,7 +566,7 @@ public class CasioGBX100DeviceSupport extends Casio2C2DSupport implements Shared
public void onSetCallState(final CallSpec callSpec) {
switch (callSpec.command) {
case CallSpec.CALL_INCOMING:
showNotification(CasioConstants.CATEGORY_INCOMING_CALL, "Phone", callSpec.name, callSpec.number, mLastCallId, false);
showNotification(CasioConstants.CATEGORY_INCOMING_CALL, callSpec.name, callSpec.number, "Phone Call", mLastCallId, false);
SharedPreferences sharedPreferences = GBApplication.getDeviceSpecificSharedPrefs(getDevice().getAddress());
boolean fakeRingDuration = sharedPreferences.getBoolean(PREF_FAKE_RING_DURATION, false);
if(fakeRingDuration && mFakeRingDurationCounter < CasioConstants.CASIO_FAKE_RING_RETRIES) {
@ -671,6 +698,11 @@ public class CasioGBX100DeviceSupport extends Casio2C2DSupport implements Shared
// No action, we check the shared preferences when the device tries to ring the phone.
break;
case PREF_PREVIEW_MESSAGE_IN_TITLE:
case PREF_CASIO_ALERT_CALENDAR:
case PREF_CASIO_ALERT_CALL:
case PREF_CASIO_ALERT_EMAIL:
case PREF_CASIO_ALERT_OTHER:
case PREF_CASIO_ALERT_SMS:
// No action, we check it when message is received
break;
default:

10
app/src/main/res/values/strings.xml
View File

@ -334,6 +334,16 @@
<string name="pref_summary_custom_deviceicon">Show a device specific Android notification icon instead the Gadgetbridge icon when connected</string>
<string name="pref_title_preview_message_in_title">Show a preview of the message in the title</string>
<string name="pref_summary_preview_message_in_title">Shows a preview of the message in the title of a notification as allowed by the device</string>
<string name="pref_title_casio_alert_calendar">Alert for calendar notifications</string>
<string name="pref_summary_casio_alert_calendar">Alert (vibrate/beep) for calendar notifications</string>
<string name="pref_title_casio_alert_call">Alert for calendar calls</string>
<string name="pref_summary_casio_alert_call">Alert (vibrate/beep) for incoming calls</string>
<string name="pref_title_casio_alert_email">Alert for email notifications</string>
<string name="pref_summary_casio_alert_email">Alert (vibrate/beep) for email notifications</string>
<string name="pref_title_casio_alert_sms">Alert for SMS notifications</string>
<string name="pref_summary_casio_alert_sms">Alert (vibrate/beep) for SMS (text message) notifications</string>
<string name="pref_title_casio_alert_other">Alert for "other" notifications</string>
<string name="pref_summary_casio_alert_other">Alert (vibrate/beep) for notifications in the "other" category</string>
<string name="pref_title_autoremove_notifications">Autoremove dismissed notifications</string>
<string name="pref_summary_autoremove_notifications">Notifications are automatically removed from the device when dismissed from the phone</string>
<string name="pref_title_screen_on_on_notifications">Screen On on Notifications</string>

9
app/src/main/res/xml/devicesettings_casio_alert_calendar.xml Normal file
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:defaultValue="true"
android:icon="@android:drawable/ic_menu_my_calendar"
android:key="casio_alert_calendar"
android:summary="@string/pref_summary_casio_alert_calendar"
android:title="@string/pref_title_casio_alert_calendar" />
</androidx.preference.PreferenceScreen>

9
app/src/main/res/xml/devicesettings_casio_alert_call.xml Normal file
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:defaultValue="true"
android:icon="@android:drawable/ic_menu_call"
android:key="casio_alert_call"
android:summary="@string/pref_summary_casio_alert_call"
android:title="@string/pref_title_casio_alert_call" />
</androidx.preference.PreferenceScreen>

9
app/src/main/res/xml/devicesettings_casio_alert_email.xml Normal file
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:defaultValue="true"
android:icon="@android:drawable/ic_dialog_email"
android:key="casio_alert_email"
android:summary="@string/pref_summary_casio_alert_email"
android:title="@string/pref_title_casio_alert_email" />
</androidx.preference.PreferenceScreen>

9
app/src/main/res/xml/devicesettings_casio_alert_other.xml Normal file
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:defaultValue="true"
android:icon="@android:drawable/ic_menu_help"
android:key="casio_alert_other"
android:summary="@string/pref_summary_casio_alert_other"
android:title="@string/pref_title_casio_alert_other" />
</androidx.preference.PreferenceScreen>

9
app/src/main/res/xml/devicesettings_casio_alert_sms.xml Normal file
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:defaultValue="true"
android:icon="@drawable/ic_message_outline"
android:key="casio_alert_other"
android:summary="@string/pref_summary_casio_alert_other"
android:title="@string/pref_title_casio_alert_other" />
</androidx.preference.PreferenceScreen>