Subscribe only after account information was received.

Author: hoehermann

libsignald.c

@@ -160,7 +160,7 @@ signald_handle_input(SignaldAccount *sa, const char * json)
         } else if (purple_strequal(type, "contact_list")) {
             signald_parse_contact_list(sa, json_object_get_array_member(obj, "data"));
 
-            if (! sa->initialized) {
+            if (! sa->groups_updated) {
                 signald_request_group_list(sa);
             }
 
@@ -169,8 +169,8 @@ signald_handle_input(SignaldAccount *sa, const char * json)
             signald_parse_group_list(sa, json_object_get_array_member(obj, "groups"));
             signald_parse_groupV2_list(sa, json_object_get_array_member(obj, "groupsv2"));
 
-            if (! sa->initialized) {
-                sa->initialized = TRUE;
+            if (! sa->groups_updated) {
+                sa->groups_updated = TRUE;
             }
 
         } else if (purple_strequal(type, "message")) {
@@ -425,11 +425,6 @@ signald_login(PurpleAccount *account)
         purple_connection_error(sa->pc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _("Could not write list account message."));
     }
     json_object_unref(data);
-
-    if (!purple_account_get_bool(sa->account, "handle_signald", FALSE)) {
-        // subscribe if signald is globally running
-        signald_subscribe(sa);
-    }
 }
 
 static void

libsignald.h

@@ -60,7 +60,8 @@ typedef struct {
     PurpleConnection *pc;
     char *uuid; // own uuid, might be NULL – always check before use
 
-    gboolean initialized;
+    gboolean account_exists; // whether account exists in signald
+    gboolean groups_updated; // whether groups have been updated after login
 
     int fd;
     guint watcher;

link.c

@@ -108,7 +108,8 @@ signald_verify_ok_cb (SignaldAccount *sa, const char* input)
 
     // TODO: Is there an acknowledge on successful registration? If yes,
     //       subscribe afterwards or display an error otherwise
-    signald_subscribe(sa);
+    // signald_subscribe(sa);
+    purple_connection_error(sa->pc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _("Verification code was sent. Reconnect needed."));
 }
 
 void
@@ -129,7 +130,6 @@ signald_link_or_register (SignaldAccount *sa)
         JsonObject *data = json_object_new();
         json_object_set_string_member(data, "type", "link");
         if (!signald_send_json(sa, data)) {
-            //purple_connection_set_state(pc, PURPLE_DISCONNECTED);
             purple_connection_error(sa->pc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _("Could not write link message."));
         }
     } else {
@@ -140,7 +140,6 @@ signald_link_or_register (SignaldAccount *sa)
         json_object_set_string_member(data, "type", "register");
         json_object_set_string_member(data, "username", username);
         if (!signald_send_json(sa, data)) {
-            //purple_connection_set_state(pc, PURPLE_DISCONNECTED);
             purple_connection_error(sa->pc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _("Could not write registration message."));
         }
 
@@ -166,6 +165,7 @@ signald_process_account(JsonArray *array, guint index_, JsonNode *element_node,
     const char *username = json_object_get_string_member(obj, "username");
     if (purple_strequal (username, purple_account_get_username(sa->account))) {
         // The current account
+        sa->account_exists = TRUE;
         gboolean registered = json_object_get_boolean_member (obj, "registered");
         purple_debug_info(SIGNALD_PLUGIN_ID, "Account %s registered: %d\n", username, registered);
         if (registered) {
@@ -181,5 +181,9 @@ signald_process_account(JsonArray *array, guint index_, JsonNode *element_node,
 void
 signald_parse_account_list(SignaldAccount *sa, JsonArray *data)
 {
+    sa->account_exists = FALSE;
     json_array_foreach_element(data, signald_process_account, sa);
+    if (!sa->account_exists) {
+        signald_link_or_register(sa);
+    }
 }