demus/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge.git synced 2025-01-10 17:11:56 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Zepp OS: Fix notification icon for SMS

Browse Source
This commit is contained in:
José Rebelo 2022-10-31 12:01:19 +00:00
parent ef50599179
commit fffb1462c7
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DebugActivity.java
View File

@ -186,7 +186,11 @@ public class DebugActivity extends AbstractGBActivity {
notificationSpec.body = testString; notificationSpec.body = testString;
notificationSpec.sender = testString; notificationSpec.sender = testString;
notificationSpec.subject = testString; notificationSpec.subject = testString;
notificationSpec.sourceAppId = BuildConfig.APPLICATION_ID; if (notificationSpec.type != NotificationType.GENERIC_SMS) {
// SMS notifications don't have a source app ID when sent by the SMSReceiver,
// so let's not set it here as well for consistency
notificationSpec.sourceAppId = BuildConfig.APPLICATION_ID;
}
notificationSpec.sourceName = getApplicationContext().getApplicationInfo() notificationSpec.sourceName = getApplicationContext().getApplicationInfo()
.loadLabel(getApplicationContext().getPackageManager()) .loadLabel(getApplicationContext().getPackageManager())
.toString(); .toString();

5
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021Support.java
View File

@ -76,6 +76,7 @@ import java.util.Map;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import nodomain.freeyourgadget.gadgetbridge.BuildConfig;
import nodomain.freeyourgadget.gadgetbridge.GBApplication; import nodomain.freeyourgadget.gadgetbridge.GBApplication;
import nodomain.freeyourgadget.gadgetbridge.database.DBHelper; import nodomain.freeyourgadget.gadgetbridge.database.DBHelper;
import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventCallControl; import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventCallControl;
@ -646,6 +647,10 @@ public abstract class Huami2021Support extends HuamiSupport {
// app package // app package
if (notificationSpec.sourceAppId != null) { if (notificationSpec.sourceAppId != null) {
baos.write(notificationSpec.sourceAppId.getBytes(StandardCharsets.UTF_8)); baos.write(notificationSpec.sourceAppId.getBytes(StandardCharsets.UTF_8));
} else {
// Send the GB package name, otherwise the last notification icon will
// be used wrongly (eg. when receiving an SMS)
baos.write(BuildConfig.APPLICATION_ID.getBytes(StandardCharsets.UTF_8));
} }
baos.write(0); baos.write(0);