From 8e17b9aea59e8cf43714c80031ff380e5dcaaca1 Mon Sep 17 00:00:00 2001
From: Ruud <ruud@crashdummy.nl>
Date: Fri, 20 Jun 2014 14:12:43 +0200
Subject: [PATCH 1/2] Remove BoxCar

---
 couchpotato/core/notifications/boxcar.py | 69 ------------------------
 1 file changed, 69 deletions(-)
 delete mode 100644 couchpotato/core/notifications/boxcar.py

diff --git a/couchpotato/core/notifications/boxcar.py b/couchpotato/core/notifications/boxcar.py
deleted file mode 100644
index a7acc882..00000000
--- a/couchpotato/core/notifications/boxcar.py
+++ /dev/null
@@ -1,69 +0,0 @@
-import time
-
-from couchpotato.core.helpers.encoding import toUnicode
-from couchpotato.core.logger import CPLog
-from couchpotato.core.notifications.base import Notification
-
-
-log = CPLog(__name__)
-
-autoload = 'Boxcar'
-
-
-class Boxcar(Notification):
-
-    url = 'https://boxcar.io/devices/providers/7MNNXY3UIzVBwvzkKwkC/notifications'
-
-    def notify(self, message = '', data = None, listener = None):
-        if not data: data = {}
-
-        try:
-            message = message.strip()
-
-            data = {
-                'email': self.conf('email'),
-                'notification[from_screen_name]': self.default_title,
-                'notification[message]': toUnicode(message),
-                'notification[from_remote_service_id]': int(time.time()),
-            }
-
-            self.urlopen(self.url, data = data)
-        except:
-            log.error('Check your email and added services on boxcar.io')
-            return False
-
-        log.info('Boxcar notification successful.')
-        return True
-
-    def isEnabled(self):
-        return super(Boxcar, self).isEnabled() and self.conf('email')
-
-
-config = [{
-    'name': 'boxcar',
-    'groups': [
-        {
-            'tab': 'notifications',
-            'list': 'notification_providers',
-            'name': 'boxcar',
-            'options': [
-                {
-                    'name': 'enabled',
-                    'default': 0,
-                    'type': 'enabler',
-                },
-                {
-                    'name': 'email',
-                    'description': 'Your Boxcar registration emailaddress.'
-                },
-                {
-                    'name': 'on_snatch',
-                    'default': 0,
-                    'type': 'bool',
-                    'advanced': True,
-                    'description': 'Also send message when movie is snatched.',
-                },
-            ],
-        }
-    ],
-}]

From 578b74f2c0068bb047c48dfec98da2dfe31ded18 Mon Sep 17 00:00:00 2001
From: Ruud <ruud@crashdummy.nl>
Date: Fri, 20 Jun 2014 14:14:10 +0200
Subject: [PATCH 2/2] Fix PushBullet url. fix #3470

---
 couchpotato/core/notifications/pushbullet.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/couchpotato/core/notifications/pushbullet.py b/couchpotato/core/notifications/pushbullet.py
index 56cf2288..77738c32 100644
--- a/couchpotato/core/notifications/pushbullet.py
+++ b/couchpotato/core/notifications/pushbullet.py
@@ -14,7 +14,7 @@ autoload = 'Pushbullet'
 
 class Pushbullet(Notification):
 
-    url = 'https://api.pushbullet.com/api/%s'
+    url = 'https://api.pushbullet.com/v2/%s'
 
     def notify(self, message = '', data = None, listener = None):
         if not data: data = {}