Changeset 6b83632 in Renga

Timestamp:

Dec 23, 2023, 2:57:52 PM (5 months ago)

Author:

PulkoMandy <pulkomandy@…>

Branches:

main

Children:

fadc861f

Parents:

3d47039

Message:

Fix crash on first anonymous connection

Files:

• jabber/JabberSpeak.cpp (modified) (1 diff)
• jabber/JabberSpeak.h (modified) (1 diff)
• jabber/TalkManager.cpp (modified) (3 diffs)
• ui/MainWindow.cpp (modified) (1 diff)
• ui/TalkView.cpp (modified) (2 diffs)

jabber/JabberSpeak.cpp

@@ -114 +114 @@
 const std::string JabberSpeak::CurrentRealName() const {
         return _curr_realname;
-}
-
-const std::string JabberSpeak::CurrentLogin() const {
-        return _curr_login;
 }
 

jabber/JabberSpeak.h

@@ -79 +79 @@
         // SELECTORS
         const std::string       CurrentRealName() const;
-        const std::string       CurrentLogin() const;
 
         // gloox::ConnectionListener

jabber/TalkManager.cpp

@@ -614 +614 @@
 
                         // FIXME send a message to the view instead (locking and unlocking for every message is slow)
-                        window->LockLooper();
+                        bool isLocked = window->LockLooper();
+                                
 
                         // TODO: compare with JID instead?
@@ -622 +623 @@
                                 window->AddToTalk(group_username, runs, TalkView::MAIN_RECIPIENT, highlight, autoHyperlink);
 
-                        window->UnlockLooper();
+                        // May not be locked if the view is not added to a winow yet
+                        if (isLocked)
+                                window->UnlockLooper();
                 }
         }
@@ -646 +649 @@
 
         // FIXME just send a BMessage to the view and let it handle this
-        window->LockLooper();
+        bool isLocked = window->LockLooper();
         window->SetStatus(subject);
         std::list<TextSpan> runs;
         runs.emplace_back(topic, TalkView::SystemMessagesStyle());
         window->AddToTalk(nick, runs, TalkView::OTHER, false, true);
-        window->UnlockLooper();
+        if (isLocked)
+                window->UnlockLooper();
 }
 

ui/MainWindow.cpp

@@ -267 +267 @@
                         // we just logged in
                         BString statusText;
-                        statusText.SetToFormat(B_TRANSLATE("Connected as %s"), JabberSpeak::Instance()->CurrentLogin().c_str());
+                        statusText.SetToFormat(B_TRANSLATE("Connected as %s"), JabberSpeak::Instance()->CurrentRealName().c_str());
                         _status_view->SetText(statusText.String());
 
-                        // save these settings
-                        BlabberSettings::Instance()->SetData("last-realname", _login_realname->Text());
-                        BlabberSettings::Instance()->SetData("last-login", _login_username->Text());
-                        BlabberSettings::Instance()->RemoveData("last-password");
-
-                        BKeyStore keystore;
-                        keystore.AddKeyring("XMPP");
-                        BPasswordKey key(_login_password->Text(), B_KEY_PURPOSE_GENERIC, _login_username->Text());
-                        status_t status = keystore.AddKey("XMPP", key);
-                        if (status != B_OK)
-                                fprintf(stderr, "failed to store password: %s\n", strerror(status));
-
-                        BlabberSettings::Instance()->SetTag("auto-login", _login_auto_login->Value());
-                        BlabberSettings::Instance()->WriteToFile();
+                        if (_login_username->TextLength() > 0) {
+                                // save these settings
+                                BlabberSettings::Instance()->SetData("last-realname", _login_realname->Text());
+                                BlabberSettings::Instance()->SetData("last-login", _login_username->Text());
+                                BlabberSettings::Instance()->RemoveData("last-password");
+
+                                BKeyStore keystore;
+                                keystore.AddKeyring("XMPP");
+                                BPasswordKey key(_login_password->Text(), B_KEY_PURPOSE_GENERIC, _login_username->Text());
+                                status_t status = keystore.AddKey("XMPP", key);
+                                if (status != B_OK)
+                                        fprintf(stderr, "failed to store password: %s\n", strerror(status));
+
+                                BlabberSettings::Instance()->SetTag("auto-login", _login_auto_login->Value());
+                                BlabberSettings::Instance()->WriteToFile();
+                        }
 
                         break;

ui/TalkView.cpp

@@ -178 +178 @@
         } else if (!uid || uid->UserType() == UserID::JABBER) {
                 // identify the user
-                sprintf(buffer, B_TRANSLATE("your identity is %s"), JabberSpeak::Instance()->CurrentLogin().c_str());
+                sprintf(buffer, B_TRANSLATE("your identity is %s"), JabberSpeak::Instance()->CurrentRealName().c_str());
                 SetStatus(buffer);
         } else {
@@ -560 +560 @@
         std::string user = JabberSpeak::Instance()->CurrentRealName();
 
-        // and if not :)
-        if (user.empty())
-                user = JabberSpeak::Instance()->CurrentLogin();
-
         return user;
 }