From 33f5b129926ac6e5436f54b55f9b52a5d10a6b9b Mon Sep 17 00:00:00 2001
From: Allen Farris <allen.farris@gmail.com>
Date: Thu, 27 Feb 2014 19:31:46 -0600
Subject: [PATCH 1/2] add support for listing subscriptions

---
 daemon.py | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/daemon.py b/daemon.py
index fc044a2..9e0ea7b 100755
--- a/daemon.py
+++ b/daemon.py
@@ -505,25 +505,28 @@ def unsubscribe():
 
 def listSubscriptions():
     global usrPrompt
-    #jsonAddresses = json.loads(api.listSubscriptions())
-    #numAddresses = len(jsonAddresses['addresses']) #Number of addresses
-    print '\nLabel, Address, Enabled\n'
     try:
-        print api.listSubscriptions()
+        response = api.listSubscriptions()
+        if "API Error" in response:
+            return getAPIErrorCode(response)
+        subs = json.loads(response)
+        print
+        print '--------------------------------------------------------------------------------'
+        print '|             Label              |                Address                | On? |'
+        print '|--------------------------------|---------------------------------------|-----|'
+        for entry in subs['subscriptions']:
+            label = entry['label'].decode('base64')
+            address = entry['address']
+            enabled = "Yes" if entry['enabled'] else "No"
+            if (len(label) > 30): label = label[:27] + '...'
+            print '| ' + label.ljust(30) + ' | ' + address.ljust(37) + ' | ' + enabled.ljust(3) + ' |'
+        print '--------------------------------------------------------------------------------'
+        print
+
     except:
         print '\n     Connection Error\n'
         usrPrompt = 0
         main()
-        
-    '''for addNum in range (0, numAddresses): #processes all of the addresses and lists them out
-        label = jsonAddresses['addresses'][addNum]['label']
-        address = jsonAddresses['addresses'][addNum]['address']
-        enabled = jsonAddresses['addresses'][addNum]['enabled']
-
-        print label, address, enabled
-    '''
-    print ' '
-
 
 def listAdd(): #Lists all of the addresses and their info
     global usrPrompt
@@ -1278,7 +1281,7 @@ def UI(usrInput): #Main user menu
         print '     |------------------------|----------------------------------------------|'
         print '     | subscribe              | Subscribes to an address                     |'
         print '     | unsubscribe            | Unsubscribes from an address                 |'
-       #print '     | listSubscriptions      | Lists all of the subscriptions.              |'
+        print '     | listSubscriptions      | Lists all of the subscriptions.              |'
         print '     |------------------------|----------------------------------------------|'
         print '     | inbox                  | Lists the message information for the inbox  |'
         print '     | outbox                 | Lists the message information for the outbox |'

From 94ee4a2958d9dcee8c1c8976270eca84c7b559cd Mon Sep 17 00:00:00 2001
From: Allen Farris <allen.farris@gmail.com>
Date: Thu, 27 Feb 2014 21:25:33 -0600
Subject: [PATCH 2/2] minor error handling change

---
 daemon.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/daemon.py b/daemon.py
index 9e0ea7b..adab264 100755
--- a/daemon.py
+++ b/daemon.py
@@ -1380,7 +1380,8 @@ def UI(usrInput): #Main user menu
         usrPrompt = 1
         main()
     elif usrInput == "listsubscriptions": #Unsubscribe from an address
-        listSubscriptions()
+        res = listSubscriptions()
+        if res == 20: print '\n     Error: API function not supported.\n'
         usrPrompt = 1
         main()