diff options
| author | Tobias Weimer <wishmaster51@googlemail.com> | 2015-09-16 19:47:53 +0000 |
|---|---|---|
| committer | Tobias Weimer <wishmaster51@googlemail.com> | 2015-09-16 19:47:53 +0000 |
| commit | 217514a367b34e411debdd6402f7cfc2c069c9af (patch) | |
| tree | 992bf30422ef62792660e2d15d9a78181ac52503 /protocols/WhatsApp | |
| parent | 3c00a78191f46c10f036c789a9ef358f0e049d61 (diff) | |
WhatsApp:
- save CodeRequestDone into database and enable password dialogs
git-svn-id: http://svn.miranda-ng.org/main/trunk@15367 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/WhatsApp')
| -rw-r--r-- | protocols/WhatsApp/src/dialogs.cpp | 45 |
1 files changed, 25 insertions, 20 deletions
diff --git a/protocols/WhatsApp/src/dialogs.cpp b/protocols/WhatsApp/src/dialogs.cpp index 9e8aac45ee..aba0493fda 100644 --- a/protocols/WhatsApp/src/dialogs.cpp +++ b/protocols/WhatsApp/src/dialogs.cpp @@ -39,46 +39,51 @@ public: virtual void OnInitDialog()
{
- m_pw1.SendMsg(EM_LIMITTEXT, 3, 0); m_pw1.Enable(false);
- m_pw2.SendMsg(EM_LIMITTEXT, 3, 0); m_pw2.Enable(false);
+ m_pw1.SendMsg(EM_LIMITTEXT, 3, 0);
+ m_pw2.SendMsg(EM_LIMITTEXT, 3, 0);
+ bool bEnable = m_proto->getBool("CodeRequestDone", false);
+ m_pw1.Enable(bEnable);
+ m_pw2.Enable(bEnable);
}
void OnRequestClick(CCtrlButton*)
{
- if (IDYES != MessageBox(NULL, TranslateT(szAskSendSms), PRODUCT_NAME, MB_YESNO))
+ if (IDYES != MessageBox(GetHwnd(), TranslateT(szAskSendSms), PRODUCT_NAME, MB_YESNO))
return;
ptrA cc(m_cc.GetTextA()), number(m_login.GetTextA());
string password;
if (m_proto->Register(REG_STATE_REQ_CODE, string(cc), string(number), string(), password)) {
if (!password.empty()) {
- MessageBox(NULL, TranslateT(szPasswordSet), PRODUCT_NAME, MB_ICONWARNING);
+ MessageBox(GetHwnd(), TranslateT(szPasswordSet), PRODUCT_NAME, MB_ICONWARNING);
m_proto->setString(WHATSAPP_KEY_PASS, password.c_str());
}
else {
- m_pw1.Enable(); // unblock sms code entry field
+ // unblock sms code entry field
+ m_pw1.Enable();
m_pw2.Enable();
+ m_proto->setByte("CodeRequestDone", 1);
}
}
}
void OnRegisterClick(CCtrlButton*)
{
- if (GetWindowTextLength(m_pw1.GetHwnd()) != 3 || GetWindowTextLength(m_pw2.GetHwnd()) != 3) {
- MessageBox(NULL, TranslateT("Please correctly specify your registration code received by SMS"), PRODUCT_NAME, MB_ICONEXCLAMATION);
- return;
- }
-
- char code[10];
- GetWindowTextA(m_pw1.GetHwnd(), code, 4);
- GetWindowTextA(m_pw2.GetHwnd(), code + 3, 4);
-
- string password;
- ptrA cc(m_cc.GetTextA()), number(m_login.GetTextA());
- if (m_proto->Register(REG_STATE_REG_CODE, string(cc), string(number), string(code), password)) {
- m_proto->setString(WHATSAPP_KEY_PASS, password.c_str());
- MessageBox(NULL, TranslateT(szPasswordSet), PRODUCT_NAME, MB_ICONWARNING);
+ if (GetWindowTextLength(m_pw1.GetHwnd()) != 3 || GetWindowTextLength(m_pw2.GetHwnd()) != 3)
+ MessageBox(GetHwnd(), TranslateT("Please correctly specify your registration code received by SMS"), PRODUCT_NAME, MB_ICONEXCLAMATION);
+ else {
+ char code[10];
+ GetWindowTextA(m_pw1.GetHwnd(), code, 4);
+ GetWindowTextA(m_pw2.GetHwnd(), code + 3, 4);
+
+ string password;
+ ptrA cc(m_cc.GetTextA()), number(m_login.GetTextA());
+ if (m_proto->Register(REG_STATE_REG_CODE, string(cc), string(number), string(code), password)) {
+ m_proto->setString(WHATSAPP_KEY_PASS, password.c_str());
+ MessageBox(GetHwnd(), TranslateT(szPasswordSet), PRODUCT_NAME, MB_ICONWARNING);
+ }
}
+ m_proto->setByte("CodeRequestDone", 0);
}
virtual void OnApply()
@@ -88,7 +93,7 @@ public: m_proto->m_tszDefaultGroup = tszGroup.detach();
if (m_proto->isOnline())
- MessageBox(NULL, TranslateT("Changes will be applied after protocol restart"), m_proto->m_tszUserName, MB_OK);
+ MessageBox(GetHwnd(), TranslateT("Changes will be applied after protocol restart"), m_proto->m_tszUserName, MB_OK);
}
};
|