commit 8f7325a0bbb5bbb73b5dac5e18bd744edf6f59e9
author Yingdi Yu <yuyingdi@gmail.com> Thu Oct 17 17:03:46 2013 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri May 09 15:15:56 2014 -0700
tree b1823168ad2a9f42b1ffff200f9ac3173f72626a
parent 54dcecc45e93758baa52e020e1fcccb9244d60bc

Profile signing is working

src/contact-storage.cpp

diff --git a/src/contact-storage.cpp b/src/contact-storage.cpp
index b8842d7..8026644 100644
--- a/src/contact-storage.cpp
+++ b/src/contact-storage.cpp
@@ -365,18 +365,13 @@
 void
 ContactStorage::updateProfileData(const Name& identity) const
 {
+   _LOG_DEBUG("Enter updateProfileData!");
   // Get current profile;
   Ptr<Profile> newProfile = getSelfProfile(identity);
   if(NULL == newProfile)
     return;
   Ptr<Blob> newProfileBlob = newProfile->toDerBlob();
 
-  Ptr<ProfileData> newProfileData = getSignedSelfProfileData(identity, *newProfile);
-  if(NULL != newProfileData)
-    return;
-  Ptr<Blob> newProfileDataBlob = newProfileData->encodeToWire();
-
-
   // Check if profile exists
   sqlite3_stmt *stmt;
   sqlite3_prepare_v2 (m_db, "SELECT profile_data FROM ProfileData where identity=?", -1, &stmt, 0);
@@ -385,9 +380,19 @@
   if(sqlite3_step (stmt) != SQLITE_ROW)
     {
       sqlite3_finalize (stmt);
+
+      Ptr<ProfileData> newProfileData = getSignedSelfProfileData(identity, *newProfile);
+      _LOG_DEBUG("Signing DONE!");
+      if(NULL == newProfileData)
+        return;
+      Ptr<Blob> newProfileDataBlob = newProfileData->encodeToWire();
+
+      _LOG_DEBUG("Before Inserting!");
+
       sqlite3_prepare_v2 (m_db, "INSERT INTO ProfileData (identity, profile_data) values (?, ?)", -1, &stmt, 0);
-      sqlite3_bind_text(stmt, 2, identity.toUri().c_str(), identity.toUri().size(), SQLITE_TRANSIENT);
-      sqlite3_bind_text(stmt, 1, newProfileDataBlob->buf(), newProfileDataBlob->size(), SQLITE_TRANSIENT);
+      sqlite3_bind_text(stmt, 1, identity.toUri().c_str(), identity.toUri().size(), SQLITE_TRANSIENT);
+      sqlite3_bind_text(stmt, 2, newProfileDataBlob->buf(), newProfileDataBlob->size(), SQLITE_TRANSIENT);
+      sqlite3_step(stmt);
     }
   else
     {
@@ -399,9 +404,18 @@
       if(oldProfileBlob == *newProfileBlob)
         return;
 
+      Ptr<ProfileData> newProfileData = getSignedSelfProfileData(identity, *newProfile);
+      _LOG_DEBUG("Signing DONE!");
+      if(NULL == newProfileData)
+        return;
+      Ptr<Blob> newProfileDataBlob = newProfileData->encodeToWire();
+
+      _LOG_DEBUG("Before Updating!");
+
       sqlite3_prepare_v2 (m_db, "UPDATE ProfileData SET profile_data=? WHERE identity=?", -1, &stmt, 0);
       sqlite3_bind_text(stmt, 1, newProfileDataBlob->buf(), newProfileDataBlob->size(), SQLITE_TRANSIENT);
       sqlite3_bind_text(stmt, 2, identity.toUri().c_str(), identity.toUri().size(), SQLITE_TRANSIENT);
+      sqlite3_step(stmt);
     }
 }
 
@@ -432,6 +446,8 @@
     return NULL;
 
   Ptr<ProfileData> profileData = Ptr<ProfileData>(new ProfileData(identity, profile));
+  _LOG_DEBUG("Get ProfileData, size: " << profileData->content().size());
+  _LOG_DEBUG("Get SigningCert, name: " << certificateName.toUri());
   m_identityManager->signByCertificate(*profileData, certificateName);
 
   return profileData;