From 86334750b09d894382f15c63636f5267c8ce9f85 Mon Sep 17 00:00:00 2001
From: Joe Keenan <joe@flyingdiver.com>
Date: Tue, 12 Apr 2022 14:16:48 -0400
Subject: [PATCH 1/3] More changes

---
 Pushover.indigoPlugin/Contents/Info.plist     |   4 +-
 .../Contents/Server Plugin/Actions.xml        |   5 +
 .../Contents/Server Plugin/PluginConfig.xml   |   4 +-
 .../Contents/Server Plugin/plugin.py          | 154 +++++++++---------
 4 files changed, 86 insertions(+), 81 deletions(-)

diff --git a/Pushover.indigoPlugin/Contents/Info.plist b/Pushover.indigoPlugin/Contents/Info.plist
index ebe161d..13a221c 100644
--- a/Pushover.indigoPlugin/Contents/Info.plist
+++ b/Pushover.indigoPlugin/Contents/Info.plist
@@ -3,9 +3,9 @@
 <plist version="1.0">
 <dict>
 	<key>PluginVersion</key>
-	<string>1.7.1</string>
+	<string>2022.0.0</string>
 	<key>ServerApiVersion</key>
-	<string>2.0</string>
+	<string>3.0</string>
 	<key>IwsApiVersion</key>
 	<string>1.0.0</string>
 	<key>CFBundleDisplayName</key>
diff --git a/Pushover.indigoPlugin/Contents/Server Plugin/Actions.xml b/Pushover.indigoPlugin/Contents/Server Plugin/Actions.xml
index 194e1a5..7b4d4d8 100644
--- a/Pushover.indigoPlugin/Contents/Server Plugin/Actions.xml	
+++ b/Pushover.indigoPlugin/Contents/Server Plugin/Actions.xml	
@@ -101,6 +101,11 @@
 		<Name>Cancel Pushover Emergency-Priority Notification</Name>
 		<CallbackMethod>cancel</CallbackMethod>
 		<ConfigUI>
+            <Field id="appToken" type="menu">
+                <Label>App Token:</Label>
+                <List method="get_app_tokens" dynamicReload="true" class="self" filter=""/>
+                <CallbackMethod>menuChanged</CallbackMethod>
+            </Field>
 			<Field id="cancelTag" type="textfield" default="">
 				<Label>Tag:</Label>
 			</Field>
diff --git a/Pushover.indigoPlugin/Contents/Server Plugin/PluginConfig.xml b/Pushover.indigoPlugin/Contents/Server Plugin/PluginConfig.xml
index e8fa3f7..040adc2 100644
--- a/Pushover.indigoPlugin/Contents/Server Plugin/PluginConfig.xml	
+++ b/Pushover.indigoPlugin/Contents/Server Plugin/PluginConfig.xml	
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <PluginConfig>
-	<Field id="apiToken" type="textfield" default="" hidden="true">
+	<Field id="apiToken" type="textfield" default="">
 		<Label>API Token:</Label>
 	</Field>
-	<Field id="hlpApiToken" type="label" fontSize="mini" alignWithControl="true"  hidden="true">
+	<Field id="hlpApiToken" type="label" fontSize="mini" alignWithControl="true">
 		<Label>Required, can be created at https://pushover.net/apps/clone/indigo_domotics</Label>
 	</Field>
 	<Field id="userKey" type="textfield" default="">
diff --git a/Pushover.indigoPlugin/Contents/Server Plugin/plugin.py b/Pushover.indigoPlugin/Contents/Server Plugin/plugin.py
index be35492..850b563 100644
--- a/Pushover.indigoPlugin/Contents/Server Plugin/plugin.py	
+++ b/Pushover.indigoPlugin/Contents/Server Plugin/plugin.py	
@@ -7,51 +7,54 @@
 import json
 from collections import OrderedDict
 
+
 class Plugin(indigo.PluginBase):
 
     def __init__(self, pluginId, pluginDisplayName, pluginVersion, pluginPrefs):
         indigo.PluginBase.__init__(self, pluginId, pluginDisplayName, pluginVersion, pluginPrefs)
-        try:
-            self.logLevel = int(self.pluginPrefs[u"logLevel"])
-        except:
-            self.logLevel = logging.INFO
+        self.logLevel = int(pluginPrefs.get("logLevel", logging.INFO))
         self.indigo_log_handler.setLevel(self.logLevel)
-        self.logger.debug(u"logLevel = {}".format(self.logLevel))
+        self.logger.debug(f"logLevel = {self.logLevel}")
 
+        self.sounds = None
 
-    def __del__(self):
-        indigo.PluginBase.__del__(self)
-
-    def startup(self):
-        self.logger.debug(u"startup called")
-
-        savedList = self.pluginPrefs.get(u"appTokens", None)
+        savedList = pluginPrefs.get("appTokens", None)
         if savedList:
             self.appTokenList = json.loads(savedList)
         else:
-            self.appTokenList = {}        
+            apiToken = pluginPrefs.get('apiToken', None)
+            if not apiToken:
+                self.logger.warning(f"No App Tokens configured")
+                self.appTokenList = {}
+                return
+            else:
+                self.appTokenList['Default'] = apiToken
 
+    def startup(self):
+        self.logger.debug(f"startup called")
         try:
-            appToken = self.pluginPrefs['apiToken']
-            r = requests.get("https://api.pushover.net/1/sounds.json?token={}".format(appToken))
-            customdecoder = json.JSONDecoder(object_pairs_hook=OrderedDict)
+            r = requests.get(f"https://api.pushover.net/1/sounds.json?token={self.appTokenList['Default']}")
+            customdecoder = json.JSONDecoder(object_hook=OrderedDict)
             rdict = customdecoder.decode(r.text)
             self.sounds = rdict['sounds']
         except Exception as err:
-            self.logger.warning(u"Error getting alert sounds list: {}".format(err))
-            self.sounds =  OrderedDict([(u'pushover', u'Pushover (default)'), (u'bike', u'Bike'), (u'bugle', u'Bugle'), (u'cashregister', u'Cash Register'), (u'classical', u'Classical'), (u'cosmic', u'Cosmic'), (u'falling', u'Falling'), (u'gamelan', u'Gamelan'), (u'incoming', u'Incoming'), (u'intermission', u'Intermission'), (u'magic', u'Magic'), (u'mechanical', u'Mechanical'), (u'pianobar', u'Piano Bar'), (u'siren', u'Siren'), (u'spacealarm', u'Space Alarm'), (u'tugboat', u'Tug Boat'), (u'alien', u'Alien Alarm (long)'), (u'climb', u'Climb (long)'), (u'persistent', u'Persistent (long)'), (u'echo', u'Pushover Echo (long)'), (u'updown', u'Up Down (long)'), (u'vibrate', u'Vibrate Only'), (u'none', u'None (silent)')])
-        self.logger.debug(u"Sounds = {}".format(self.sounds))
-            
-					
-        
+            self.logger.warning(f"Error getting alert sounds list: {err}")
+            self.sounds = OrderedDict(
+                [(u'pushover', u'Pushover (default)'), (u'bike', u'Bike'), (u'bugle', u'Bugle'), (u'cashregister', u'Cash Register'),
+                 (u'classical', u'Classical'), (u'cosmic', u'Cosmic'), (u'falling', u'Falling'), (u'gamelan', u'Gamelan'), (u'incoming', u'Incoming'),
+                 (u'intermission', u'Intermission'), (u'magic', u'Magic'), (u'mechanical', u'Mechanical'), (u'pianobar', u'Piano Bar'),
+                 (u'siren', u'Siren'), (u'spacealarm', u'Space Alarm'), (u'tugboat', u'Tug Boat'), (u'alien', u'Alien Alarm (long)'),
+                 (u'climb', u'Climb (long)'), (u'persistent', u'Persistent (long)'), (u'echo', u'Pushover Echo (long)'),
+                 (u'updown', u'Up Down (long)'), (u'vibrate', u'Vibrate Only'), (u'none', u'None (silent)')])
+        self.logger.debug(f"Sounds = {self.sounds}")
+
     def shutdown(self):
-        self.logger.debug(u"shutdown called")
+        self.logger.debug("shutdown called")
 
     def get_sound_list(self, filter="", valuesDict=None, typeId="", targetId=0):
         returnList = list()
         for name in self.sounds:
             returnList.append((name, self.sounds[name]))
-        self.logger.debug(u"get_sound_list = {}".format(returnList))
         return returnList
 
     def validateActionConfigUi(self, valuesDict, typeId, deviceId):
@@ -60,37 +63,38 @@ def validateActionConfigUi(self, valuesDict, typeId, deviceId):
         if typeId == "send":
             if not self.present(valuesDict.get("msgBody")):
                 errorDict["msgBody"] = "Cannot be blank"
-                return (False, valuesDict, errorDict)
         elif typeId == "cancel":
             if not self.present(valuesDict.get("cancelTag")):
                 errorDict["cancelTag"] = "Cannot be blank"
-                return (False, valuesDict, errorDict)
 
-        return (True, valuesDict, errorDict)
+        if len(errorDict):
+            return False, valuesDict, errorDict
+        else:
+            return True, valuesDict, errorDict
 
-    def present(self, prop):
-        return (prop and prop.strip() != "")
+    @staticmethod
+    def present(prop):
+        return prop and prop.strip() != ""
 
     # helper functions
     def prepareTextValue(self, strInput):
 
         if not strInput:
-            return strInput            
+            return strInput
         return self.substitute(strInput.strip())
 
-
     # actions go here
     def send(self, pluginAction):
-        self.logger.debug(u"send pluginAction.props = {}".format(pluginAction.props))
-    
+        self.logger.threaddebug(f"send pluginAction.props = {pluginAction.props}")
+
         appToken = pluginAction.props.get('appToken', None)
         if not appToken:
             appToken = self.pluginPrefs['apiToken']
-        self.logger.debug(u"appToken = {}".format(appToken))
+        self.logger.debug(f"send: using appToken = {appToken}")
 
         msgBody = self.prepareTextValue(pluginAction.props['msgBody'])
 
-        #fill params dictionary with required values
+        # fill params dictionary with required values
         params = {
             'token': appToken.strip(),
             'user': self.pluginPrefs['userKey'].strip(),
@@ -99,13 +103,12 @@ def send(self, pluginAction):
 
         attachment = {}
 
-        #populate optional parameters
+        # populate optional parameters
         if self.present(pluginAction.props.get('msgTitle')):
             msgTitle = self.prepareTextValue(pluginAction.props['msgTitle']).strip()
             params['title'] = msgTitle
         else:
-            msgTitle = u''
-        
+            msgTitle = ''
 
         if self.present(pluginAction.props.get('msgDevice')):
             params['device'] = pluginAction.props['msgDevice'].strip()
@@ -132,35 +135,39 @@ def send(self, pluginAction):
                         "attachment": (attachFile, open(attachFile, "rb"), "image/jpeg")
                     }
                 else:
-                    self.logger.warn(u"Warning: attached file size was too large, attachment was skipped")
+                    self.logger.warn("Warning: attached file size was too large, attachment was skipped")
             else:
-                self.logger.warn(u"Warning: file does not exist, or is not an image file, attachment was skipped")
+                self.logger.warn("Warning: file does not exist, or is not an image file, attachment was skipped")
 
         if self.present(pluginAction.props.get('msgPriority')):
             params['priority'] = pluginAction.props['msgPriority']
             if params['priority'] == 2 or params['priority'] == "2":
                 # Require Confirmation priority requires 2 additional params:
-                params['retry'] = "600"     # show every 10 minutes until confirmted (could expose UI for this...)
+                params['retry'] = "600"  # show every 10 minutes until confirmed (could expose UI for this...)
                 params['expire'] = "86400"  # set expire to maximum (24 hours)
 
                 if self.present(pluginAction.props.get('msgTags')):
                     params['tags'] = self.prepareTextValue(pluginAction.props['msgTags'])
 
-        r = requests.post("https://api.pushover.net/1/messages.json", data = params, files = attachment)
+        r = requests.post("https://api.pushover.net/1/messages.json", data=params, files=attachment)
 
         if r.status_code == 200:
-            self.logger.debug(u"Result: {}".format(r.text))
-            self.logger.info(u"Pushover notification was sent sucessfully, title: {}, body: {}".format(msgTitle, msgBody))
+            self.logger.debug(f"Result: {r.text}")
+            self.logger.info(f"Pushover notification was sent successfully, title: {msgTitle}, body: {msgBody}")
         else:
-            self.logger.error(u"Post Error - Result: {}".format(r.text))
-
+            self.logger.error(f"Post Error - Result: {r.text}")
 
     def cancel(self, pluginAction):
-    
-        params = {'token': self.pluginPrefs['apiToken'].strip() }
-        URL = "https://api.pushover.net/1/receipts/cancel_by_tag/" + pluginAction.props['cancelTag'] + ".json"
-        r = requests.post(URL, data = params)
-        self.logger.debug(u"Result: %s" % r.text)
+
+        appToken = pluginAction.props.get('appToken', None)
+        if not appToken:
+            self.logger.warning(f"Unable to cancel notification - App Token not specified")
+            return
+
+        params = {'token': appToken}
+        URL = f"https://api.pushover.net/1/receipts/cancel_by_tag/{pluginAction.props['cancelTag']}.json"
+        r = requests.post(URL, data=params)
+        self.logger.debug(f"Result: {r.text}")
 
     ########################################
     # This is the method that's called by the Add Token button in the menu dialog.
@@ -171,11 +178,11 @@ def addToken(self, valuesDict, typeId=None, devId=None):
         appName = valuesDict["appName"]
         appToken = valuesDict["appToken"]
 
-        tokenItem = {"name" : appName, "token" : appToken}
-        self.logger.debug(u"Adding Token {}: {}".format(appName, appToken))
+        tokenItem = {"name": appName, "token": appToken}
+        self.logger.debug(f"Adding Token {appName}: {appToken}")
         self.appTokenList[appName] = appToken
         self.listTokens()
-        
+
         indigo.activePlugin.pluginPrefs[u"appTokens"] = json.dumps(self.appTokenList)
 
         return valuesDict
@@ -184,34 +191,32 @@ def addToken(self, valuesDict, typeId=None, devId=None):
     # This is the method that's called by the Delete Token button
     ########################################
     def deleteTokens(self, valuesDict, typeId=None, devId=None):
-        
+
         for item in valuesDict["appTokenList"]:
-            self.logger.info(u"Deleting Token {}".format(item))
+            self.logger.info(f"Deleting Token {item}")
             del self.appTokenList[item]
 
         self.listTokens()
-        indigo.activePlugin.pluginPrefs[u"appTokens"] = json.dumps(self.appTokenList)
+        indigo.activePlugin.pluginPrefs["appTokens"] = json.dumps(self.appTokenList)
 
-        
     def get_app_tokens(self, filter="", valuesDict=None, typeId="", targetId=0):
         returnList = list()
         for name in self.appTokenList:
             returnList.append((self.appTokenList[name], name))
-        self.logger.debug(u"get_app_tokens = {}".format(returnList))
-        return sorted(returnList, key= lambda item: item[1])
-
+        self.logger.debug(f"get_app_tokens = {returnList}")
+        return sorted(returnList, key=lambda item: item[1])
 
     ########################################
-    
+
     def listTokens(self):
         if len(self.appTokenList) == 0:
-            self.logger.info(u"No App Tokens Devices")
+            self.logger.info(u"No App Tokens")
             return
-            
-        fstring = u"{:20} {:^50}"
+
+        fstring = "{:20} {:^50}"
         self.logger.info(fstring.format("App Name", "App Token"))
-        for name, token in self.appTokenList.iteritems():
-             self.logger.info(fstring.format(name, token))
+        for name, token in self.appTokenList.items():
+            self.logger.info(fstring.format(name, token))
 
     ########################################
     # ConfigUI methods
@@ -219,16 +224,11 @@ def listTokens(self):
 
     def closedPrefsConfigUi(self, valuesDict, userCancelled):
         if not userCancelled:
-            try:
-                self.logLevel = int(valuesDict[u"logLevel"])
-            except:
-                self.logLevel = logging.INFO
+            self.logLevel = int(valuesDict.get("logLevel", logging.INFO))
             self.indigo_log_handler.setLevel(self.logLevel)
-            self.logger.debug(u"logLevel = {}".format(self.logLevel))
- 
-    # doesn't do anything, just needed to force other menus to dynamically refresh
+            self.logger.debug(f"logLevel = {self.logLevel}")
 
-    def menuChanged(self, valuesDict, typeId, devId):
+    # doesn't do anything, just needed to force other menus to dynamically refresh
+    @staticmethod
+    def menuChanged(valuesDict, typeId, devId):
         return valuesDict
-
-

From b4621f12fa73cd62c6d41e9ee9c830fce727e7fa Mon Sep 17 00:00:00 2001
From: Joe Keenan <joe@flyingdiver.com>
Date: Tue, 12 Apr 2022 14:22:46 -0400
Subject: [PATCH 2/3] Remove multiple API token support

It was broken
---
 .../Contents/Server Plugin/Actions.xml        | 12 +--
 .../Contents/Server Plugin/MenuItems.xml      | 33 --------
 .../Contents/Server Plugin/plugin.py          | 80 ++-----------------
 3 files changed, 8 insertions(+), 117 deletions(-)

diff --git a/Pushover.indigoPlugin/Contents/Server Plugin/Actions.xml b/Pushover.indigoPlugin/Contents/Server Plugin/Actions.xml
index 7b4d4d8..b14ddec 100644
--- a/Pushover.indigoPlugin/Contents/Server Plugin/Actions.xml	
+++ b/Pushover.indigoPlugin/Contents/Server Plugin/Actions.xml	
@@ -4,11 +4,6 @@
 		<Name>Send Pushover Notification</Name>
 		<CallbackMethod>send</CallbackMethod>
 		<ConfigUI>
-            <Field id="appToken" type="menu">
-                <Label>App Token:</Label>
-                <List method="get_app_tokens" dynamicReload="true" class="self" filter=""/>
-                <CallbackMethod>menuChanged</CallbackMethod>
-            </Field>
 			<Field id="msgTitle" type="textfield" default="">
 				<Label>Title:</Label>
 			</Field>
@@ -101,12 +96,7 @@
 		<Name>Cancel Pushover Emergency-Priority Notification</Name>
 		<CallbackMethod>cancel</CallbackMethod>
 		<ConfigUI>
-            <Field id="appToken" type="menu">
-                <Label>App Token:</Label>
-                <List method="get_app_tokens" dynamicReload="true" class="self" filter=""/>
-                <CallbackMethod>menuChanged</CallbackMethod>
-            </Field>
-			<Field id="cancelTag" type="textfield" default="">
+ 			<Field id="cancelTag" type="textfield" default="">
 				<Label>Tag:</Label>
 			</Field>
 			<Field id="hlpCancelTag" type="label" fontSize="mini" alignWithControl="true">
diff --git a/Pushover.indigoPlugin/Contents/Server Plugin/MenuItems.xml b/Pushover.indigoPlugin/Contents/Server Plugin/MenuItems.xml
index 28aa82c..5313f35 100644
--- a/Pushover.indigoPlugin/Contents/Server Plugin/MenuItems.xml	
+++ b/Pushover.indigoPlugin/Contents/Server Plugin/MenuItems.xml	
@@ -1,35 +1,2 @@
 <MenuItems>
-    <MenuItem id="manageTokens">
-        <Name>Manage App Tokens...</Name>
-        <ConfigUI>
-            <Field id="appName" type="textfield">
-                <Label>App Name:</Label>
-            </Field>
-            <Field id="appToken" type="textfield">
-                <Label>App Token:</Label>
-            </Field>
-            <Field id="hlpApiToken" type="label" fontSize="mini" alignWithControl="true">
-                <Label>Created at https://pushover.net/apps/clone/indigo_domotics</Label>
-            </Field>
-            <Field id="addToken" type="button">
-                <Label/>
-                <Title>Add/Update Token</Title>
-                <CallbackMethod>addToken</CallbackMethod>
-            </Field>
-            <Field id="appTokenList" type="list" rows="15">
-                <Label>Available App Tokens:</Label>
-                <List class="self" method="get_app_tokens" dynamicReload="true"/>
-            </Field>
-            <Field id="deleteTokens" type="button">
-                <Label/>
-                <Title>Delete Tokens</Title>
-                <CallbackMethod>deleteTokens</CallbackMethod>
-            </Field>
-        </ConfigUI>
-    </MenuItem>
-    <MenuItem id="listTokens">
-        <CallbackMethod>listTokens</CallbackMethod>
-        <Name>Print App Token List to Log</Name>
-    </MenuItem>
-
 </MenuItems>
diff --git a/Pushover.indigoPlugin/Contents/Server Plugin/plugin.py b/Pushover.indigoPlugin/Contents/Server Plugin/plugin.py
index 850b563..682cc01 100644
--- a/Pushover.indigoPlugin/Contents/Server Plugin/plugin.py	
+++ b/Pushover.indigoPlugin/Contents/Server Plugin/plugin.py	
@@ -18,22 +18,15 @@ def __init__(self, pluginId, pluginDisplayName, pluginVersion, pluginPrefs):
 
         self.sounds = None
 
-        savedList = pluginPrefs.get("appTokens", None)
-        if savedList:
-            self.appTokenList = json.loads(savedList)
-        else:
-            apiToken = pluginPrefs.get('apiToken', None)
-            if not apiToken:
-                self.logger.warning(f"No App Tokens configured")
-                self.appTokenList = {}
-                return
-            else:
-                self.appTokenList['Default'] = apiToken
+
+        self.apiToken = pluginPrefs.get('apiToken', None)
+        if not self.apiToken:
+            self.logger.warning(f"PI Token not configured")
 
     def startup(self):
         self.logger.debug(f"startup called")
         try:
-            r = requests.get(f"https://api.pushover.net/1/sounds.json?token={self.appTokenList['Default']}")
+            r = requests.get(f"https://api.pushover.net/1/sounds.json?token={self.apiToken}")
             customdecoder = json.JSONDecoder(object_hook=OrderedDict)
             rdict = customdecoder.decode(r.text)
             self.sounds = rdict['sounds']
@@ -87,16 +80,11 @@ def prepareTextValue(self, strInput):
     def send(self, pluginAction):
         self.logger.threaddebug(f"send pluginAction.props = {pluginAction.props}")
 
-        appToken = pluginAction.props.get('appToken', None)
-        if not appToken:
-            appToken = self.pluginPrefs['apiToken']
-        self.logger.debug(f"send: using appToken = {appToken}")
-
         msgBody = self.prepareTextValue(pluginAction.props['msgBody'])
 
         # fill params dictionary with required values
         params = {
-            'token': appToken.strip(),
+            'token': self.apiToken,
             'user': self.pluginPrefs['userKey'].strip(),
             'message': msgBody
         }
@@ -159,65 +147,11 @@ def send(self, pluginAction):
 
     def cancel(self, pluginAction):
 
-        appToken = pluginAction.props.get('appToken', None)
-        if not appToken:
-            self.logger.warning(f"Unable to cancel notification - App Token not specified")
-            return
-
-        params = {'token': appToken}
+        params = {'token': self.apiToken}
         URL = f"https://api.pushover.net/1/receipts/cancel_by_tag/{pluginAction.props['cancelTag']}.json"
         r = requests.post(URL, data=params)
         self.logger.debug(f"Result: {r.text}")
 
-    ########################################
-    # This is the method that's called by the Add Token button in the menu dialog.
-    ########################################
-
-    def addToken(self, valuesDict, typeId=None, devId=None):
-
-        appName = valuesDict["appName"]
-        appToken = valuesDict["appToken"]
-
-        tokenItem = {"name": appName, "token": appToken}
-        self.logger.debug(f"Adding Token {appName}: {appToken}")
-        self.appTokenList[appName] = appToken
-        self.listTokens()
-
-        indigo.activePlugin.pluginPrefs[u"appTokens"] = json.dumps(self.appTokenList)
-
-        return valuesDict
-
-    ########################################
-    # This is the method that's called by the Delete Token button
-    ########################################
-    def deleteTokens(self, valuesDict, typeId=None, devId=None):
-
-        for item in valuesDict["appTokenList"]:
-            self.logger.info(f"Deleting Token {item}")
-            del self.appTokenList[item]
-
-        self.listTokens()
-        indigo.activePlugin.pluginPrefs["appTokens"] = json.dumps(self.appTokenList)
-
-    def get_app_tokens(self, filter="", valuesDict=None, typeId="", targetId=0):
-        returnList = list()
-        for name in self.appTokenList:
-            returnList.append((self.appTokenList[name], name))
-        self.logger.debug(f"get_app_tokens = {returnList}")
-        return sorted(returnList, key=lambda item: item[1])
-
-    ########################################
-
-    def listTokens(self):
-        if len(self.appTokenList) == 0:
-            self.logger.info(u"No App Tokens")
-            return
-
-        fstring = "{:20} {:^50}"
-        self.logger.info(fstring.format("App Name", "App Token"))
-        for name, token in self.appTokenList.items():
-            self.logger.info(fstring.format(name, token))
-
     ########################################
     # ConfigUI methods
     ########################################

From e946a2a6a00ad7d5d41090407da3aed4ce4df79d Mon Sep 17 00:00:00 2001
From: Joe Keenan <joe@flyingdiver.com>
Date: Sat, 16 Apr 2022 11:56:27 -0400
Subject: [PATCH 3/3] Updated Readme

---
 README.md | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 869a72f..f0c52e4 100644
--- a/README.md
+++ b/README.md
@@ -1,19 +1,21 @@
 indigo-pushover
 ===============
 
-[Indigo](http://www.indigodomo.com/) plugin  - send push notifications to mobile devices via [Pushover](http://www.pushover.net).
+[Indigo](http://www.indigodomo.com/) plugin  - send push notifications via [Pushover](http://www.pushover.net).
+
+| Requirement            |                     |   |
+|------------------------|---------------------|---|
+| Minimum Indigo Version | 2022.1              |   |
+| Python Library (API)   | Official            |   |
+| Requires Local Network | No                  |   |
+| Requires Internet      | Yes                 |   |
+| Hardware Interface     | None                |   |
 
 ### Requirements
 
-1. [Indigo 6](http://www.indigodomo.com/) or later (pro version only)
 2. Valid Pushover [API key](https://pushover.net/apps/clone/indigo_domotics)
 3. Valid Pushover [user key](https://pushover.net/faq#overview-what)
 
-### Installation Instructions
-
-1. Download latest release [here](https://github.com/IndigoDomotics/indigo-pushover/releases)
-2. Follow [standard plugin installation process](http://bit.ly/1e1Vc7b)
-
 ### Actions Supported
 * Send Pushover Notification
 	* customize title, message (supports variables)