Delegate APNS calls to PyAPNs2.

Author: Camille Fabreguettes

README.rst

@@ -46,12 +46,13 @@ Edit your settings.py file:
 		"FCM_API_KEY": "[your api key]",
 		"GCM_API_KEY": "[your api key]",
 		"APNS_CERTIFICATE": "/path/to/your/certificate.pem",
+		"APNS_TOPIC": "com.example.push_test",
 		"WNS_PACKAGE_SECURITY_ID": "[your package security id, e.g: 'ms-app://e-3-4-6234...']",
 		"WNS_SECRET_KEY": "[your app secret key, e.g.: 'KDiejnLKDUWodsjmewuSZkk']",
 	}
 
 .. note::
-	If you are planning on running your project with ``DEBUG=True``, then make sure you have set the
+	If you are planning on running your project with ``APNS_USE_SANDBOX=True``, then make sure you have set the
 	*development* certificate as your ``APNS_CERTIFICATE``. Otherwise the app will not be able to connect to the correct host. See settings_ for details.
 
 You can learn more about APNS certificates `here <https://developer.apple.com/library/ios/documentation/NetworkingInternet/Conceptual/RemoteNotificationsPG/Chapters/ApplePushService.html>`_.
@@ -71,12 +72,8 @@ For WNS, you need both the ``WNS_PACKAGE_SECURITY_KEY`` and the ``WNS_SECRET_KEY
 **APNS settings**
 
 - ``APNS_CERTIFICATE``: Absolute path to your APNS certificate file. Certificates with passphrases are not supported.
-- ``APNS_CA_CERTIFICATES``: Absolute path to a CA certificates file for APNS. Optional - do not set if not needed. Defaults to None.
-- ``APNS_HOST``: The hostname used for the APNS sockets.
-   - When ``DEBUG=True``, this defaults to ``gateway.sandbox.push.apple.com``.
-   - When ``DEBUG=False``, this defaults to ``gateway.push.apple.com``.
-- ``APNS_PORT``: The port used along with APNS_HOST. Defaults to 2195.
-- ``APNS_ERROR_TIMEOUT``: The timeout on APNS sockets.
+- ``APNS_USE_ALTERNATIVE_PORT``: Use port 2197 for APNS, instead of default port 443.
+- ``APNS_USE_SANDBOX``: Use 'api.development.push.apple.com', instead of default host 'api.push.apple.com'.
 
 **FCM/GCM settings**
 
@@ -206,23 +203,6 @@ Note: gcm_send_bulk_message must be used when sending messages to topic subscrib
 
 Reference: `FCM Documentation <https://firebase.google.com/docs/cloud-messaging/android/topic-messaging>`_
 
-Administration
---------------
-
-APNS devices which are not receiving push notifications can be set to inactive by two methods.  The web admin interface for
-APNS devices has a "prune devices" option.  Any selected devices which are not receiving notifications will be set to inactive [1]_.
-There is also a management command to prune all devices failing to receive notifications:
-
-.. code-block:: shell
-
-	$ python manage.py prune_devices
-
-This removes all devices which are not receiving notifications.
-
-For more information, please refer to the APNS feedback service_.
-
-.. _service: https://developer.apple.com/library/ios/documentation/NetworkingInternet/Conceptual/RemoteNotificationsPG/Chapters/CommunicatingWIthAPS.html
-
 Exceptions
 ----------
 

push_notifications/admin.py

@@ -1,19 +1,18 @@
 from django.apps import apps
 from django.contrib import admin, messages
 from django.utils.translation import ugettext_lazy as _
-from .apns import APNS_ERROR_MESSAGES, APNSServerError
+from .apns import APNSServerError
 from .gcm import GCMError
 from .models import APNSDevice, GCMDevice, WNSDevice
 from .settings import PUSH_NOTIFICATIONS_SETTINGS as SETTINGS
-from .utils import get_expired_tokens
 
 User = apps.get_model(*SETTINGS["USER_MODEL"].split("."))
 
 
 class DeviceAdmin(admin.ModelAdmin):
 	list_display = ("__str__", "device_id", "user", "active", "date_created")
 	list_filter = ("active",)
-	actions = ("send_message", "send_bulk_message", "prune_devices", "enable", "disable")
+	actions = ("send_message", "send_bulk_message", "enable", "disable")
 	raw_id_fields = ("user",)
 
 	if hasattr(User, "USERNAME_FIELD"):
@@ -40,7 +39,7 @@ def send_messages(self, request, queryset, bulk=False):
 			except GCMError as e:
 				errors.append(str(e))
 			except APNSServerError as e:
-				errors.append(APNS_ERROR_MESSAGES[e.status])
+				errors.append(e.status)
 
 			if bulk:
 				break
@@ -79,19 +78,6 @@ def disable(self, request, queryset):
 
 	disable.short_description = _("Disable selected devices")
 
-	def prune_devices(self, request, queryset):
-		# Note that when get_expired_tokens() is called, Apple's
-		# feedback service resets, so, calling it again won't return
-		# the device again (unless a message is sent to it again).  So,
-		# if the user doesn't select all the devices for pruning, we
-		# could very easily leave an expired device as active.  Maybe
-		#  this is just a bad API.
-		expired = get_expired_tokens()
-		devices = queryset.filter(registration_id__in=expired)
-		for d in devices:
-			d.active = False
-			d.save()
-
 
 class GCMDeviceAdmin(DeviceAdmin):
 	list_display = (