CertificatePage

- enable export of own certificate to file
- enable import certificate of friend from file

read and write of file is done in the gui, because the methods for load from file and save to file on p3Peers are not implemented yet

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3093 b45a01b8-16f6-495d-af2f-9b41ad6348cc

retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp

@@ -354,6 +354,9 @@ bool TextPage::fileSave()
     QFile file(fileName);
     if (!file.open(QFile::WriteOnly))
         return false;
+
+    //Todo: move save to file to p3Peers::SaveCertificateToFile
+
     QTextStream ts(&file);
     ts.setCodec(QTextCodec::codecForName("UTF-8"));
     ts << userCertEdit->document()->toPlainText();
@@ -609,8 +612,7 @@ CertificatePage::CertificatePage(QWidget *parent) : QWizardPage(parent) {
                                   
     userFileCreateButton = new QPushButton;
     userFileCreateButton->setText(tr("Export my certificate..."));
-    connect(userFileCreateButton, SIGNAL( clicked() ),
+    connect(userFileCreateButton, SIGNAL( clicked() ), this, SLOT( generateCertificateCalled()));
-            this,                 SLOT( generateCertificateCalled()));
 
     userFileLayout = new QHBoxLayout;
     userFileLayout->addWidget(userFileLabel);
@@ -628,8 +630,7 @@ CertificatePage::CertificatePage(QWidget *parent) : QWizardPage(parent) {
 
     friendFileNameOpenButton= new QPushButton;
     friendFileNameOpenButton->setText(tr("Browse"));
-    connect(friendFileNameOpenButton, SIGNAL( clicked()),
+    connect(friendFileNameOpenButton, SIGNAL( clicked()), this, SLOT( loadFriendCert()));
-            this                   , SLOT( loadFriendCert()));
     
     friendFileLayout = new QHBoxLayout;
     friendFileLayout->addWidget(friendFileNameEdit) ;
@@ -662,23 +663,39 @@ void CertificatePage::loadFriendCert() {
 void CertificatePage::generateCertificateCalled() {
     qDebug() << "  generateCertificateCalled";
 
+    std::string cert = rsPeers->saveCertificateToString(rsPeers->getOwnId());
+    if (cert.empty()) {
+        QMessageBox::information(this, tr("RetroShare"),
+                         tr("Sorry, create certificate failed"),
+                         QMessageBox::Ok, QMessageBox::Ok);
+        return;
+    }
+
     QString qdir = QFileDialog::getSaveFileName(this,
                                                 tr("Please choose a filename"),
                                                 QDir::homePath(),
                                                 "RetroShare Certificate (*.rsc)");
+    //Todo: move save to file to p3Peers::SaveCertificateToFile
 
-    if ( rsPeers->saveCertificateToFile(rsPeers->getOwnId(), qdir.toStdString()) )
+    if (qdir.isEmpty() == false) {
-    {
+        QFile CertFile (qdir);
+        if (CertFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
+            if (CertFile.write(QByteArray(cert.c_str())) > 0) {
                 QMessageBox::information(this, tr("RetroShare"),
                                  tr("Certificate file successfully created"),
                                  QMessageBox::Ok, QMessageBox::Ok);
-    }
+            } else {
-    else
-    {
                 QMessageBox::information(this, tr("RetroShare"),
                                  tr("Sorry, certificate file creation failed"),
                                  QMessageBox::Ok, QMessageBox::Ok);
             }
+            CertFile.close();
+        } else {
+            QMessageBox::information(this, tr("RetroShare"),
+                             tr("Sorry, certificate file creation failed"),
+                             QMessageBox::Ok, QMessageBox::Ok);
+        }
+    }
 }
 
 //============================================================================
@@ -689,30 +706,47 @@ bool CertificatePage::isComplete() const {
 
 //============================================================================
 
-int CertificatePage::nextId() const {
+int CertificatePage::nextId() const
-    std::string id;
+{
-    
     QString fn = friendFileNameEdit->text();
-    if (QFile::exists(fn))
+    if (QFile::exists(fn)) {
-    {
+        //Todo: move read from file to p3Peers::loadCertificateFromFile
-        std::string fnstr = fn.toStdString();
+
-//        if ( rsPeers->LoadCertificateFromFile(fnstr, id) )
+        // read from file
-        if ( false )
+        std::string certstr;
-        {
+        QFile CertFile (fn);
-            wizard()->setField(SSL_ID_FIELD_CONNECT_FRIEND_WIZARD, QString::fromStdString(id));
+        if (CertFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
+            certstr = QString (CertFile.readAll()).toStdString();
+            CertFile.close();
+        }
+
+        if (certstr.empty() == false) {
+            RsPeerDetails pd;
+            if ( rsPeers->loadDetailsFromStringCert(certstr, pd) ) {
+#ifdef FRIEND_WIZARD_DEBUG
+                std::cerr << "ConnectFriendWizard got id : " << pd.id << "; gpg_id : " << pd.gpg_id << std::endl;
+#endif
+                wizard()->setField(SSL_ID_FIELD_CONNECT_FRIEND_WIZARD, QString::fromStdString(pd.id));
+                wizard()->setField(GPG_ID_FIELD_CONNECT_FRIEND_WIZARD, QString::fromStdString(pd.gpg_id));
+                wizard()->setField(LOCATION_FIELD_CONNECT_FRIEND_WIZARD, QString::fromStdString(pd.location));
+                wizard()->setField(CERT_STRING_FIELD_CONNECT_FRIEND_WIZARD, QString::fromStdString(certstr));
+
+                wizard()->setField("ext_friend_ip", QString::fromStdString(pd.extAddr));
+                wizard()->setField("ext_friend_port", QString::number(pd.extPort));
+                wizard()->setField("local_friend_ip", QString::fromStdString(pd.localAddr));
+                wizard()->setField("local_friend_port", QString::number(pd.localPort));
+                wizard()->setField("dyndns", QString::fromStdString(pd.dyndns));
 
                 return ConnectFriendWizard::Page_Conclusion ;
-        }
+            } else {
-        else
+                wizard()->setField("errorMessage", QString(tr("Certificate Load Failed:something is wrong with %1 ")).arg(fn) );
-        {
-            wizard()->setField("errorMessage",
-//                     QString(tr("Certificate Load Failed:something is wrong with %1 ")).arg(fn) );
-                     QString(tr("Not implemented ")));
                 return ConnectFriendWizard::Page_ErrorMessage;
             }
+        } else {
+            wizard()->setField("errorMessage", QString(tr("Certificate Load Failed:can't read from file %1 ")).arg(fn) );
+            return ConnectFriendWizard::Page_ErrorMessage;
         }
-    else
+    } else {
-    {
         QString mess =
                 QString(tr("Certificate Load Failed:file %1 not found"))
                 .arg(fn);
@@ -722,6 +756,7 @@ int CertificatePage::nextId() const {
         return ConnectFriendWizard::Page_ErrorMessage;
     }
 }
+
 //
 //============================================================================
 //============================================================================