From 48f01ae708e0c3eafde3e34a900a070f4faaf660 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Tue, 26 Apr 2022 09:42:41 +0100
Subject: [PATCH] eset graphics colors before rendering a message (possibly fix
 #1752)

---
 apps/messages/ChangeLog     | 1 +
 apps/messages/app.js        | 8 ++++----
 apps/messages/metadata.json | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/apps/messages/ChangeLog b/apps/messages/ChangeLog
index a3ee37326..47697277c 100644
--- a/apps/messages/ChangeLog
+++ b/apps/messages/ChangeLog
@@ -47,3 +47,4 @@
 0.32: Added an option to allow quiet mode to override message auto-open
 0.33: Timeout from the message list screen if the message being displayed is removed and there is a timer going
 0.34: Don't buzz for 'map' update messages
+0.35: Reset graphics colors before rendering a message (possibly fix #1752)
diff --git a/apps/messages/app.js b/apps/messages/app.js
index 85d818bd5..644f780b4 100644
--- a/apps/messages/app.js
+++ b/apps/messages/app.js
@@ -89,7 +89,7 @@ function getNegImage() {
 function getMessageImage(msg) {
   if (msg.img) return atob(msg.img);
   var s = (msg.src||"").toLowerCase();
-  if (s=="alarm" || s =="alarmclockreceiver") return atob("GBjBAP////8AAAAAAAACAEAHAOAefng5/5wTgcgHAOAOGHAMGDAYGBgYGBgYGBgYGBgYDhgYBxgMATAOAHAHAOADgcAB/4AAfgAAAAAAAAA=");  
+  if (s=="alarm" || s =="alarmclockreceiver") return atob("GBjBAP////8AAAAAAAACAEAHAOAefng5/5wTgcgHAOAOGHAMGDAYGBgYGBgYGBgYGBgYDhgYBxgMATAOAHAHAOADgcAB/4AAfgAAAAAAAAA=");
   if (s=="bibel") return atob("GBgBAAAAA//wD//4D//4H//4H/f4H/f4H+P4H4D4H4D4H/f4H/f4H/f4H/f4H/f4H//4H//4H//4GAAAEAAAEAAACAAAB//4AAAA");
   if (s=="calendar") return atob("GBiBAAAAAAAAAAAAAA//8B//+BgAGBgAGBgAGB//+B//+B//+B9m2B//+B//+Btm2B//+B//+Btm+B//+B//+A//8AAAAAAAAAAAAA==");
   if (s=="corona-warn") return atob("GBgBAAAAABwAAP+AAf/gA//wB/PwD/PgDzvAHzuAP8EAP8AAPAAAPMAAP8AAH8AAHzsADzuAB/PAB/PgA//wAP/gAH+AAAwAAAAA");
@@ -193,7 +193,7 @@ function showMapMessage(msg) {
     ]},
     {type:"txt", font:"6x8:2", label:eta }
   ]});
-  g.clearRect(Bangle.appRect);
+  g.reset().clearRect(Bangle.appRect);
   layout.render();
   Bangle.setUI("updown",function() {
     // any input to mark as not new and return to menu
@@ -268,7 +268,7 @@ function showMusicMessage(msg) {
     ]}:{},
     {type:"txt", font:"6x8:2", label:msg.dur?fmtTime(msg.dur):"--:--" }
   ]});
-  g.clearRect(Bangle.appRect);
+  g.reset().clearRect(Bangle.appRect);
   layout.render();
 
   updateLabelsInterval = setInterval(function() {
@@ -434,7 +434,7 @@ function showMessage(msgid) {
     } },
     {type:"h",fillx:1, c: buttons}
   ]});
-  g.clearRect(Bangle.appRect);
+  g.reset().clearRect(Bangle.appRect);
   layout.render();
   // ensure button-press on Bangle.js 2 takes us back
   if (process.env.HWVERSION>1) Bangle.btnWatches = [
diff --git a/apps/messages/metadata.json b/apps/messages/metadata.json
index ffb4f8b8a..9a2b0a880 100644
--- a/apps/messages/metadata.json
+++ b/apps/messages/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "messages",
   "name": "Messages",
-  "version": "0.34",
+  "version": "0.35",
   "description": "App to display notifications from iOS and Gadgetbridge/Android",
   "icon": "app.png",
   "type": "app",