Merge pull request kivy#189 from alanjds/custom_intent_filters

tito · tito · commit cedda246398c · 2014-02-10T12:20:35.000+01:00
Custom actions and categories for BroadcastReceiver
diff --git a/recipes/android/src/android/broadcast.py b/recipes/android/src/android/broadcast.py
@@ -24,23 +24,19 @@ def __init__(self, callback, actions=None, categories=None):
         if not actions and not categories:
             raise Exception('You need to define at least actions or categories')
 
-        # resolve actions/categories first
-        Intent = autoclass('android.content.Intent')
-        resolved_actions = []
-        if actions:
-            for x in actions:
-                name = 'ACTION_{}'.format(x.upper())
+        def _expand_partial_name(partial_name):
+            if '.' in partial_name:
+                return partial_name # Its actually a full dotted name
+            else:
+                name = 'ACTION_{}'.format(partial_name.upper())
                 if not hasattr(Intent, name):
                     raise Exception('The intent {} doesnt exist'.format(name))
-                resolved_actions += [getattr(Intent, name)]
+                return getattr(Intent, name)
 
-        resolved_categories = []
-        if categories:
-            for x in categories:
-                name = 'CATEGORY_{}'.format(x.upper())
-                if not hasattr(Intent, name):
-                    raise Exception('The intent {} doesnt exist'.format(name))
-                resolved_categories += [getattr(Intent, name)]
+        # resolve actions/categories first
+        Intent = autoclass('android.content.Intent')
+        resolved_actions = [_expand_partial_name(x) for x in actions or []]
+        resolved_categories = [_expand_partial_name(x) for x in categories or []]
 
         # resolve android API
         PythonActivity = autoclass('org.renpy.android.PythonActivity')
