From 1c93c4bd01b3b5e725487401eaebb701c5fd5f5d Mon Sep 17 00:00:00 2001
From: storm64 <github@storm64.de>
Date: Thu, 7 Apr 2022 01:28:15 +0200
Subject: [PATCH] Revert "massages: Add option to disable icon flashing"

This reverts commit 80d35e4e33646a7395de1451c218b84cab081f63.
---
 apps/messages/ChangeLog     |  1 -
 apps/messages/README.md     |  1 -
 apps/messages/metadata.json |  2 +-
 apps/messages/settings.js   |  6 ------
 apps/messages/widget.js     | 11 ++++-------
 5 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/apps/messages/ChangeLog b/apps/messages/ChangeLog
index 3e676c21e..092a38eb6 100644
--- a/apps/messages/ChangeLog
+++ b/apps/messages/ChangeLog
@@ -43,4 +43,3 @@
 0.28: Option to auto-unlock the watch when a new message arrives
 0.29: Fix message list overwrites on Bangle.js 1 (fix #1642)
 0.30: Add new Icons (Youtube, Twitch, MS TODO, Teams, Snapchat, Signal, Post & DHL, Nina, Lieferando, Kalender, Discord, Corona Warn, Bibel)
-0.31: Option to disable icon flashing
diff --git a/apps/messages/README.md b/apps/messages/README.md
index da2701f35..780d8e50b 100644
--- a/apps/messages/README.md
+++ b/apps/messages/README.md
@@ -21,7 +21,6 @@ is chosen if there isn't much message text, but this specifies the smallest the
 it starts getting clipped.
 * `Auto-Open Music` - Should the app automatically open when the phone starts playing music?
 * `Unlock Watch` - Should the app unlock the watch when a new message arrives, so you can touch the buttons at the bottom of the app?
-* `Flash Icon` - Toggle flashing of the widget icon.
 
 ## New Messages
 
diff --git a/apps/messages/metadata.json b/apps/messages/metadata.json
index 5c1e67702..dfeedaef7 100644
--- a/apps/messages/metadata.json
+++ b/apps/messages/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "messages",
   "name": "Messages",
-  "version": "0.31",
+  "version": "0.30",
   "description": "App to display notifications from iOS and Gadgetbridge/Android",
   "icon": "app.png",
   "type": "app",
diff --git a/apps/messages/settings.js b/apps/messages/settings.js
index cc0030ec5..754347f19 100644
--- a/apps/messages/settings.js
+++ b/apps/messages/settings.js
@@ -7,7 +7,6 @@
     settings.unlockWatch=!!settings.unlockWatch;
     settings.openMusic=!!settings.openMusic;
     settings.maxUnreadTimeout=240;
-    if (settings.flash===undefined) settings.flash=true;
     return settings;
   }
   function updateSetting(setting, value) {
@@ -48,11 +47,6 @@
       format: v => v?/*LANG*/'Yes':/*LANG*/'No',
       onchange: v => updateSetting("unlockWatch", v)
     },
-    /*LANG*/'Flash Icon': {
-      value: !!settings().flash,
-      format: v => v?/*LANG*/'Yes':/*LANG*/'No',
-      onchange: v => updateSetting("flash", v)
-    },
   };
   E.showMenu(mainmenu);
 })
diff --git a/apps/messages/widget.js b/apps/messages/widget.js
index 4b368ffd6..3ac726e77 100644
--- a/apps/messages/widget.js
+++ b/apps/messages/widget.js
@@ -1,5 +1,5 @@
 WIDGETS["messages"]={area:"tl", width:0, iconwidth:24,
-draw:function(recall) {
+draw:function() {
   // If we had a setTimeout queued from the last time we were called, remove it
   if (WIDGETS["messages"].i) {
     clearTimeout(WIDGETS["messages"].i);
@@ -8,18 +8,15 @@ draw:function(recall) {
   Bangle.removeListener('touch', this.touch);
   if (!this.width) return;
   var c = (Date.now()-this.t)/1000;
+  g.reset().clearRect(this.x, this.y, this.x+this.width, this.y+this.iconwidth);
+  g.drawImage((c&1) ? atob("GBiBAAAAAAAAAAAAAAAAAAAAAB//+DAADDAADDAADDwAPD8A/DOBzDDn/DA//DAHvDAPvjAPvjAPvjAPvh///gf/vAAD+AAB8AAAAA==") : atob("GBiBAAAAAAAAAAAAAAAAAAAAAB//+D///D///A//8CP/xDj/HD48DD+B8D/D+D/3vD/vvj/vvj/vvj/vvh/v/gfnvAAD+AAB8AAAAA=="), this.x, this.y);
   let settings = require('Storage').readJSON("messages.settings.json", true) || {};
-  if (settings.flash===undefined) settings.flash = true;
-  if (recall !== true || settings.flash) {
-    g.reset().clearRect(this.x, this.y, this.x+this.width, this.y+23);
-    g.drawImage(settings.flash && (c&1) ? atob("GBiBAAAAAAAAAAAAAAAAAAAAAB//+DAADDAADDAADDwAPD8A/DOBzDDn/DA//DAHvDAPvjAPvjAPvjAPvh///gf/vAAD+AAB8AAAAA==") : atob("GBiBAAAAAAAAAAAAAAAAAAAAAB//+D///D///A//8CP/xDj/HD48DD+B8D/D+D/3vD/vvj/vvj/vvj/vvh/v/gfnvAAD+AAB8AAAAA=="), this.x, this.y-1);
-  }
   if (settings.repeat===undefined) settings.repeat = 4;
   if (c<120 && (Date.now()-this.l)>settings.repeat*1000) {
     this.l = Date.now();
     WIDGETS["messages"].buzz(); // buzz every 4 seconds
   }
-  WIDGETS["messages"].i=setTimeout(()=>WIDGETS["messages"].draw(true), 1000);
+  WIDGETS["messages"].i=setTimeout(()=>WIDGETS["messages"].draw(), 1000);
   if (process.env.HWVERSION>1) Bangle.on('touch', this.touch);
 },show:function(quiet) {
   WIDGETS["messages"].t=Date.now(); // first time