Merge branch 'task/CHT-518_remove-connect' into 'develop'

CHT-518. Remove connect

See merge request megachat/MEGAchat!1135

bindings/java/nz/mega/sdk/MegaChatApiJava.java

@@ -406,107 +406,6 @@ public int getInitState(){
  return megaChatApi.getInitState();
  }
 
- /**
- * Establish the connection with chat-related servers (chatd, presenced and Gelb).
- *
- * This function must be called only after calling:
- * - MegaChatApi::init to initialize the chat engine
- * - MegaApi::login to login in MEGA
- * - MegaApi::fetchNodes to retrieve current state of the account
- *
- * At that point, the initialization state should be MegaChatApi::INIT_ONLINE_SESSION.
- *
- * The online status after connecting will be whatever was last used.
- *
- * The associated request type with this request is MegaChatRequest::TYPE_CONNECT
- *
- * @param listener MegaChatRequestListener to track this request
- */
- public void connect(MegaChatRequestListenerInterface listener)
- {
- megaChatApi.connect(createDelegateRequestListener(listener));
- }
-
- /**
- * Establish the connection with chat-related servers (chatd, presenced and Gelb).
- *
- * This function must be called only after calling:
- * - MegaChatApi::init to initialize the chat engine
- * - MegaApi::login to login in MEGA
- * - MegaApi::fetchNodes to retrieve current state of the account
- *
- * At that point, the initialization state should be MegaChatApi::INIT_ONLINE_SESSION.
- *
- * The online status after connecting will be whatever was last used.
- *
- * The associated request type with this request is MegaChatRequest::TYPE_CONNECT
- *
- */
- public void connect(){
- megaChatApi.connect();
- }
-
- /**
- * Establish the connection with chat-related servers (chatd, presenced and Gelb).
- *
- * This function is intended to be used instead of MegaChatApi::connect when the connection
- * is done by a service in background, which is launched without user-interaction. It avoids
- * to notify to the server that this client is active, but actually the user is away.
- *
- * This function must be called only after calling:
- * - MegaChatApi::init to initialize the chat engine
- * - MegaApi::login to login in MEGA
- * - MegaApi::fetchNodes to retrieve current state of the account
- *
- * At that point, the initialization state should be MegaChatApi::INIT_ONLINE_SESSION.
- * The online status after connecting will be whatever was last used.
- *
- * The associated request type with this request is MegaChatRequest::TYPE_CONNECT
- * Valid data in the MegaChatRequest object received on callbacks:
- * - MegaChatRequest::getFlag - Returns true.
- *
- * @param listener MegaChatRequestListener to track this request
- */
- public void connectInBackground(MegaChatRequestListenerInterface listener)
- {
- megaChatApi.connectInBackground(createDelegateRequestListener(listener));
- }
-
- /**
- * Establish the connection with chat-related servers (chatd, presenced and Gelb).
- *
- * This function is intended to be used instead of MegaChatApi::connect when the connection
- * is done by a service in background, which is launched without user-interaction. It avoids
- * to notify to the server that this client is active, but actually the user is away.
- *
- * This function must be called only after calling:
- * - MegaChatApi::init to initialize the chat engine
- * - MegaApi::login to login in MEGA
- * - MegaApi::fetchNodes to retrieve current state of the account
- *
- * At that point, the initialization state should be MegaChatApi::INIT_ONLINE_SESSION.
- * The online status after connecting will be whatever was last used.
- *
- * The associated request type with this request is MegaChatRequest::TYPE_CONNECT
- * Valid data in the MegaChatRequest object received on callbacks:
- * - MegaChatRequest::getFlag - Returns true.
- */
- public void connectInBackground()
- {
- megaChatApi.connectInBackground();
- }
-
- /**
- * Disconnect from chat-related servers (chatd, presenced and Gelb).
- *
- * The associated request type with this request is MegaChatRequest::TYPE_DISCONNECT
- *
- * @param listener MegaChatRequestListener to track this request
- */
- public void disconnect(MegaChatRequestListenerInterface listener){
- megaChatApi.disconnect(createDelegateRequestListener(listener));
- }
-
  /**
  * Returns the current state of the connection
  *

examples/megaclc/megaclc.cpp

@@ -729,12 +729,6 @@ struct MegaclChatListener : public c::MegaChatRequestListener
  {
  switch (request->getType())
  {
- case c::MegaChatRequest::TYPE_CONNECT:
- if (check_err("Connect", e))
- {
- conlock(cout) << "Connection state " << api->getConnectionState() << endl;
- }
- break;
 
  case c::MegaChatRequest::TYPE_SET_ONLINE_STATUS:
  if (check_err("SetChatStatus", e))
@@ -976,7 +970,6 @@ void MegaclcListener::onRequestFinish(m::MegaApi* api, m::MegaRequest *request,
  {
  conlock(cout) << "Connecting to chat servers" << endl;
  guard.unlock();
- g_chatApi->connect(&g_chatListener);
 
  setprompt(COMMAND);
  }
@@ -1404,7 +1397,6 @@ void exec_initanonymous(ac::ACState& s)
  if (g_chatApi->getInitState() == c::MegaChatApi::INIT_NOT_DONE)
  {
  g_chatApi->initAnonymous();
- g_chatApi->connect(&g_chatListener);
  }
  else
  {

examples/qtmegachatapi/MainWindow.cpp

@@ -1152,6 +1152,10 @@ void MainWindow::onChatInitStateUpdate(megachat::MegaChatApi *, int newState)
  setWindowTitle(auxTitle);
  }
 
+ std::unique_ptr<MegaUserList> contactList(mMegaApi->getContacts());
+ addOrUpdateContactControllersItems(contactList.get());
+ reorderAppContactList();
+
  //Update chatListItems in chatControllers
  updateChatControllersItems();
 
@@ -1160,6 +1164,16 @@ void MainWindow::onChatInitStateUpdate(megachat::MegaChatApi *, int newState)
 
  //Update my user info tooltip
  updateToolTipMyInfo();
+
+ if (newState == MegaChatApi::INIT_ONLINE_SESSION)
+ {
+ //Fetch alias attr
+ mMegaApi->getUserAttribute(::mega::MegaApi::USER_ATTR_ALIAS);
+ if (mApp->getJoinAsGuest())
+ {
+ mMegaChatApi->openChatPreview(mApp->getChatLink().c_str());
+ }
+ }
  }
 }
 

examples/qtmegachatapi/MegaChatApplication.cpp

@@ -186,7 +186,6 @@ bool MegaChatApplication::initAnonymous(std::string chatlink)
  mSid = NULL;
 
  mMainWin->setWindowTitle("Anonymous mode");
- mMegaChatApi->connect();
  mMegaChatApi->openChatPreview(chatlink.c_str());
  connect(mMainWin, SIGNAL(onAnonymousLogout()), this, SLOT(onAnonymousLogout()));
  mMainWin->show();
@@ -578,11 +577,6 @@ void MegaChatApplication::onRequestFinish(MegaApi *api, MegaRequest *request, Me
 
  mMegaApi->getPushNotificationSettings();
  mMegaApi->fetchTimeZone();
-
- if (mMegaChatApi->getConnectionState() == MegaChatApi::DISCONNECTED)
- {
- mMegaChatApi->connect();
- }
  }
  else
  {
@@ -722,11 +716,6 @@ void MegaChatApplication::onRequestFinish(MegaApi *api, MegaRequest *request, Me
  assert(!mSid);
  mSid = request->getSessionKey();
  saveSid(mSid);
-
- if (mMegaChatApi->getConnectionState() == MegaChatApi::DISCONNECTED)
- {
- mMegaChatApi->connect();
- }
  }
  else // --> request->getParamType() == 4
  {
@@ -781,27 +770,6 @@ void MegaChatApplication::onRequestFinish(MegaChatApi *, MegaChatRequest *reques
 
  switch (reqType)
  {
- case MegaChatRequest::TYPE_CONNECT:
- if (error != MegaChatError::ERROR_OK)
- {
- QMessageBox::critical(nullptr, tr("Chat Connection"), tr("Error stablishing connection: ").append(e->getErrorString()));
- init();
- }
- else
- {
- MegaUserList *contactList = mMegaApi->getContacts();
- mMainWin->addOrUpdateContactControllersItems(contactList);
- mMainWin->reorderAppContactList();
- //Fetch alias attr
- mMegaApi->getUserAttribute(::mega::MegaApi::USER_ATTR_ALIAS);
- delete contactList;
-
- if (mJoinAsGuest)
- {
- mMegaChatApi->openChatPreview(getChatLink().c_str());
- }
- }
- break;
  case MegaChatRequest::TYPE_LOGOUT:
  if (error == MegaChatError::ERROR_OK)
  {