If online activites were requested, keep them for offline using

1 files changed, 11 insertions, 3 deletions

diff --git a/plugin/bundleregistry.py b/plugin/bundleregistry.py
index dbff344..324921f 100644
--- a/plugin/bundleregistry.py
+++ b/plugin/bundleregistry.py
@@ -21,6 +21,7 @@ from gettext import gettext as _
 
 import gtk
 import gobject
+from pylru import lrucache
 
 from sugar_network import checkins, sugar
 from sugar.bundle.activitybundle import ActivityBundle
@@ -34,6 +35,7 @@ from jarabe.journal.journalentrybundle import JournalEntryBundle
 
 _logger = logging.getLogger('plugins.sn.bundleregistry')
 _stub_icon_path = None
+_online_cache = lrucache(32)
 
 
 class BundleRegistry(gobject.GObject):
@@ -72,17 +74,23 @@ class BundleRegistry(gobject.GObject):
             return self._bundles[context_guid]
 
         if mountpoint == '~':
+            if context_guid in _online_cache:
+                return _online_cache[context_guid]
             return None
+
         try:
             props = get_client().Get(mountpoint, 'context', context_guid,
                     ['guid', 'keep', 'keep_impl', 'title'])
-            result = _ContextInfo(mountpoint, props)
+            bundle = _ContextInfo(mountpoint, props)
         except Exception:
             _logger.warning('Cannot fetch activity metadata for %r on %r',
                     context_guid, mountpoint)
-            result = None
+            bundle = None
 
-        return result
+        # Keep even None budles to avoid needless retrying
+        _online_cache[context_guid] = bundle
+
+        return bundle
 
     def get_activities_for_type(self, mime_type):
         result = []