add new events for imap and keymanager
authorKali Kaneko <kali@leap.se>
Fri, 16 Aug 2013 15:55:28 +0000 (17:55 +0200)
committerKali Kaneko <kali@leap.se>
Fri, 16 Aug 2013 17:03:08 +0000 (19:03 +0200)
changes/feature_add_imap_keymanager_events [new file with mode: 0644]
src/leap/common/events/events.proto
src/leap/common/events/events_pb2.py

diff --git a/changes/feature_add_imap_keymanager_events b/changes/feature_add_imap_keymanager_events
new file mode 100644 (file)
index 0000000..5bf1d0f
--- /dev/null
@@ -0,0 +1 @@
+  o Add events for imap and keymanager notifications. Closes: #3480
index 3f60210..4276bb8 100644 (file)
@@ -47,6 +47,21 @@ enum Event {
   SMTP_SEND_MESSAGE_SUCCESS = 24;
   SMTP_SEND_MESSAGE_ERROR = 25;
   SMTP_CONNECTION_LOST = 26;
+  IMAP_SERVICE_STARTED = 30;
+  IMAP_SERVICE_FAILED_TO_START = 31;
+  IMAP_CLIENT_LOGIN = 32;
+  IMAP_FETCHED_INCOMING = 33;
+  IMAP_MSG_PROCESSING = 34;
+  IMAP_MSG_DECRYPTED = 35;
+  IMAP_MSG_SAVED_LOCALLY = 36;
+  IMAP_MSG_DELETED_INCOMING = 37;
+  IMAP_UNHANDLED_ERROR = 38;
+  KEYMANAGER_LOOKING_FOR_KEY = 40;
+  KEYMANAGER_KEY_FOUND = 41;
+  KEYMANAGER_KEY_NOT_FOUND = 42;
+  KEYMANAGER_STARTED_KEY_GENERATION = 43;
+  KEYMANAGER_FINISHED_KEY_GENERATION = 44;
+  KEYMANAGER_DONE_UPLOADING_KEYS = 45;
 }
 
 
index ebbd4fc..b0396d7 100644 (file)
@@ -13,7 +13,7 @@ from google.protobuf import descriptor_pb2
 DESCRIPTOR = descriptor.FileDescriptor(
   name='events.proto',
   package='leap.common.events',
-  serialized_pb='\n\x0c\x65vents.proto\x12\x12leap.common.events\"\x97\x01\n\rSignalRequest\x12(\n\x05\x65vent\x18\x01 \x02(\x0e\x32\x19.leap.common.events.Event\x12\x0f\n\x07\x63ontent\x18\x02 \x02(\t\x12\x12\n\nmac_method\x18\x03 \x02(\t\x12\x0b\n\x03mac\x18\x04 \x02(\x0c\x12\x12\n\nenc_method\x18\x05 \x01(\t\x12\x16\n\x0e\x65rror_occurred\x18\x06 \x01(\x08\"j\n\x0fRegisterRequest\x12(\n\x05\x65vent\x18\x01 \x02(\x0e\x32\x19.leap.common.events.Event\x12\x0c\n\x04port\x18\x02 \x02(\x05\x12\x12\n\nmac_method\x18\x03 \x02(\t\x12\x0b\n\x03mac\x18\x04 \x02(\x0c\"l\n\x11UnregisterRequest\x12(\n\x05\x65vent\x18\x01 \x02(\x0e\x32\x19.leap.common.events.Event\x12\x0c\n\x04port\x18\x02 \x02(\x05\x12\x12\n\nmac_method\x18\x03 \x02(\t\x12\x0b\n\x03mac\x18\x04 \x02(\x0c\"\r\n\x0bPingRequest\"\x82\x01\n\rEventResponse\x12\x38\n\x06status\x18\x01 \x02(\x0e\x32(.leap.common.events.EventResponse.Status\x12\x0e\n\x06result\x18\x02 \x01(\t\"\'\n\x06Status\x12\x06\n\x02OK\x10\x01\x12\n\n\x06UNAUTH\x10\x02\x12\t\n\x05\x45RROR\x10\x03*\xeb\x05\n\x05\x45vent\x12\x15\n\x11\x43LIENT_SESSION_ID\x10\x01\x12\x0e\n\nCLIENT_UID\x10\x02\x12\x19\n\x15SOLEDAD_CREATING_KEYS\x10\x03\x12\x1e\n\x1aSOLEDAD_DONE_CREATING_KEYS\x10\x04\x12\x1a\n\x16SOLEDAD_UPLOADING_KEYS\x10\x05\x12\x1f\n\x1bSOLEDAD_DONE_UPLOADING_KEYS\x10\x06\x12\x1c\n\x18SOLEDAD_DOWNLOADING_KEYS\x10\x07\x12!\n\x1dSOLEDAD_DONE_DOWNLOADING_KEYS\x10\x08\x12\x1c\n\x18SOLEDAD_NEW_DATA_TO_SYNC\x10\t\x12\x1a\n\x16SOLEDAD_DONE_DATA_SYNC\x10\n\x12\x17\n\x13UPDATER_NEW_UPDATES\x10\x0b\x12\x19\n\x15UPDATER_DONE_UPDATING\x10\x0c\x12\x10\n\x0cRAISE_WINDOW\x10\r\x12\x18\n\x14SMTP_SERVICE_STARTED\x10\x0e\x12 \n\x1cSMTP_SERVICE_FAILED_TO_START\x10\x0f\x12%\n!SMTP_RECIPIENT_ACCEPTED_ENCRYPTED\x10\x10\x12\'\n#SMTP_RECIPIENT_ACCEPTED_UNENCRYPTED\x10\x11\x12\x1b\n\x17SMTP_RECIPIENT_REJECTED\x10\x12\x12\x1f\n\x1bSMTP_START_ENCRYPT_AND_SIGN\x10\x13\x12\x1d\n\x19SMTP_END_ENCRYPT_AND_SIGN\x10\x14\x12\x13\n\x0fSMTP_START_SIGN\x10\x15\x12\x11\n\rSMTP_END_SIGN\x10\x16\x12\x1b\n\x17SMTP_SEND_MESSAGE_START\x10\x17\x12\x1d\n\x19SMTP_SEND_MESSAGE_SUCCESS\x10\x18\x12\x1b\n\x17SMTP_SEND_MESSAGE_ERROR\x10\x19\x12\x18\n\x14SMTP_CONNECTION_LOST\x10\x1a\x32\xdd\x02\n\x13\x45ventsServerService\x12J\n\x04ping\x12\x1f.leap.common.events.PingRequest\x1a!.leap.common.events.EventResponse\x12R\n\x08register\x12#.leap.common.events.RegisterRequest\x1a!.leap.common.events.EventResponse\x12V\n\nunregister\x12%.leap.common.events.UnregisterRequest\x1a!.leap.common.events.EventResponse\x12N\n\x06signal\x12!.leap.common.events.SignalRequest\x1a!.leap.common.events.EventResponse2\xb1\x01\n\x13\x45ventsClientService\x12J\n\x04ping\x12\x1f.leap.common.events.PingRequest\x1a!.leap.common.events.EventResponse\x12N\n\x06signal\x12!.leap.common.events.SignalRequest\x1a!.leap.common.events.EventResponseB\x03\x90\x01\x01')
+  serialized_pb='\n\x0c\x65vents.proto\x12\x12leap.common.events\"\x97\x01\n\rSignalRequest\x12(\n\x05\x65vent\x18\x01 \x02(\x0e\x32\x19.leap.common.events.Event\x12\x0f\n\x07\x63ontent\x18\x02 \x02(\t\x12\x12\n\nmac_method\x18\x03 \x02(\t\x12\x0b\n\x03mac\x18\x04 \x02(\x0c\x12\x12\n\nenc_method\x18\x05 \x01(\t\x12\x16\n\x0e\x65rror_occurred\x18\x06 \x01(\x08\"j\n\x0fRegisterRequest\x12(\n\x05\x65vent\x18\x01 \x02(\x0e\x32\x19.leap.common.events.Event\x12\x0c\n\x04port\x18\x02 \x02(\x05\x12\x12\n\nmac_method\x18\x03 \x02(\t\x12\x0b\n\x03mac\x18\x04 \x02(\x0c\"l\n\x11UnregisterRequest\x12(\n\x05\x65vent\x18\x01 \x02(\x0e\x32\x19.leap.common.events.Event\x12\x0c\n\x04port\x18\x02 \x02(\x05\x12\x12\n\nmac_method\x18\x03 \x02(\t\x12\x0b\n\x03mac\x18\x04 \x02(\x0c\"\r\n\x0bPingRequest\"\x82\x01\n\rEventResponse\x12\x38\n\x06status\x18\x01 \x02(\x0e\x32(.leap.common.events.EventResponse.Status\x12\x0e\n\x06result\x18\x02 \x01(\t\"\'\n\x06Status\x12\x06\n\x02OK\x10\x01\x12\n\n\x06UNAUTH\x10\x02\x12\t\n\x05\x45RROR\x10\x03*\xaa\t\n\x05\x45vent\x12\x15\n\x11\x43LIENT_SESSION_ID\x10\x01\x12\x0e\n\nCLIENT_UID\x10\x02\x12\x19\n\x15SOLEDAD_CREATING_KEYS\x10\x03\x12\x1e\n\x1aSOLEDAD_DONE_CREATING_KEYS\x10\x04\x12\x1a\n\x16SOLEDAD_UPLOADING_KEYS\x10\x05\x12\x1f\n\x1bSOLEDAD_DONE_UPLOADING_KEYS\x10\x06\x12\x1c\n\x18SOLEDAD_DOWNLOADING_KEYS\x10\x07\x12!\n\x1dSOLEDAD_DONE_DOWNLOADING_KEYS\x10\x08\x12\x1c\n\x18SOLEDAD_NEW_DATA_TO_SYNC\x10\t\x12\x1a\n\x16SOLEDAD_DONE_DATA_SYNC\x10\n\x12\x17\n\x13UPDATER_NEW_UPDATES\x10\x0b\x12\x19\n\x15UPDATER_DONE_UPDATING\x10\x0c\x12\x10\n\x0cRAISE_WINDOW\x10\r\x12\x18\n\x14SMTP_SERVICE_STARTED\x10\x0e\x12 \n\x1cSMTP_SERVICE_FAILED_TO_START\x10\x0f\x12%\n!SMTP_RECIPIENT_ACCEPTED_ENCRYPTED\x10\x10\x12\'\n#SMTP_RECIPIENT_ACCEPTED_UNENCRYPTED\x10\x11\x12\x1b\n\x17SMTP_RECIPIENT_REJECTED\x10\x12\x12\x1f\n\x1bSMTP_START_ENCRYPT_AND_SIGN\x10\x13\x12\x1d\n\x19SMTP_END_ENCRYPT_AND_SIGN\x10\x14\x12\x13\n\x0fSMTP_START_SIGN\x10\x15\x12\x11\n\rSMTP_END_SIGN\x10\x16\x12\x1b\n\x17SMTP_SEND_MESSAGE_START\x10\x17\x12\x1d\n\x19SMTP_SEND_MESSAGE_SUCCESS\x10\x18\x12\x1b\n\x17SMTP_SEND_MESSAGE_ERROR\x10\x19\x12\x18\n\x14SMTP_CONNECTION_LOST\x10\x1a\x12\x18\n\x14IMAP_SERVICE_STARTED\x10\x1e\x12 \n\x1cIMAP_SERVICE_FAILED_TO_START\x10\x1f\x12\x15\n\x11IMAP_CLIENT_LOGIN\x10 \x12\x19\n\x15IMAP_FETCHED_INCOMING\x10!\x12\x17\n\x13IMAP_MSG_PROCESSING\x10\"\x12\x16\n\x12IMAP_MSG_DECRYPTED\x10#\x12\x1a\n\x16IMAP_MSG_SAVED_LOCALLY\x10$\x12\x1d\n\x19IMAP_MSG_DELETED_INCOMING\x10%\x12\x18\n\x14IMAP_UNHANDLED_ERROR\x10&\x12\x1e\n\x1aKEYMANAGER_LOOKING_FOR_KEY\x10(\x12\x18\n\x14KEYMANAGER_KEY_FOUND\x10)\x12\x1c\n\x18KEYMANAGER_KEY_NOT_FOUND\x10*\x12%\n!KEYMANAGER_STARTED_KEY_GENERATION\x10+\x12&\n\"KEYMANAGER_FINISHED_KEY_GENERATION\x10,\x12\"\n\x1eKEYMANAGER_DONE_UPLOADING_KEYS\x10-2\xdd\x02\n\x13\x45ventsServerService\x12J\n\x04ping\x12\x1f.leap.common.events.PingRequest\x1a!.leap.common.events.EventResponse\x12R\n\x08register\x12#.leap.common.events.RegisterRequest\x1a!.leap.common.events.EventResponse\x12V\n\nunregister\x12%.leap.common.events.UnregisterRequest\x1a!.leap.common.events.EventResponse\x12N\n\x06signal\x12!.leap.common.events.SignalRequest\x1a!.leap.common.events.EventResponse2\xb1\x01\n\x13\x45ventsClientService\x12J\n\x04ping\x12\x1f.leap.common.events.PingRequest\x1a!.leap.common.events.EventResponse\x12N\n\x06signal\x12!.leap.common.events.SignalRequest\x1a!.leap.common.events.EventResponseB\x03\x90\x01\x01')
 
 _EVENT = descriptor.EnumDescriptor(
   name='Event',
@@ -125,11 +125,71 @@ _EVENT = descriptor.EnumDescriptor(
       name='SMTP_CONNECTION_LOST', index=25, number=26,
       options=None,
       type=None),
+    descriptor.EnumValueDescriptor(
+      name='IMAP_SERVICE_STARTED', index=26, number=30,
+      options=None,
+      type=None),
+    descriptor.EnumValueDescriptor(
+      name='IMAP_SERVICE_FAILED_TO_START', index=27, number=31,
+      options=None,
+      type=None),
+    descriptor.EnumValueDescriptor(
+      name='IMAP_CLIENT_LOGIN', index=28, number=32,
+      options=None,
+      type=None),
+    descriptor.EnumValueDescriptor(
+      name='IMAP_FETCHED_INCOMING', index=29, number=33,
+      options=None,
+      type=None),
+    descriptor.EnumValueDescriptor(
+      name='IMAP_MSG_PROCESSING', index=30, number=34,
+      options=None,
+      type=None),
+    descriptor.EnumValueDescriptor(
+      name='IMAP_MSG_DECRYPTED', index=31, number=35,
+      options=None,
+      type=None),
+    descriptor.EnumValueDescriptor(
+      name='IMAP_MSG_SAVED_LOCALLY', index=32, number=36,
+      options=None,
+      type=None),
+    descriptor.EnumValueDescriptor(
+      name='IMAP_MSG_DELETED_INCOMING', index=33, number=37,
+      options=None,
+      type=None),
+    descriptor.EnumValueDescriptor(
+      name='IMAP_UNHANDLED_ERROR', index=34, number=38,
+      options=None,
+      type=None),
+    descriptor.EnumValueDescriptor(
+      name='KEYMANAGER_LOOKING_FOR_KEY', index=35, number=40,
+      options=None,
+      type=None),
+    descriptor.EnumValueDescriptor(
+      name='KEYMANAGER_KEY_FOUND', index=36, number=41,
+      options=None,
+      type=None),
+    descriptor.EnumValueDescriptor(
+      name='KEYMANAGER_KEY_NOT_FOUND', index=37, number=42,
+      options=None,
+      type=None),
+    descriptor.EnumValueDescriptor(
+      name='KEYMANAGER_STARTED_KEY_GENERATION', index=38, number=43,
+      options=None,
+      type=None),
+    descriptor.EnumValueDescriptor(
+      name='KEYMANAGER_FINISHED_KEY_GENERATION', index=39, number=44,
+      options=None,
+      type=None),
+    descriptor.EnumValueDescriptor(
+      name='KEYMANAGER_DONE_UPLOADING_KEYS', index=40, number=45,
+      options=None,
+      type=None),
   ],
   containing_type=None,
   options=None,
   serialized_start=557,
-  serialized_end=1304,
+  serialized_end=1751,
 )
 
 
@@ -159,6 +219,21 @@ SMTP_SEND_MESSAGE_START = 23
 SMTP_SEND_MESSAGE_SUCCESS = 24
 SMTP_SEND_MESSAGE_ERROR = 25
 SMTP_CONNECTION_LOST = 26
+IMAP_SERVICE_STARTED = 30
+IMAP_SERVICE_FAILED_TO_START = 31
+IMAP_CLIENT_LOGIN = 32
+IMAP_FETCHED_INCOMING = 33
+IMAP_MSG_PROCESSING = 34
+IMAP_MSG_DECRYPTED = 35
+IMAP_MSG_SAVED_LOCALLY = 36
+IMAP_MSG_DELETED_INCOMING = 37
+IMAP_UNHANDLED_ERROR = 38
+KEYMANAGER_LOOKING_FOR_KEY = 40
+KEYMANAGER_KEY_FOUND = 41
+KEYMANAGER_KEY_NOT_FOUND = 42
+KEYMANAGER_STARTED_KEY_GENERATION = 43
+KEYMANAGER_FINISHED_KEY_GENERATION = 44
+KEYMANAGER_DONE_UPLOADING_KEYS = 45
 
 
 _EVENTRESPONSE_STATUS = descriptor.EnumDescriptor(
@@ -452,8 +527,8 @@ _EVENTSSERVERSERVICE = descriptor.ServiceDescriptor(
   file=DESCRIPTOR,
   index=0,
   options=None,
-  serialized_start=1307,
-  serialized_end=1656,
+  serialized_start=1754,
+  serialized_end=2103,
   methods=[
   descriptor.MethodDescriptor(
     name='ping',
@@ -507,8 +582,8 @@ _EVENTSCLIENTSERVICE = descriptor.ServiceDescriptor(
   file=DESCRIPTOR,
   index=1,
   options=None,
-  serialized_start=1659,
-  serialized_end=1836,
+  serialized_start=2106,
+  serialized_end=2283,
   methods=[
   descriptor.MethodDescriptor(
     name='ping',